From bd3b7aeeeadb10bf07dcb8cb0c4a879fdd6e6709 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 1 Nov 2017 13:15:31 -0500 Subject: Fix /msg switching teams (#7753) * Fix /msg switching teams * simplify a bit --- app/command_msg.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/command_msg.go') 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} -- cgit v1.2.3-1-g7c22