diff options
Diffstat (limited to 'api/post.go')
-rw-r--r-- | api/post.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/api/post.go b/api/post.go index 9bf6cff40..c363ff076 100644 --- a/api/post.go +++ b/api/post.go @@ -25,6 +25,11 @@ import ( "github.com/mattermost/platform/utils" ) +const ( + TRIGGERWORDS_FULL = 0 + TRIGGERWORDS_STARTSWITH = 1 +) + func InitPost() { l4g.Debug(utils.T("api.post.init.debug")) @@ -383,12 +388,14 @@ func handleWebhookEvents(c *Context, post *model.Post, team *model.Team, channel relevantHooks := []*model.OutgoingWebhook{} for _, hook := range hooks { - if hook.ChannelId == post.ChannelId { - if len(hook.TriggerWords) == 0 || hook.HasTriggerWord(firstWord) { + if hook.ChannelId == post.ChannelId || len(hook.ChannelId) == 0 { + if hook.ChannelId == post.ChannelId && len(hook.TriggerWords) == 0 { + relevantHooks = append(relevantHooks, hook) + } else if hook.TriggerWhen == TRIGGERWORDS_FULL && hook.HasTriggerWord(firstWord) { + relevantHooks = append(relevantHooks, hook) + } else if hook.TriggerWhen == TRIGGERWORDS_STARTSWITH && hook.TriggerWordStartsWith(firstWord) { relevantHooks = append(relevantHooks, hook) } - } else if len(hook.ChannelId) == 0 && hook.HasTriggerWord(firstWord) { - relevantHooks = append(relevantHooks, hook) } } |