summaryrefslogtreecommitdiffstats
path: root/app/command_msg.go
diff options
context:
space:
mode:
authorcpanato <ctadeu@gmail.com>2018-07-10 19:27:14 +0200
committercpanato <ctadeu@gmail.com>2018-07-10 19:27:14 +0200
commitc042ffa460296587579aff54b157a5109e022f7e (patch)
tree9e7f77fbc83b6d06204db099066be8999dbb22d9 /app/command_msg.go
parent9470564d355c201155f6fcb123152b8ac954f812 (diff)
parentdccd95bc67779a5b83a2660aec0cf4622cd56550 (diff)
downloadchat-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_msg.go')
-rw-r--r--app/command_msg.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/command_msg.go b/app/command_msg.go
index 6877c10d6..bf414210a 100644
--- a/app/command_msg.go
+++ b/app/command_msg.go
@@ -66,6 +66,10 @@ func (me *msgProvider) DoCommand(a *App, args *model.CommandArgs, message string
targetChannelId := ""
if channel := <-a.Srv.Store.Channel().GetByName(args.TeamId, channelName, true); channel.Err != nil {
if channel.Err.Id == "store.sql_channel.get_by_name.missing.app_error" {
+ if !a.SessionHasPermissionTo(args.Session, model.PERMISSION_CREATE_DIRECT_CHANNEL) {
+ return &model.CommandResponse{Text: args.T("api.command_msg.permission.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
+ }
+
if directChannel, err := a.CreateDirectChannel(args.UserId, userProfile.Id); err != nil {
mlog.Error(err.Error())
return &model.CommandResponse{Text: args.T("api.command_msg.dm_fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}