From 10c5a927cb619f1aa2a599cbe3667820f4766bda Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 9 Nov 2017 14:46:20 -0600 Subject: more global config ref cleanup (#7802) --- app/command_remove.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'app/command_remove.go') diff --git a/app/command_remove.go b/app/command_remove.go index 6047ff5be..a9c21e2d5 100644 --- a/app/command_remove.go +++ b/app/command_remove.go @@ -10,7 +10,6 @@ import ( goi18n "github.com/nicksnyder/go-i18n/i18n" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) type RemoveProvider struct { @@ -37,7 +36,7 @@ func (me *KickProvider) GetTrigger() string { return CMD_KICK } -func (me *RemoveProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { +func (me *RemoveProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Command { return &model.Command{ Trigger: CMD_REMOVE, AutoComplete: true, @@ -47,7 +46,7 @@ func (me *RemoveProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { } } -func (me *KickProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { +func (me *KickProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Command { return &model.Command{ Trigger: CMD_KICK, AutoComplete: true, @@ -102,7 +101,7 @@ func doCommand(a *App, args *model.CommandArgs, message string) *model.CommandRe _, err = a.GetChannelMember(args.ChannelId, userProfile.Id) if err != nil { - nameFormat := *utils.Cfg.TeamSettings.TeammateNameDisplay + nameFormat := *a.Config().TeamSettings.TeammateNameDisplay return &model.CommandResponse{Text: args.T("api.command_remove.user_not_in_channel", map[string]interface{}{"Username": userProfile.GetDisplayName(nameFormat)}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } -- cgit v1.2.3-1-g7c22