fix: preserve dm archive behavior for other users on deactivation

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

Author: abhinavkrin

apps/meteor/app/lib/server/functions/setUserActiveStatus.ts

@@ -1,6 +1,6 @@
 import type { IUser, IUserEmail } from '@rocket.chat/core-typings';
 import { isUserFederated, isDirectMessageRoom } from '@rocket.chat/core-typings';
-import { Rooms, Users } from '@rocket.chat/models';
+import { Rooms, Users, Subscriptions } from '@rocket.chat/models';
 import { Accounts } from 'meteor/accounts-base';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -12,7 +12,12 @@ import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
 import { callbacks } from '../../../../server/lib/callbacks';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
-import { notifyOnRoomChangedById, notifyOnRoomChangedByUserDM, notifyOnUserChange } from '../lib/notifyListener';
+import {
+	notifyOnRoomChangedById,
+	notifyOnRoomChangedByUserDM,
+	notifyOnSubscriptionChangedByNameAndRoomType,
+	notifyOnUserChange,
+} from '../lib/notifyListener';
 
 async function reactivateDirectConversations(userId: string) {
 	// since both users can be deactivated at the same time, we should just reactivate rooms if both users are active
@@ -107,6 +112,13 @@ export async function setUserActiveStatus(
 		await callbacks.run('afterDeactivateUser', user);
 	}
 
+	if (user.username) {
+		const { modifiedCount } = await Subscriptions.setArchivedForDMsWithUsername(user.username, !active);
+		if (modifiedCount) {
+			void notifyOnSubscriptionChangedByNameAndRoomType({ t: 'd', name: user.username });
+		}
+	}
+
 	if (active === false) {
 		await Users.unsetLoginTokens(userId);
 		await Rooms.setDmReadOnlyByUserId(userId, undefined, true, false);

apps/meteor/tests/unit/app/lib/server/functions/setUserActiveStatus.spec.ts

@@ -22,6 +22,9 @@ describe('setUserActiveStatus', () => {
 			setDmReadOnlyByUserId: sandbox.stub(),
 			getDirectConversationsByUserId: sandbox.stub(),
 		},
+		Subscriptions: {
+			setArchivedForDMsWithUsername: sandbox.stub(),
+		},
 		check: sandbox.stub(),
 		callbacks: {
 			run: sandbox.stub(),
@@ -32,6 +35,7 @@ describe('setUserActiveStatus', () => {
 		notifyOnUserChange: sandbox.stub(),
 		notifyOnRoomChangedByUserDM: sandbox.stub(),
 		notifyOnRoomChangedById: sandbox.stub(),
+		notifyOnSubscriptionChangedByNameAndRoomType: sandbox.stub(),
 		getSubscribedRoomsForUserWithDetails: sandbox.stub(),
 		shouldRemoveOrChangeOwner: sandbox.stub(),
 		getUserSingleOwnedRooms: sandbox.stub(),
@@ -56,7 +60,7 @@ describe('setUserActiveStatus', () => {
 		'meteor/meteor': { Meteor: { Error } },
 		'meteor/accounts-base': { Accounts: stubs.Accounts },
 		'@rocket.chat/core-typings': { isUserFederated: stubs.isUserFederated, isDirectMessageRoom: sinon.stub() },
-		'@rocket.chat/models': { Users: stubs.Users, Rooms: stubs.Rooms },
+		'@rocket.chat/models': { Users: stubs.Users, Rooms: stubs.Rooms, Subscriptions: stubs.Subscriptions },
 		'./closeOmnichannelConversations': { closeOmnichannelConversations: stubs.closeOmnichannelConversations },
 		'./getRoomsWithSingleOwner': {
 			shouldRemoveOrChangeOwner: stubs.shouldRemoveOrChangeOwner,
@@ -71,6 +75,7 @@ describe('setUserActiveStatus', () => {
 			notifyOnRoomChangedById: stubs.notifyOnRoomChangedById,
 			notifyOnRoomChangedByUserDM: stubs.notifyOnRoomChangedByUserDM,
 			notifyOnUserChange: stubs.notifyOnUserChange,
+			notifyOnSubscriptionChangedByNameAndRoomType: stubs.notifyOnSubscriptionChangedByNameAndRoomType,
 		},
 	});
 
@@ -91,9 +96,11 @@ describe('setUserActiveStatus', () => {
 		stubs.settings.get.returns(false);
 		stubs.Rooms.setDmReadOnlyByUserId.resolves({ modifiedCount: 0 });
 		stubs.Rooms.getDirectConversationsByUserId.returns({ toArray: sinon.stub().resolves([]) });
+		stubs.Subscriptions.setArchivedForDMsWithUsername.resolves({ modifiedCount: 0 });
 		stubs.notifyOnRoomChangedById.returns(undefined);
 		stubs.notifyOnUserChange.returns(undefined);
 		stubs.notifyOnRoomChangedByUserDM.returns(undefined);
+		stubs.notifyOnSubscriptionChangedByNameAndRoomType.returns(undefined);
 	});
 
 	afterEach(() => {
@@ -102,12 +109,16 @@ describe('setUserActiveStatus', () => {
 
 	describe('Successful status changes', () => {
 		it('should deactivate a user successfully', async () => {
+			stubs.Subscriptions.setArchivedForDMsWithUsername.resolves({ modifiedCount: 1 });
+
 			const result = await setUserActiveStatus(userId, false);
 
 			expect(result).to.be.true;
 			expect(stubs.Users.setUserActive.calledWith(userId, false)).to.be.true;
 			expect(stubs.Users.unsetLoginTokens.calledWith(userId)).to.be.true;
 			expect(stubs.Rooms.setDmReadOnlyByUserId.calledWith(userId, undefined, true, false)).to.be.true;
+			expect(stubs.Subscriptions.setArchivedForDMsWithUsername.calledWith(username, true)).to.be.true;
+			expect(stubs.notifyOnSubscriptionChangedByNameAndRoomType.calledWith({ t: 'd', name: username })).to.be.true;
 			expect(stubs.callbacks.run.calledWith('afterDeactivateUser', sinon.match({ _id: userId }))).to.be.true;
 			expect(
 				stubs.notifyOnUserChange.calledWith(
@@ -125,6 +136,7 @@ describe('setUserActiveStatus', () => {
 			expect(result).to.be.true;
 			expect(stubs.callbacks.run.calledWith('beforeActivateUser', sinon.match({ _id: userId }))).to.be.true;
 			expect(stubs.Users.setUserActive.calledWith(userId, true)).to.be.true;
+			expect(stubs.Subscriptions.setArchivedForDMsWithUsername.calledWith(username, false)).to.be.true;
 			expect(stubs.callbacks.run.calledWith('afterActivateUser', sinon.match({ _id: userId }))).to.be.true;
 			expect(stubs.Users.unsetReason.calledWith(userId)).to.be.true;
 			expect(stubs.notifyOnUserChange.calledWith(sinon.match({ clientAction: 'updated', id: userId, diff: { active: true } }))).to.be.true;

packages/model-typings/src/models/ISubscriptionsModel.ts

@@ -287,6 +287,7 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 	removeRoleById(_id: string, role: string): Promise<UpdateResult>;
 	updateDirectFNameByName(name: string, fname: string): Promise<UpdateResult | Document>;
 	setArchivedByUserId(userId: string, archived: boolean): Promise<UpdateResult | Document>;
+	setArchivedForDMsWithUsername(username: string, archived: boolean): Promise<UpdateResult | Document>;
 	updateUserHighlights(userId: string, userHighlights: any): Promise<UpdateResult | Document>;
 	updateNotificationUserPreferences(
 		userId: string,

packages/models/src/models/Subscriptions.ts

@@ -1742,6 +1742,21 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return this.updateOne(query, update);
 	}
 
+	setArchivedForDMsWithUsername(username: string, archived: boolean): Promise<UpdateResult | Document> {
+		const query: Filter<ISubscription> = {
+			name: username,
+			t: 'd',
+		};
+
+		const update: UpdateFilter<ISubscription> = {
+			$set: {
+				archived,
+			},
+		};
+
+		return this.updateMany(query, update);
+	}
+
 	setArchivedByUserId(userId: string, archived: boolean): Promise<UpdateResult | Document> {
 		const query: Filter<ISubscription> = {
 			'u._id': userId,