diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
commit | 8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73 (patch) | |
tree | 84e426d92eccf017f0fd5ccd22815a2139bd6e44 /web/web.go | |
parent | 6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 (diff) | |
parent | 9c045f0d4bdf254f57b94356fd2f5f2a2408ed03 (diff) | |
download | chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.gz chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.bz2 chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.zip |
Fixing merge
Diffstat (limited to 'web/web.go')
-rw-r--r-- | web/web.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/web/web.go b/web/web.go index 1f7c3ae5e..83b8c7f34 100644 --- a/web/web.go +++ b/web/web.go @@ -1031,12 +1031,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 { |