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_hub.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_hub.go')
-rw-r--r-- | app/web_hub.go | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/app/web_hub.go b/app/web_hub.go index a50680806..9743d16aa 100644 --- a/app/web_hub.go +++ b/app/web_hub.go @@ -278,18 +278,20 @@ func (h *Hub) Start() { } case msg := <-h.broadcast: - for _, webCon := range h.connections { - if webCon.ShouldSendEvent(msg) { - select { - case webCon.Send <- msg: - default: - l4g.Error(fmt.Sprintf("webhub.broadcast: cannot send, closing websocket for userId=%v", webCon.UserId)) - close(webCon.Send) - for i, webConCandidate := range h.connections { - if webConCandidate == webCon { - h.connections[i] = h.connections[len(h.connections)-1] - h.connections = h.connections[:len(h.connections)-1] - break + if OkToSendTypingMessage(msg) { + for _, webCon := range h.connections { + if webCon.ShouldSendEvent(msg) { + select { + case webCon.Send <- msg: + default: + l4g.Error(fmt.Sprintf("webhub.broadcast: cannot send, closing websocket for userId=%v", webCon.UserId)) + close(webCon.Send) + for i, webConCandidate := range h.connections { + if webConCandidate == webCon { + h.connections[i] = h.connections[len(h.connections)-1] + h.connections = h.connections[:len(h.connections)-1] + break + } } } } @@ -328,3 +330,14 @@ func (h *Hub) Start() { go doRecoverableStart() } + +func OkToSendTypingMessage(msg *model.WebSocketEvent) bool { + // 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 + } + } + + return true +} |