summaryrefslogtreecommitdiffstats
path: root/app/command_msg.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-11-01 13:15:31 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2017-11-01 14:15:31 -0400
commitbd3b7aeeeadb10bf07dcb8cb0c4a879fdd6e6709 (patch)
treeb0d1a16788973ba6552e0c8799e49f2abb7527a2 /app/command_msg.go
parent23e4b4a27d915191dc4f1164c86e26651b379a11 (diff)
downloadchat-bd3b7aeeeadb10bf07dcb8cb0c4a879fdd6e6709.tar.gz
chat-bd3b7aeeeadb10bf07dcb8cb0c4a879fdd6e6709.tar.bz2
chat-bd3b7aeeeadb10bf07dcb8cb0c4a879fdd6e6709.zip
Fix /msg switching teams (#7753)
* Fix /msg switching teams * simplify a bit
Diffstat (limited to 'app/command_msg.go')
-rw-r--r--app/command_msg.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/command_msg.go b/app/command_msg.go
index 648903f0d..120619960 100644
--- a/app/command_msg.go
+++ b/app/command_msg.go
@@ -37,12 +37,10 @@ func (me *msgProvider) GetCommand(T goi18n.TranslateFunc) *model.Command {
}
func (me *msgProvider) DoCommand(a *App, args *model.CommandArgs, message string) *model.CommandResponse {
-
splitMessage := strings.SplitN(message, " ", 2)
parsedMessage := ""
targetUsername := ""
- teamId := ""
if len(splitMessage) > 1 {
parsedMessage = strings.SplitN(message, " ", 2)[1]
@@ -81,7 +79,6 @@ func (me *msgProvider) DoCommand(a *App, args *model.CommandArgs, message string
} else {
channel := channel.Data.(*model.Channel)
targetChannelId = channel.Id
- teamId = channel.TeamId
}
if len(parsedMessage) > 0 {
@@ -94,6 +91,7 @@ func (me *msgProvider) DoCommand(a *App, args *model.CommandArgs, message string
}
}
+ teamId := args.TeamId
if teamId == "" {
if len(args.Session.TeamMembers) == 0 {
return &model.CommandResponse{Text: args.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}