diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-14 12:01:44 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-14 13:01:44 -0400 |
| commit | b6fb98a43176215f16fc52b64abebde51355e5c1 (patch) | |
| tree | 095a2006bdfdd30d1a9c4fc4e604924fc0f50225 /app/command_join.go | |
| parent | af81f7e48bd2afaaa8c71f78bf86bdc00b104e4d (diff) | |
| download | chat-b6fb98a43176215f16fc52b64abebde51355e5c1.tar.gz chat-b6fb98a43176215f16fc52b64abebde51355e5c1.tar.bz2 chat-b6fb98a43176215f16fc52b64abebde51355e5c1.zip | |
remove more global references (#7442)
Diffstat (limited to 'app/command_join.go')
| -rw-r--r-- | app/command_join.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/command_join.go b/app/command_join.go index a4ba6ec31..58b0170be 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -33,15 +33,15 @@ func (me *JoinProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { } } -func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *model.CommandResponse { - if result := <-Global().Srv.Store.Channel().GetByName(args.TeamId, message, true); result.Err != nil { +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 { 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 && Global().SessionHasPermissionToChannel(args.Session, channel.Id, model.PERMISSION_READ_CHANNEL)) || channel.Type == model.CHANNEL_OPEN { + if (channel.Type == model.CHANNEL_PRIVATE && a.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 := Global().JoinChannel(channel, args.UserId); err != nil { + if err := a.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 := Global().GetTeam(channel.TeamId) + team, err := a.GetTeam(channel.TeamId) if err != nil { return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } |