From 87ee2a75cac9e7fc8a9ec0547ada5987a1c8dc21 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:27:08 +0000 Subject: [PATCH 1/5] adds a naive reloader to prevent chat from bugging out --- tgui/packages/tgui-panel/chat/constants.ts | 1 + tgui/packages/tgui-panel/chat/renderer.jsx | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts index a9b1634783af..62b8de317332 100644 --- a/tgui/packages/tgui-panel/chat/constants.ts +++ b/tgui/packages/tgui-panel/chat/constants.ts @@ -13,6 +13,7 @@ export const COMBINE_MAX_TIME_WINDOW = 5000; export const IMAGE_RETRY_DELAY = 250; export const IMAGE_RETRY_LIMIT = 10; export const IMAGE_RETRY_MESSAGE_AGE = 60000; +export const RENDERER_RELOAD_WAIT = 1000; // Default message type export const MESSAGE_TYPE_UNKNOWN = 'unknown'; diff --git a/tgui/packages/tgui-panel/chat/renderer.jsx b/tgui/packages/tgui-panel/chat/renderer.jsx index 524d68c9061e..5368570b9725 100644 --- a/tgui/packages/tgui-panel/chat/renderer.jsx +++ b/tgui/packages/tgui-panel/chat/renderer.jsx @@ -21,6 +21,7 @@ import { MESSAGE_TYPE_INTERNAL, MESSAGE_TYPE_UNKNOWN, MESSAGE_TYPES, + RENDERER_RELOAD_WAIT, } from './constants'; import { canPageAcceptType, createMessage, isSameMessage } from './model'; import { highlightNode, linkifyNode } from './replaceInTextNode'; @@ -634,3 +635,9 @@ if (!window.__chatRenderer__) { /** @type {ChatRenderer} */ export const chatRenderer = window.__chatRenderer__; + +setTimeout(() => { + if (!chatRenderer.isReady) { + location.reload(); + } +}, RENDERER_RELOAD_WAIT); From f1fd3a2ce29250d71ee17e37fd3da15619334d46 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:03:07 +0000 Subject: [PATCH 2/5] debug lines --- tgui/packages/tgui-panel/chat/renderer.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tgui/packages/tgui-panel/chat/renderer.jsx b/tgui/packages/tgui-panel/chat/renderer.jsx index 5368570b9725..4181fde11a88 100644 --- a/tgui/packages/tgui-panel/chat/renderer.jsx +++ b/tgui/packages/tgui-panel/chat/renderer.jsx @@ -637,7 +637,9 @@ if (!window.__chatRenderer__) { export const chatRenderer = window.__chatRenderer__; setTimeout(() => { + console.log('running timeout'); if (!chatRenderer.isReady) { + console.log('rerendering'); location.reload(); } }, RENDERER_RELOAD_WAIT); From a791395ba655052b1c722f4a030b4f6e4a5c9074 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:06:56 +0000 Subject: [PATCH 3/5] you know i really hate javascript --- tgui/packages/tgui-panel/chat/renderer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/chat/renderer.jsx b/tgui/packages/tgui-panel/chat/renderer.jsx index 4181fde11a88..624af3d4d0e9 100644 --- a/tgui/packages/tgui-panel/chat/renderer.jsx +++ b/tgui/packages/tgui-panel/chat/renderer.jsx @@ -638,7 +638,7 @@ export const chatRenderer = window.__chatRenderer__; setTimeout(() => { console.log('running timeout'); - if (!chatRenderer.isReady) { + if (!chatRenderer.isReady()) { console.log('rerendering'); location.reload(); } From 72f50153a1803e9c68af8342bad290dc9373cae1 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:11:57 +0000 Subject: [PATCH 4/5] removes debug --- tgui/packages/tgui-panel/chat/renderer.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/tgui/packages/tgui-panel/chat/renderer.jsx b/tgui/packages/tgui-panel/chat/renderer.jsx index 624af3d4d0e9..c0e7ee5bb7b3 100644 --- a/tgui/packages/tgui-panel/chat/renderer.jsx +++ b/tgui/packages/tgui-panel/chat/renderer.jsx @@ -637,9 +637,7 @@ if (!window.__chatRenderer__) { export const chatRenderer = window.__chatRenderer__; setTimeout(() => { - console.log('running timeout'); if (!chatRenderer.isReady()) { - console.log('rerendering'); location.reload(); } }, RENDERER_RELOAD_WAIT); From f332eef9d5a7c8a8a7211f83b95b2623d7f39717 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Sat, 8 Feb 2025 09:53:58 +0000 Subject: [PATCH 5/5] god i hate ie11 --- tgui/packages/tgui-panel/chat/constants.ts | 3 +++ tgui/packages/tgui-panel/chat/renderer.jsx | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts index 62b8de317332..84c4aa0e1662 100644 --- a/tgui/packages/tgui-panel/chat/constants.ts +++ b/tgui/packages/tgui-panel/chat/constants.ts @@ -15,6 +15,9 @@ export const IMAGE_RETRY_LIMIT = 10; export const IMAGE_RETRY_MESSAGE_AGE = 60000; export const RENDERER_RELOAD_WAIT = 1000; +// Remove with 516 +export const RENDERER_RELOAD_WAIT_TRIDENT = 2500; + // Default message type export const MESSAGE_TYPE_UNKNOWN = 'unknown'; diff --git a/tgui/packages/tgui-panel/chat/renderer.jsx b/tgui/packages/tgui-panel/chat/renderer.jsx index c0e7ee5bb7b3..cda017adcbab 100644 --- a/tgui/packages/tgui-panel/chat/renderer.jsx +++ b/tgui/packages/tgui-panel/chat/renderer.jsx @@ -22,6 +22,7 @@ import { MESSAGE_TYPE_UNKNOWN, MESSAGE_TYPES, RENDERER_RELOAD_WAIT, + RENDERER_RELOAD_WAIT_TRIDENT, } from './constants'; import { canPageAcceptType, createMessage, isSameMessage } from './model'; import { highlightNode, linkifyNode } from './replaceInTextNode'; @@ -636,8 +637,11 @@ if (!window.__chatRenderer__) { /** @type {ChatRenderer} */ export const chatRenderer = window.__chatRenderer__; -setTimeout(() => { - if (!chatRenderer.isReady()) { - location.reload(); - } -}, RENDERER_RELOAD_WAIT); +setTimeout( + () => { + if (!chatRenderer.isReady()) { + location.reload(); + } + }, + Byond.TRIDENT ? RENDERER_RELOAD_WAIT_TRIDENT : RENDERER_RELOAD_WAIT, +);