From be74ec22414a9a34f458a0fb30ea14e2d02dcd3f Mon Sep 17 00:00:00 2001 From: Yusuke Nemoto Date: Thu, 17 Nov 2016 23:19:11 +0900 Subject: [PATCH] plt-2610 allow slash command to override username/icon_url (#4378) --- api/command.go | 4 ++++ model/command_response.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/api/command.go b/api/command.go index ff0f72149c..3ae379819b 100644 --- a/api/command.go +++ b/api/command.go @@ -231,6 +231,8 @@ func handleResponse(c *Context, w http.ResponseWriter, response *model.CommandRe if utils.Cfg.ServiceSettings.EnablePostUsernameOverride { if len(cmd.Username) != 0 { post.AddProp("override_username", cmd.Username) + } else if len(response.Username) != 0 { + post.AddProp("override_username", response.Username) } else { post.AddProp("override_username", model.DEFAULT_WEBHOOK_USERNAME) } @@ -239,6 +241,8 @@ func handleResponse(c *Context, w http.ResponseWriter, response *model.CommandRe if utils.Cfg.ServiceSettings.EnablePostIconOverride { if len(cmd.IconURL) != 0 { post.AddProp("override_icon_url", cmd.IconURL) + } else if len(response.IconURL) != 0 { + post.AddProp("override_icon_url", response.IconURL) } else { post.AddProp("override_icon_url", "") } diff --git a/model/command_response.go b/model/command_response.go index 9314f38ef3..bbb70418e5 100644 --- a/model/command_response.go +++ b/model/command_response.go @@ -16,6 +16,8 @@ const ( type CommandResponse struct { ResponseType string `json:"response_type"` Text string `json:"text"` + Username string `json:"username"` + IconURL string `json:"icon_url"` GotoLocation string `json:"goto_location"` Attachments interface{} `json:"attachments"` }