From a0f75cadb2b0fa91f6e321b1b8b859519b2ec865 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Mon, 1 Oct 2018 13:51:12 +0100 Subject: MM-12110: Don't /invite or /kick deactivated users. (#9494) --- app/command_invite.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/command_invite.go') diff --git a/app/command_invite.go b/app/command_invite.go index 1f6006018..c4f197374 100644 --- a/app/command_invite.go +++ b/app/command_invite.go @@ -49,15 +49,21 @@ func (me *InviteProvider) DoCommand(a *App, args *model.CommandArgs, message str targetUsername := splitMessage[0] targetUsername = strings.TrimPrefix(targetUsername, "@") - var userProfile *model.User - if result := <-a.Srv.Store.User().GetByUsername(targetUsername); result.Err != nil { + result := <-a.Srv.Store.User().GetByUsername(targetUsername) + if result.Err != nil { mlog.Error(result.Err.Error()) return &model.CommandResponse{ Text: args.T("api.command_invite.missing_user.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, } - } else { - userProfile = result.Data.(*model.User) + } + + userProfile := result.Data.(*model.User) + if userProfile.DeleteAt != 0 { + return &model.CommandResponse{ + Text: args.T("api.command_invite.missing_user.app_error"), + ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, + } } var channelToJoin *model.Channel -- cgit v1.2.3-1-g7c22