Merge pull request #1852 from Morfent/chatqueue

Use last message time for timeout on chat queue creation
XpRienzo · May 3, 2015 · 7550c80 · 7550c80
2 parents 5a97029 + 4289cc8
commit 7550c80
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/users.js b/users.js
@@ -1602,7 +1602,8 @@ User = (function () {
 		} else if (now < this.lastChatMessage + THROTTLE_DELAY) {
 			this.chatQueue = [[message, room, connection]];
 			this.chatQueueTimeout = setTimeout(
-				this.processChatQueue.bind(this), THROTTLE_DELAY);
+				this.processChatQueue.bind(this),
+				THROTTLE_DELAY - (now - this.lastChatMessage));
 		} else {
 			this.lastChatMessage = now;
 			ResourceMonitor.activeIp = connection.ip;