From 794ae335b3e78f98d451578fd502a58b872aa56a Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 12 Sep 2019 11:30:15 -0300 Subject: [PATCH] MM-17953 Set updateAt and remove from cache when a user is (de)activated (#12178) --- app/user.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/user.go b/app/user.go index 2920eaefa8..0b9f5922dd 100644 --- a/app/user.go +++ b/app/user.go @@ -978,10 +978,11 @@ func (a *App) invalidateUserChannelMembersCaches(user *model.User) *model.AppErr } func (a *App) UpdateActive(user *model.User, active bool) (*model.User, *model.AppError) { + user.UpdateAt = model.GetMillis() if active { user.DeleteAt = 0 } else { - user.DeleteAt = model.GetMillis() + user.DeleteAt = user.UpdateAt } userUpdate, err := a.Srv.Store.User().Update(user, true) @@ -997,6 +998,7 @@ func (a *App) UpdateActive(user *model.User, active bool) (*model.User, *model.A } a.invalidateUserChannelMembersCaches(user) + a.InvalidateCacheForUser(user.Id) a.sendUpdatedUserEvent(*ruser)