fix: Changes because of conflict resolution because of a refactor

Author: KevLehman

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

@@ -15,7 +15,11 @@ import { notifyOnRoomChangedById, notifyOnSubscriptionChanged } from '../lib/not
  * Executes only the necessary database operations, with no callbacks, to prevent
  * propagation loops during external event processing.
  */
-export const performUserRemoval = async function (room: IRoom, user: IUser, options?: { byUser?: IUser }): Promise<void> {
+export const performUserRemoval = async function (
+	room: IRoom,
+	user: IUser,
+	options?: { byUser?: IUser; skipAppPreEvents?: boolean; customSystemMessage?: MessageTypesValues },
+): Promise<void> {
 	const subscription = await Subscriptions.findOneByRoomIdAndUserId(room._id, user._id, {
 		projection: { _id: 1, status: 1 },
 	});
@@ -28,7 +32,9 @@ export const performUserRemoval = async function (room: IRoom, user: IUser, opti
 
 	if (subscription) {
 		const removedUser = user;
-		if (options?.byUser) {
+		if (options?.customSystemMessage) {
+			await Message.saveSystemMessage(options?.customSystemMessage, room._id, user.username || '', user);
+		} else if (options?.byUser) {
 			const extraData = {
 				u: options.byUser,
 			};
@@ -99,49 +105,6 @@ export const removeUserFromRoom = async function (
 
 	await performUserRemoval(room, user, options);
 
-	const subscription = await Subscriptions.findOneByRoomIdAndUserId(rid, user._id, {
-		projection: { _id: 1 },
-	});
-
-	if (subscription) {
-		const removedUser = user;
-		if (options?.customSystemMessage) {
-			await Message.saveSystemMessage(options?.customSystemMessage, rid, user.username || '', user);
-		} else if (options?.byUser) {
-			const extraData = {
-				u: options.byUser,
-			};
-
-			if (room.teamMain) {
-				await Message.saveSystemMessage('removed-user-from-team', rid, user.username || '', user, extraData);
-			} else {
-				await Message.saveSystemMessage('ru', rid, user.username || '', user, extraData);
-			}
-		} else if (room.teamMain) {
-			await Message.saveSystemMessage('ult', rid, removedUser.username || '', removedUser);
-		} else {
-			await Message.saveSystemMessage('ul', rid, removedUser.username || '', removedUser);
-		}
-	}
-
-	if (room.t === 'l') {
-		await Message.saveSystemMessage('command', rid, 'survey', user);
-	}
-
-	const deletedSubscription = await Subscriptions.removeByRoomIdAndUserId(rid, user._id);
-	if (deletedSubscription) {
-		void notifyOnSubscriptionChanged(deletedSubscription, 'removed');
-	}
-
-	if (room.teamId && room.teamMain) {
-		await Team.removeMember(room.teamId, user._id);
-	}
-
-	if (room.encrypted && settings.get('E2E_Enable')) {
-		await Rooms.removeUsersFromE2EEQueueByRoomId(room._id, [user._id]);
-	}
-
-	// TODO: CACHE: maybe a queue?
 	await afterLeaveRoomCallback.run({ user, kicker: options?.byUser }, room);
 
 	await Apps.self?.triggerEvent(AppEvents.IPostRoomUserLeave, room, user, options?.byUser);