diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-21 04:13:34 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-09-21 10:13:34 +0100 |
commit | 266ff8670244da288aec937320d9eecc7996af35 (patch) | |
tree | 39e4e528cda0abb24be317683516ee246717fc68 /cmd/platform/channelargs.go | |
parent | adab1a660fdc0c307238279edc7a9918d14577e5 (diff) | |
download | chat-266ff8670244da288aec937320d9eecc7996af35.tar.gz chat-266ff8670244da288aec937320d9eecc7996af35.tar.bz2 chat-266ff8670244da288aec937320d9eecc7996af35.zip |
remove more global refs (#7480)
Diffstat (limited to 'cmd/platform/channelargs.go')
-rw-r--r-- | cmd/platform/channelargs.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/platform/channelargs.go b/cmd/platform/channelargs.go index 22238dc6a..c12a9cc9a 100644 --- a/cmd/platform/channelargs.go +++ b/cmd/platform/channelargs.go @@ -12,10 +12,10 @@ import ( const CHANNEL_ARG_SEPARATOR = ":" -func getChannelsFromChannelArgs(channelArgs []string) []*model.Channel { +func getChannelsFromChannelArgs(a *app.App, channelArgs []string) []*model.Channel { channels := make([]*model.Channel, 0, len(channelArgs)) for _, channelArg := range channelArgs { - channel := getChannelFromChannelArg(channelArg) + channel := getChannelFromChannelArg(a, channelArg) channels = append(channels, channel) } return channels @@ -29,7 +29,7 @@ func parseChannelArg(channelArg string) (string, string) { return result[0], result[1] } -func getChannelFromChannelArg(channelArg string) *model.Channel { +func getChannelFromChannelArg(a *app.App, channelArg string) *model.Channel { teamArg, channelPart := parseChannelArg(channelArg) if teamArg == "" && channelPart == "" { return nil @@ -37,12 +37,12 @@ func getChannelFromChannelArg(channelArg string) *model.Channel { var channel *model.Channel if teamArg != "" { - team := getTeamFromTeamArg(teamArg) + team := getTeamFromTeamArg(a, teamArg) if team == nil { return nil } - if result := <-app.Global().Srv.Store.Channel().GetByNameIncludeDeleted(team.Id, channelPart, true); result.Err == nil { + if result := <-a.Srv.Store.Channel().GetByNameIncludeDeleted(team.Id, channelPart, true); result.Err == nil { channel = result.Data.(*model.Channel) } else { fmt.Println(result.Err.Error()) @@ -50,7 +50,7 @@ func getChannelFromChannelArg(channelArg string) *model.Channel { } if channel == nil { - if result := <-app.Global().Srv.Store.Channel().Get(channelPart, true); result.Err == nil { + if result := <-a.Srv.Store.Channel().Get(channelPart, true); result.Err == nil { channel = result.Data.(*model.Channel) } } |