From 2df818b9c680d9e6aec2cddb4c910ecf8341e3a9 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 10 Jul 2018 09:54:49 +0100 Subject: MM-11227: Fix group msg slash command. (#9070) --- app/command_groupmsg.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'app/command_groupmsg.go') diff --git a/app/command_groupmsg.go b/app/command_groupmsg.go index 0e783e1a8..9ec84fda0 100644 --- a/app/command_groupmsg.go +++ b/app/command_groupmsg.go @@ -93,10 +93,20 @@ func (me *groupmsgProvider) DoCommand(a *App, args *model.CommandArgs, message s } } - groupChannel, channelErr := a.CreateGroupChannel(targetUsersSlice, args.UserId) - if channelErr != nil { - mlog.Error(channelErr.Error()) - return &model.CommandResponse{Text: args.T("api.command_groupmsg.group_fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + var groupChannel *model.Channel + var channelErr *model.AppError + + if a.SessionHasPermissionTo(args.Session, model.PERMISSION_CREATE_GROUP_CHANNEL) { + groupChannel, channelErr = a.CreateGroupChannel(targetUsersSlice, args.UserId) + if channelErr != nil { + mlog.Error(channelErr.Error()) + return &model.CommandResponse{Text: args.T("api.command_groupmsg.group_fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + } + } else { + groupChannel, channelErr = a.GetGroupChannel(targetUsersSlice) + if channelErr != nil { + return &model.CommandResponse{Text: args.T("api.command_groupmsg.permission.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + } } if len(parsedMessage) > 0 { -- cgit v1.2.3-1-g7c22