IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-2039 fixing slash builtin cmds showing as webhook

Browse Source
This commit is contained in:
=Corey Hulen
2016-03-07 17:12:47 -08:00
parent b001507bed
commit 8c3b4d0a4e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/command.go
View File

@@ -111,7 +111,7 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
if provider != nil {
response := provider.DoCommand(c, channelId, message)
handleResponse(c, w, response, channelId, provider.GetCommand(c))
handleResponse(c, w, response, channelId, provider.GetCommand(c), true)
return
} else {
chanChan := Srv.Store.Channel().Get(channelId)
@@ -193,7 +193,7 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
if response == nil {
c.Err = model.NewLocAppError("command", "api.command.execute_command.failed_empty.app_error", map[string]interface{}{"Trigger": trigger}, "")
} else {
handleResponse(c, w, response, channelId, cmd)
handleResponse(c, w, response, channelId, cmd, false)
}
} else {
body, _ := ioutil.ReadAll(resp.Body)
@@ -211,11 +211,14 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = model.NewLocAppError("command", "api.command.execute_command.not_found.app_error", map[string]interface{}{"Trigger": trigger}, "")
}
func handleResponse(c *Context, w http.ResponseWriter, response *model.CommandResponse, channelId string, cmd *model.Command) {
func handleResponse(c *Context, w http.ResponseWriter, response *model.CommandResponse, channelId string, cmd *model.Command, builtIn bool) {
post := &model.Post{}
post.ChannelId = channelId
post.AddProp("from_webhook", "true")
if !builtIn {
post.AddProp("from_webhook", "true")
}
if utils.Cfg.ServiceSettings.EnablePostUsernameOverride {
if len(cmd.Username) != 0 {