summaryrefslogtreecommitdiffstats
path: root/api/web_team_hub.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-04 14:50:30 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-04 14:50:30 -0500
commitec51c31c325b3dc648a261f0e8634b6d70d7ba73 (patch)
tree1369b8d2bc406d54770d7ccf52b1e6a8bfedfc05 /api/web_team_hub.go
parent44c19ee443831e0e94b5738ecb21a64ce7643247 (diff)
parent21318b7505babaebbb5174c62b75595b2936ebe0 (diff)
downloadchat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.tar.gz
chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.tar.bz2
chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.zip
Merge pull request #2064 from hmhealey/plt882
PLT-882 Ephemeral Messages and Out-Of-Channel mentions
Diffstat (limited to 'api/web_team_hub.go')
-rw-r--r--api/web_team_hub.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/web_team_hub.go b/api/web_team_hub.go
index 55300c828..9d1c56f15 100644
--- a/api/web_team_hub.go
+++ b/api/web_team_hub.go
@@ -101,6 +101,9 @@ func ShouldSendEvent(webCon *WebConn, msg *model.Message) bool {
return false
} else if msg.Action == model.ACTION_PREFERENCE_CHANGED {
return false
+ } else if msg.Action == model.ACTION_EPHEMERAL_MESSAGE {
+ // For now, ephemeral messages are sent directly to individual users
+ return false
}
// Only report events to a user who is the subject of the event, or is in the channel of the event