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_msg.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_msg.go')
-rw-r--r-- | app/command_msg.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/command_msg.go b/app/command_msg.go index 348499f57..648903f0d 100644 --- a/app/command_msg.go +++ b/app/command_msg.go @@ -36,7 +36,7 @@ func (me *msgProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { } } -func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model.CommandResponse { +func (me *msgProvider) DoCommand(a *App, args *model.CommandArgs, message string) *model.CommandResponse { splitMessage := strings.SplitN(message, " ", 2) @@ -51,7 +51,7 @@ func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model targetUsername = strings.TrimPrefix(targetUsername, "@") var userProfile *model.User - if result := <-Global().Srv.Store.User().GetByUsername(targetUsername); result.Err != nil { + if result := <-a.Srv.Store.User().GetByUsername(targetUsername); result.Err != nil { l4g.Error(result.Err.Error()) return &model.CommandResponse{Text: args.T("api.command_msg.missing.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } else { @@ -66,9 +66,9 @@ func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model channelName := model.GetDMNameFromIds(args.UserId, userProfile.Id) targetChannelId := "" - if channel := <-Global().Srv.Store.Channel().GetByName(args.TeamId, channelName, true); channel.Err != nil { + 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 directChannel, err := Global().CreateDirectChannel(args.UserId, userProfile.Id); err != nil { + if directChannel, err := a.CreateDirectChannel(args.UserId, userProfile.Id); err != nil { l4g.Error(err.Error()) return &model.CommandResponse{Text: args.T("api.command_msg.dm_fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } else { @@ -89,7 +89,7 @@ func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model post.Message = parsedMessage post.ChannelId = targetChannelId post.UserId = args.UserId - if _, err := Global().CreatePostMissingChannel(post, true); err != nil { + if _, err := a.CreatePostMissingChannel(post, true); err != nil { return &model.CommandResponse{Text: args.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } } @@ -101,7 +101,7 @@ func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model teamId = args.Session.TeamMembers[0].TeamId } - team, err := Global().GetTeam(teamId) + team, err := a.GetTeam(teamId) if err != nil { return &model.CommandResponse{Text: args.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } |