diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-06 17:12:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 17:12:54 -0500 |
| commit | 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 (patch) | |
| tree | 2766bacc1f045fa685ca3d8310cd6174d0311d09 /app/command_join.go | |
| parent | b84bd21089d305333fa4114b95be70f5ad94ad1b (diff) | |
| download | chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.gz chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.bz2 chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.zip | |
app type transition (#7167)
Diffstat (limited to 'app/command_join.go')
| -rw-r--r-- | app/command_join.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/command_join.go b/app/command_join.go index 07ae391ae..7b79f77e9 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -34,14 +34,14 @@ func (me *JoinProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { } func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *model.CommandResponse { - if result := <-Srv.Store.Channel().GetByName(args.TeamId, message, true); result.Err != nil { + if result := <-Global().Srv.Store.Channel().GetByName(args.TeamId, message, 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 { allowed := false - if (channel.Type == model.CHANNEL_PRIVATE && SessionHasPermissionToChannel(args.Session, channel.Id, model.PERMISSION_READ_CHANNEL)) || channel.Type == model.CHANNEL_OPEN { + if (channel.Type == model.CHANNEL_PRIVATE && Global().SessionHasPermissionToChannel(args.Session, channel.Id, model.PERMISSION_READ_CHANNEL)) || channel.Type == model.CHANNEL_OPEN { allowed = true } @@ -49,11 +49,11 @@ func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *mode return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - if err := JoinChannel(channel, args.UserId); err != nil { + if err := Global().JoinChannel(channel, args.UserId); err != nil { return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - team, err := GetTeam(channel.TeamId) + team, err := Global().GetTeam(channel.TeamId) if err != nil { return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } |