add TODOs

Author: sampaiodiego

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

@@ -15,20 +15,14 @@ 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 (rid: string, user: IUser, options?: { byUser?: IUser }): Promise<void> {
+export const performUserRemoval = async function (room: IRoom, user: IUser, options?: { byUser?: IUser }): Promise<void> {
 	const subscription = await Subscriptions.findOneByRoomIdAndUserId(rid, user._id, {
 		projection: { _id: 1, status: 1 },
 	});
 	if (!subscription) {
 		return;
 	}
 
-	const room = await Rooms.findOneById(rid);
-
-	if (!room) {
-		return;
-	}
-
 	// TODO: move before callbacks to service
 	await beforeLeaveRoomCallback.run(user, room);
 
@@ -96,7 +90,7 @@ export const removeUserFromRoom = async function (rid: string, user: IUser, opti
 
 	await Room.beforeLeave(room);
 
-	await performUserRemoval(rid, user, options);
+	await performUserRemoval(room, user, options);
 
 	await afterLeaveRoomCallback.run({ user, kicker: options?.byUser }, room);
 

apps/meteor/server/services/room/service.ts

@@ -86,8 +86,8 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
 		return removeUserFromRoom(roomId, user, options);
 	}
 
-	async performUserRemoval(roomId: string, user: IUser, options?: { byUser?: IUser }): Promise<void> {
-		return performUserRemoval(roomId, user, options);
+	async performUserRemoval(room: IRoom, user: IUser, options?: { byUser?: IUser }): Promise<void> {
+		return performUserRemoval(room, user, options);
 	}
 
 	async performAcceptRoomInvite(room: IRoom, subscription: ISubscription, user: IUser & { username: string }): Promise<void> {

ee/packages/federation-matrix/src/FederationMatrix.ts

@@ -553,7 +553,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 						return;
 					}
 
-					await federationSDK.inviteUserToRoom(
+					return federationSDK.inviteUserToRoom(
 						userIdSchema.parse(`@${username}:${this.serverName}`),
 						roomIdSchema.parse(room.federation.mrid),
 						userIdSchema.parse(inviterUserId),

ee/packages/federation-matrix/src/events/member.ts

@@ -30,7 +30,8 @@ async function getOrCreateFederatedUser(userId: string): Promise<IUser> {
 			origin: userServerName,
 		});
 	} catch (error) {
-		throw new Error(`Error getting or creating federated user ${userId}: ${error}`);
+		logger.error(error, `Error getting or creating federated user ${userId}`);
+		throw new Error(`Error getting or creating federated user ${userId}`);
 	}
 }
 
@@ -57,6 +58,8 @@ async function getOrCreateFederatedRoom({
 			return room;
 		}
 
+		// TODO room creator is not always the inviter
+
 		return Room.create(inviterUserId, {
 			type: roomType,
 			name: roomName,
@@ -71,7 +74,8 @@ async function getOrCreateFederatedRoom({
 			},
 		});
 	} catch (error) {
-		throw new Error(`Error getting or creating federated room ${roomName}: ${error}`);
+		logger.error(error, `Error getting or creating federated room ${roomName}`);
+		throw new Error(`Error getting or creating federated room ${roomName}`);
 	}
 }
 
@@ -208,17 +212,22 @@ async function handleLeave({
 	room_id: roomId,
 	state_key: userId,
 }: HomeserverEventSignatures['homeserver.matrix.membership']['event']): Promise<void> {
-	const leavingUser = await getOrCreateFederatedUser(userId);
+	const serverName = federationSDK.getConfig('serverName');
+	const [username] = getUsernameServername(userId, serverName);
+
+	const leavingUser = await Users.findOneByUsername(username);
 	if (!leavingUser) {
-		throw new Error(`Failed to get or create leaving user: ${userId}`);
+		return;
 	}
 
 	const room = await Rooms.findOneFederatedByMrid(roomId);
 	if (!room) {
 		throw new Error(`Room not found while leaving user ${userId} from room ${roomId}`);
 	}
 
-	await Room.performUserRemoval(room._id, leavingUser);
+	await Room.performUserRemoval(room, leavingUser);
+
+	// TODO check if there are no pending invites to the room, and if so, delete the room
 }
 
 export function member(emitter: Emitter<HomeserverEventSignatures>) {

packages/core-services/src/types/IRoomService.ts

@@ -44,7 +44,7 @@ export interface IRoomService {
 		},
 	): Promise<boolean | undefined>;
 	removeUserFromRoom(roomId: string, user: IUser, options?: { byUser: Pick<IUser, '_id' | 'username'> }): Promise<void>;
-	performUserRemoval(roomId: string, user: IUser, options?: { byUser?: IUser }): Promise<void>;
+	performUserRemoval(room: IRoom, user: IUser, options?: { byUser?: IUser }): Promise<void>;
 	performAcceptRoomInvite(room: IRoom, subscription: ISubscription, user: IUser): Promise<void>;
 	getValidRoomName(displayName: string, roomId?: string, options?: { allowDuplicates?: boolean }): Promise<string>;
 	saveRoomTopic(