Merge 6bc037f into 71e6a42

mattermost · Mar 1, 2017 · 650b84a · 650b84a
2 parents 71e6a42 + 6bc037f
commit 650b84a
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/app/web_hub.go b/app/web_hub.go
@@ -90,14 +90,6 @@ func HubUnregister(webConn *WebConn) {
 
 func Publish(message *model.WebSocketEvent) {
 
-	if SkipTypingMessage(message) {
-		if metrics := einterfaces.GetMetricsInterface(); metrics != nil {
-			metrics.IncrementWebsocketEvent(message.Event + "_skipped")
-		}
-
-		return
-	}
-
 	if metrics := einterfaces.GetMetricsInterface(); metrics != nil {
 		metrics.IncrementWebsocketEvent(message.Event)
 	}
@@ -337,14 +329,3 @@ func (h *Hub) Start() {
 
 	go doRecoverableStart()
 }
-
-func SkipTypingMessage(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 true
-		}
-	}
-
-	return false
-}