diff options
author | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
---|---|---|
committer | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
commit | c042ffa460296587579aff54b157a5109e022f7e (patch) | |
tree | 9e7f77fbc83b6d06204db099066be8999dbb22d9 /app/command_groupmsg.go | |
parent | 9470564d355c201155f6fcb123152b8ac954f812 (diff) | |
parent | dccd95bc67779a5b83a2660aec0cf4622cd56550 (diff) | |
download | chat-c042ffa460296587579aff54b157a5109e022f7e.tar.gz chat-c042ffa460296587579aff54b157a5109e022f7e.tar.bz2 chat-c042ffa460296587579aff54b157a5109e022f7e.zip |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710
Diffstat (limited to 'app/command_groupmsg.go')
-rw-r--r-- | app/command_groupmsg.go | 18 |
1 files changed, 14 insertions, 4 deletions
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 { |