diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-27 14:07:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 14:07:34 -0500 |
| commit | 097289f8e473c799ee752aa56e08f605110f5217 (patch) | |
| tree | 424cd42d691b28d1c08852dc02a69d69f2b70a65 /app/notification.go | |
| parent | 8eab04e944b3874f1fc4985344cbccec84c6002a (diff) | |
| download | chat-097289f8e473c799ee752aa56e08f605110f5217.tar.gz chat-097289f8e473c799ee752aa56e08f605110f5217.tar.bz2 chat-097289f8e473c799ee752aa56e08f605110f5217.zip | |
Merge 3.6.2 into master (#5211)
* Add webhook cache
* Add channel by name cache
* Fxing profiles in channels cache
* Fix merge
Diffstat (limited to 'app/notification.go')
| -rw-r--r-- | app/notification.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/notification.go b/app/notification.go index c65635f60..9ad0b346b 100644 --- a/app/notification.go +++ b/app/notification.go @@ -35,12 +35,6 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe profileMap = result.Data.(map[string]*model.User) } - // If the user who made the post isn't in the channel, don't send a notification - if _, ok := profileMap[post.UserId]; !ok && post.Props["from_webhook"] != "true" { - l4g.Debug(utils.T("api.post.send_notifications.user_id.debug"), post.Id, channel.Id, post.UserId) - return []string{}, nil - } - mentionedUserIds := make(map[string]bool) allActivityPushUserIds := []string{} hereNotification := false |