use model methods

Author: sampaiodiego

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

@@ -376,11 +376,11 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
 		});
 	}
 
-	async inviteUserAfterBan(subscription: ISubscription, inviterUser: Pick<IUser, '_id' | 'username' | 'name'>): Promise<void> {
-		await Subscriptions.updateOne(
-			{ _id: subscription._id },
-			{ $set: { status: 'INVITED', open: true, unread: 1, userMentions: 1, groupMentions: 0, alert: true, inviter: inviterUser } },
-		);
+	async unbanAndInviteUser(
+		subscription: ISubscription,
+		inviterUser: Required<Pick<IUser, '_id' | 'username'>> & Pick<IUser, 'name'>,
+	): Promise<void> {
+		await Subscriptions.unbanToInvitedById(subscription._id, inviterUser);
 
 		void notifyOnSubscriptionChangedById(subscription._id, 'updated');
 	}

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

@@ -244,7 +244,7 @@ async function handleInvite({
 	if (subscription) {
 		// if subscription state says the user is banned, it means the user was previously banned and is now being re-invited, so we need to unban the user instead of creating a new invite
 		if (isBannedSubscription(subscription)) {
-			await Room.inviteUserAfterBan(subscription, inviterUser);
+			await Room.unbanAndInviteUser(subscription, inviterUser);
 		}
 		return;
 	}

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

@@ -79,5 +79,5 @@ export interface IRoomService {
 	): Promise<boolean>;
 	markAsRead(room: IRoom, userId: string, readThreads?: boolean): Promise<void>;
 	readThread(params: { user: IUser; room: IRoom; tmid: string }): Promise<void>;
-	inviteUserAfterBan(subscription: ISubscription, inviterUser: Pick<IUser, '_id' | 'username' | 'name'>): Promise<void>;
+	unbanAndInviteUser(subscription: ISubscription, inviterUser: Pick<IUser, '_id' | 'username' | 'name'>): Promise<void>;
 }

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

@@ -342,6 +342,7 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 	findBannedByRoomId(roomId: ISubscription['rid']): FindCursor<ISubscription>;
 	banByRoomIdAndUserId(roomId: string, userId: string): Promise<UpdateResult>;
 	unbanByRoomIdAndUserId(roomId: string, userId: string): Promise<UpdateResult>;
+	unbanToInvitedById(subId: string, inviter: Required<Pick<IUser, '_id' | 'username'>> & Pick<IUser, 'name'>): Promise<UpdateResult>;
 	setAbacLastTimeCheckedByUserIdAndRoomId(userId: string, roomId: string, time: Date): Promise<UpdateResult>;
 	findJoinedByUserId<T extends Document = ISubscription>(userId: ISubscription['u']['_id'], options?: FindOptions<T>): FindCursor<T>;
 }

packages/models/src/models/Subscriptions.ts

@@ -2152,6 +2152,13 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		);
 	}
 
+	unbanToInvitedById(subId: string, inviter: Required<Pick<IUser, '_id' | 'username'>> & Pick<IUser, 'name'>): Promise<UpdateResult> {
+		return this.updateOne(
+			{ _id: subId, status: 'BANNED' },
+			{ $set: { status: 'INVITED', open: true, unread: 1, userMentions: 1, groupMentions: 0, alert: true, inviter } },
+		);
+	}
+
 	setAbacLastTimeCheckedByUserIdAndRoomId(userId: string, roomId: string, time: Date): Promise<UpdateResult> {
 		const query = {
 			'rid': roomId,