From b3c2ecd9b9209413e7272b2fcd7bd3d04f2f85f4 Mon Sep 17 00:00:00 2001 From: Pradeep Murugesan Date: Wed, 25 Jul 2018 14:31:41 +0200 Subject: added the custom icon and username for the outgoing webhook and its response (#9141) * 8272 added the username and icon as part of the model and persisted the same * 8272 added the custome icon and name when set to the web hook response * 8272 changed the infinte loop to timeout after 5 seconds * 8272 fixed review comments --- app/webhook.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/webhook.go') diff --git a/app/webhook.go b/app/webhook.go index 8926c94a8..e801b0467 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -133,7 +133,13 @@ func (a *App) TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model. if len(webhookResp.Attachments) > 0 { webhookResp.Props["attachments"] = webhookResp.Attachments } + if a.Config().ServiceSettings.EnablePostUsernameOverride && hook.Username != "" && webhookResp.Username == "" { + webhookResp.Username = hook.Username + } + if a.Config().ServiceSettings.EnablePostIconOverride && hook.IconURL != "" && webhookResp.IconURL == "" { + webhookResp.IconURL = hook.IconURL + } if _, err := a.CreateWebhookPost(hook.CreatorId, channel, text, webhookResp.Username, webhookResp.IconURL, webhookResp.Props, webhookResp.Type, postRootId); err != nil { mlog.Error(fmt.Sprintf("Failed to create response post, err=%v", err)) } -- cgit v1.2.3-1-g7c22