summaryrefslogtreecommitdiffstats
path: root/api/command_msg.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-22 21:32:39 -0500
committerCorey Hulen <corey@hulen.com>2017-02-22 21:32:39 -0500
commit9f65284ba1c67c20de1ccd7a5af80aa64c3575f7 (patch)
tree2fec884914f72797e79af8bf376620f1add3ffdc /api/command_msg.go
parentad61a63ad227b9cef68946f6c679b6cd49a01a37 (diff)
downloadchat-9f65284ba1c67c20de1ccd7a5af80aa64c3575f7.tar.gz
chat-9f65284ba1c67c20de1ccd7a5af80aa64c3575f7.tar.bz2
chat-9f65284ba1c67c20de1ccd7a5af80aa64c3575f7.zip
Fix response for malformed command execute request (#5498)
Diffstat (limited to 'api/command_msg.go')
-rw-r--r--api/command_msg.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/api/command_msg.go b/api/command_msg.go
index 0520bf7f6..f8c8fae1c 100644
--- a/api/command_msg.go
+++ b/api/command_msg.go
@@ -6,6 +6,7 @@ package api
import (
"strings"
+ l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/app"
"github.com/mattermost/platform/model"
)
@@ -50,7 +51,7 @@ func (me *msgProvider) DoCommand(c *Context, args *model.CommandArgs, message st
var userProfile *model.User
if result := <-app.Srv.Store.User().GetByUsername(targetUsername); result.Err != nil {
- c.Err = result.Err
+ l4g.Error(result.Err.Error())
return &model.CommandResponse{Text: c.T("api.command_msg.missing.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
} else {
userProfile = result.Data.(*model.User)
@@ -67,13 +68,13 @@ func (me *msgProvider) DoCommand(c *Context, args *model.CommandArgs, message st
if channel := <-app.Srv.Store.Channel().GetByName(c.TeamId, channelName, true); channel.Err != nil {
if channel.Err.Id == "store.sql_channel.get_by_name.missing.app_error" {
if directChannel, err := app.CreateDirectChannel(c.Session.UserId, userProfile.Id); err != nil {
- c.Err = err
+ l4g.Error(err.Error())
return &model.CommandResponse{Text: c.T("api.command_msg.dm_fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
} else {
targetChannelId = directChannel.Id
}
} else {
- c.Err = channel.Err
+ l4g.Error(channel.Err.Error())
return &model.CommandResponse{Text: c.T("api.command_msg.dm_fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
}
} else {