[FIX] users typing forever (RocketChat#14724)

ggazzo · web-flow · commit 6153a2f1196e · 2019-06-04T20:01:45.000-03:00
diff --git a/app/ui-message/client/messageBox/messageBoxTyping.js b/app/ui-message/client/messageBox/messageBoxTyping.js
@@ -2,12 +2,13 @@ import { Template } from 'meteor/templating';
 
 import { MsgTyping } from '../../../ui';
 import { t } from '../../../utils';
+import { getConfig } from '../../../ui-utils/client/config';
 import './messageBoxTyping.html';
 
+const maxUsernames = parseInt(getConfig('max-usernames-typing')) || 4;
 
 Template.messageBoxTyping.helpers({
 	data() {
-		const maxUsernames = 4;
 		const users = MsgTyping.get(this.rid);
 		if (users.length === 0) {
 			return;
diff --git a/app/ui/client/lib/msgTyping.js b/app/ui/client/lib/msgTyping.js
@@ -38,8 +38,10 @@ export const MsgTyping = new class {
 
 	cancel(rid) {
 		if (rooms[rid]) {
-			delete rooms[rid];
 			Notifications.unRoom(rid, 'typing', rooms[rid]);
+			Object.values(usersTyping.get(rid) || {}).forEach(clearTimeout);
+			usersTyping.set(rid);
+			delete rooms[rid];
 		}
 	}
 
@@ -56,8 +58,9 @@ export const MsgTyping = new class {
 			if (typing === true) {
 				clearTimeout(users[username]);
 				users[username] = setTimeout(function() {
-					delete users[username];
-					usersTyping.set(rid, users);
+					const u = usersTyping.get(rid);
+					delete u[username];
+					usersTyping.set(rid, u);
 				}, timeout);
 			} else {
 				delete users[username];
