From cffb8918544aaaabbeccd3a84ab5173fee7b18c8 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 2 Apr 2018 18:58:39 +0300 Subject: Make channel mute command respond with and without ~ prefix (#8549) * Make channel mute command respond with and without ~ prefix * Re-use splitMessage --- app/command_mute.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/command_mute.go') diff --git a/app/command_mute.go b/app/command_mute.go index 072e79f92..fdc698cd9 100644 --- a/app/command_mute.go +++ b/app/command_mute.go @@ -43,14 +43,20 @@ func (me *MuteProvider) DoCommand(a *App, args *model.CommandArgs, message strin return &model.CommandResponse{Text: args.T("api.command_mute.error", map[string]interface{}{"Channel": channel.DisplayName}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } + channelName := "" + splitMessage := strings.Split(message, " ") // Overwrite channel with channel-handle if set if strings.HasPrefix(message, "~") { - splitMessage := strings.Split(message, " ") - chanHandle := strings.Split(splitMessage[0], "~")[1] - data := (<-a.Srv.Store.Channel().GetByName(channel.TeamId, chanHandle, true)).Data + channelName = splitMessage[0][1:] + } else { + channelName = splitMessage[0] + } + + if len(channelName) > 0 && len(message) > 0 { + data := (<-a.Srv.Store.Channel().GetByName(channel.TeamId, channelName, true)).Data if data == nil { - return &model.CommandResponse{Text: args.T("api.command_mute.error", map[string]interface{}{"Channel": chanHandle}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + return &model.CommandResponse{Text: args.T("api.command_mute.error", map[string]interface{}{"Channel": channelName}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } channel = data.(*model.Channel) -- cgit v1.2.3-1-g7c22