diff options
author | Corey Hulen <corey@hulen.com> | 2017-02-28 17:49:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-28 17:49:25 -0500 |
commit | 838bb8cee2dbfb5c1f6560154a603fcc000f6244 (patch) | |
tree | 6a670693d0b435d22c36a2ead26a1d34c66f8136 /app/web_conn.go | |
parent | d6d603d8cfd82d7a281757cceae08c8b7938d16a (diff) | |
download | chat-838bb8cee2dbfb5c1f6560154a603fcc000f6244.tar.gz chat-838bb8cee2dbfb5c1f6560154a603fcc000f6244.tar.bz2 chat-838bb8cee2dbfb5c1f6560154a603fcc000f6244.zip |
Optimzing the user typing event in ShouldSendEvent() (#5560)
Diffstat (limited to 'app/web_conn.go')
-rw-r--r-- | app/web_conn.go | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/app/web_conn.go b/app/web_conn.go index 02c3b2642..5205ac2ee 100644 --- a/app/web_conn.go +++ b/app/web_conn.go @@ -17,10 +17,11 @@ import ( ) const ( - WRITE_WAIT = 30 * time.Second - PONG_WAIT = 100 * time.Second - PING_PERIOD = (PONG_WAIT * 6) / 10 - AUTH_TIMEOUT = 5 * time.Second + WRITE_WAIT = 30 * time.Second + PONG_WAIT = 100 * time.Second + PING_PERIOD = (PONG_WAIT * 6) / 10 + AUTH_TIMEOUT = 5 * time.Second + WEBCONN_MEMBER_CACHE_TIME = 1000 * 60 * 30 // 30 minutes ) type WebConn struct { @@ -198,15 +199,7 @@ func (webCon *WebConn) ShouldSendEvent(msg *model.WebSocketEvent) bool { // Only report events to users who are in the channel for the event if len(msg.Broadcast.ChannelId) > 0 { - - // Only broadcast typing messages if less than 1K people in channel - if msg.Event == model.WEBSOCKET_EVENT_TYPING { - if Srv.Store.Channel().GetMemberCountFromCache(msg.Broadcast.ChannelId) > *utils.Cfg.TeamSettings.MaxNotificationsPerChannel { - return false - } - } - - if model.GetMillis()-webCon.LastAllChannelMembersTime > 1000*60*15 { // 15 minutes + if model.GetMillis()-webCon.LastAllChannelMembersTime > WEBCONN_MEMBER_CACHE_TIME { webCon.AllChannelMembers = nil webCon.LastAllChannelMembersTime = 0 } |