summaryrefslogtreecommitdiffstats
path: root/webapp/actions
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-01-30 15:43:34 -0500
committerGitHub <noreply@github.com>2017-01-30 15:43:34 -0500
commit450c0b3ccb091a3f84f35aca0319ba358ffd5633 (patch)
treeb10df23ff6a7410b9e61be2c8b1c1215e9b5aa28 /webapp/actions
parentb26329cdda2ff599d01afbe01b2e2df3896a6b57 (diff)
downloadchat-450c0b3ccb091a3f84f35aca0319ba358ffd5633.tar.gz
chat-450c0b3ccb091a3f84f35aca0319ba358ffd5633.tar.bz2
chat-450c0b3ccb091a3f84f35aca0319ba358ffd5633.zip
Improvments to typing messages (#5230)
Diffstat (limited to 'webapp/actions')
-rw-r--r--webapp/actions/global_actions.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index c8da43f24..beca75509 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -454,7 +454,9 @@ export function viewLoggedIn() {
let lastTimeTypingSent = 0;
export function emitLocalUserTypingEvent(channelId, parentId) {
const t = Date.now();
- if ((t - lastTimeTypingSent) > Constants.UPDATE_TYPING_MS) {
+ const membersInChannel = ChannelStore.getStats(channelId).member_count;
+
+ if (((t - lastTimeTypingSent) > global.window.mm_config.TimeBetweenUserTypingUpdatesMilliseconds) && membersInChannel < global.window.mm_config.MaxNotificationsPerChannel && global.window.mm_config.EnableUserTypingMessages === 'true') {
WebSocketClient.userTyping(channelId, parentId);
lastTimeTypingSent = t;
}