diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-10-16 08:16:34 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-10-16 08:16:34 -0400 |
commit | 58c33f01d563d729e5fa5f8f037369210f8a1962 (patch) | |
tree | 883199c8a87f267d68d858bafc1a6707cb9091df /web | |
parent | 7718783d0c57d46db00123379d3b8f9818bb791b (diff) | |
download | chat-58c33f01d563d729e5fa5f8f037369210f8a1962.tar.gz chat-58c33f01d563d729e5fa5f8f037369210f8a1962.tar.bz2 chat-58c33f01d563d729e5fa5f8f037369210f8a1962.zip |
Add default username and icon to incoming webhooks.
Diffstat (limited to 'web')
-rw-r--r-- | web/static/images/webhook_icon.jpg | bin | 0 -> 68190 bytes | |||
-rw-r--r-- | web/web.go | 16 |
2 files changed, 12 insertions, 4 deletions
diff --git a/web/static/images/webhook_icon.jpg b/web/static/images/webhook_icon.jpg Binary files differnew file mode 100644 index 000000000..af5303421 --- /dev/null +++ b/web/static/images/webhook_icon.jpg diff --git a/web/web.go b/web/web.go index 7ab50a073..00e00b3b9 100644 --- a/web/web.go +++ b/web/web.go @@ -971,12 +971,20 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { post := &model.Post{UserId: hook.UserId, ChannelId: channel.Id, Message: text} post.AddProp("from_webhook", "true") - if len(overrideUsername) != 0 && utils.Cfg.ServiceSettings.EnablePostUsernameOverride { - post.AddProp("override_username", overrideUsername) + if utils.Cfg.ServiceSettings.EnablePostUsernameOverride { + if len(overrideUsername) != 0 { + post.AddProp("override_username", overrideUsername) + } else { + post.AddProp("override_username", model.DEFAULT_WEBHOOK_USERNAME) + } } - if len(overrideIconUrl) != 0 && utils.Cfg.ServiceSettings.EnablePostIconOverride { - post.AddProp("override_icon_url", overrideIconUrl) + if utils.Cfg.ServiceSettings.EnablePostIconOverride { + if len(overrideIconUrl) != 0 { + post.AddProp("override_icon_url", overrideIconUrl) + } else { + post.AddProp("override_icon_url", model.DEFAULT_WEBHOOK_ICON) + } } if !c.HasPermissionsToChannel(pchan, "createIncomingHook") && channel.Type != model.CHANNEL_OPEN { |