From 9abd74c5e31625c1c11fcedafc44f8aadc4ecdb0 Mon Sep 17 00:00:00 2001 From: Sudheer Date: Wed, 27 Jun 2018 18:38:58 +0530 Subject: MM-10910 fix join and open channel commands to work with tilde (#8984) * MM-10910 fix join and open channel commands to work with tilde * Fix lint * Add basic tests for command_join --- app/command_join.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'app/command_join.go') diff --git a/app/command_join.go b/app/command_join.go index 92084448e..61ed65ba6 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -6,6 +6,7 @@ package app import ( "github.com/mattermost/mattermost-server/model" goi18n "github.com/nicksnyder/go-i18n/i18n" + "strings" ) type JoinProvider struct { @@ -34,12 +35,18 @@ func (me *JoinProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Comman } func (me *JoinProvider) DoCommand(a *App, args *model.CommandArgs, message string) *model.CommandResponse { - if result := <-a.Srv.Store.Channel().GetByName(args.TeamId, message, true); result.Err != nil { + channelName := message + + if strings.HasPrefix(message, "~") { + channelName = message[1:] + } + + if result := <-a.Srv.Store.Channel().GetByName(args.TeamId, channelName, true); result.Err != nil { return &model.CommandResponse{Text: args.T("api.command_join.list.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } else { channel := result.Data.(*model.Channel) - if channel.Name == message { + if channel.Name == channelName { allowed := false if (channel.Type == model.CHANNEL_PRIVATE && a.SessionHasPermissionToChannel(args.Session, channel.Id, model.PERMISSION_READ_CHANNEL)) || channel.Type == model.CHANNEL_OPEN { allowed = true -- cgit v1.2.3-1-g7c22