From fffe039f465c7133b87fe16f671b47c02afd4a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 20 Jan 2026 19:09:32 -0500
Subject: [PATCH] refactor: remove chats.initialized, all events handlers are
 removed before being added

---
 public/src/client/chats.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 09fa289c0c..65f7cd6685 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -26,7 +26,6 @@ define('forum/chats', [
 	api, uploadHelpers
 ) {
 	const Chats = {
-		initialised: false,
 		activeAutocomplete: {},
 		newMessage: false,
 	};
@@ -55,10 +54,9 @@ define('forum/chats', [
 		socket.emit('modules.chats.enterPublic', ajaxify.data.publicRooms.map(r => r.roomId));
 		const env = utils.findBootstrapEnvironment();
 		chatNavWrapper = $('[component="chat/nav-wrapper"]');
-		if (!Chats.initialised) {
-			Chats.addSocketListeners();
-			Chats.addGlobalEventListeners();
-		}
+
+		Chats.addSocketListeners();
+		Chats.addGlobalEventListeners();
 
 		recentChats.init();
 
@@ -69,7 +67,6 @@ define('forum/chats', [
 			Chats.addHotkeys();
 		}
 
-		Chats.initialised = true;
 		const chatContentEl = $('[component="chat/message/content"]');
 		messages.wrapImagesInLinks(chatContentEl);
 		if (ajaxify.data.scrollToIndex) {
@@ -676,14 +673,18 @@ define('forum/chats', [
 	};
 
 	Chats.addGlobalEventListeners = function () {
-		$(window).on('mousemove keypress click', function () {
-			if (Chats.newMessage && ajaxify.data.roomId) {
-				api.del(`/chats/${ajaxify.data.roomId}/state`, {});
-				Chats.newMessage = false;
-			}
-		});
+		$(window).off('mousemove keypress click', onUserInteraction)
+			.on('mousemove keypress click', onUserInteraction);
 	};
 
+	function onUserInteraction() {
+		if (Chats.newMessage && ajaxify.data.roomId) {
+			// mark current room read on user interaction
+			api.del(`/chats/${ajaxify.data.roomId}/state`, {});
+			Chats.newMessage = false;
+		}
+	}
+
 	Chats.addSocketListeners = function () {
 		events.init();