Optimzing the user typing event in ShouldSendEvent() (#5560)

app/web_conn.go

@@ -21,6 +21,7 @@ const (
 	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 {
-
+		if model.GetMillis()-webCon.LastAllChannelMembersTime > WEBCONN_MEMBER_CACHE_TIME {
-		// 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
 			webCon.AllChannelMembers = nil
 			webCon.LastAllChannelMembersTime = 0
 		}

app/web_hub.go

@@ -278,6 +278,7 @@ func (h *Hub) Start() {
 				}
 
 			case msg := <-h.broadcast:
+				if OkToSendTypingMessage(msg) {
 					for _, webCon := range h.connections {
 						if webCon.ShouldSendEvent(msg) {
 							select {
@@ -295,6 +296,7 @@ func (h *Hub) Start() {
 							}
 						}
 					}
+				}
 
 			case <-h.stop:
 				for _, webCon := range h.connections {
@@ -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
+}