fix: process joins from full state (#37156)

debdutdeb · ggazzo · ggazzo · commit e7483423134c · 2025-10-08T00:42:34.000-03:00
Co-authored-by: Guilherme Gazzo &lt;guilherme@gazzo.xyz&gt;
diff --git a/ee/packages/federation-matrix/package.json b/ee/packages/federation-matrix/package.json
@@ -8,6 +8,7 @@
 		"@babel/preset-env": "~7.26.0",
 		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/eslint-config": "workspace:^",
+		"@rocket.chat/federation-sdk": "0.1.19",
 		"@types/emojione": "^2.2.9",
 		"@types/node": "~22.14.0",
 		"@types/sanitize-html": "^2",
@@ -38,7 +39,6 @@
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "^0.31.25",
-		"@rocket.chat/federation-sdk": "0.1.16",
 		"@rocket.chat/http-router": "workspace:^",
 		"@rocket.chat/license": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
@@ -53,5 +53,8 @@
 		"sanitize-html": "^2.17.0",
 		"tsyringe": "^4.10.0",
 		"tweetnacl": "^1.0.3"
+	},
+	"peerDependencies": {
+		"@rocket.chat/federation-sdk": "*"
 	}
 }
diff --git a/ee/packages/federation-matrix/src/FederationMatrix.ts b/ee/packages/federation-matrix/src/FederationMatrix.ts
@@ -9,7 +9,7 @@ import {
 } from '@rocket.chat/core-typings';
 import type { MessageQuoteAttachment, IMessage, IRoom, IUser, IRoomNativeFederated } from '@rocket.chat/core-typings';
 import { eventIdSchema, getAllServices, roomIdSchema, userIdSchema } from '@rocket.chat/federation-sdk';
-import type { EventID, UserID, HomeserverServices, FileMessageType, PresenceState } from '@rocket.chat/federation-sdk';
+import type { EventID, UserID, HomeserverServices, FileMessageType, PresenceState, PduForType } from '@rocket.chat/federation-sdk';
 import { Logger } from '@rocket.chat/logger';
 import { Users, Subscriptions, Messages, Rooms, Settings } from '@rocket.chat/models';
 import emojione from 'emojione';
@@ -971,4 +971,21 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 
 		return results;
 	}
+
+	async emitJoin(membershipEvent: PduForType<'m.room.member'>, eventId: EventID) {
+		if (!this.homeserverServices) {
+			this.logger.warn('Homeserver services not available, skipping user role room scoped');
+			return;
+		}
+
+		this.homeserverServices.emitter.emit('homeserver.matrix.membership', {
+			event_id: eventId,
+			event: membershipEvent,
+			room_id: membershipEvent.room_id,
+			state_key: membershipEvent.state_key,
+			content: { membership: 'join' },
+			sender: membershipEvent.sender,
+			origin_server_ts: Date.now(),
+		});
+	}
 }
diff --git a/ee/packages/federation-matrix/src/api/_matrix/invite.ts b/ee/packages/federation-matrix/src/api/_matrix/invite.ts
@@ -1,4 +1,4 @@
-import { Room } from '@rocket.chat/core-services';
+import { FederationMatrix, Room } from '@rocket.chat/core-services';
 import { isUserNativeFederated, type IUser } from '@rocket.chat/core-typings';
 import { eventIdSchema, roomIdSchema } from '@rocket.chat/federation-sdk';
 import type {
@@ -172,7 +172,7 @@ async function joinRoom({
 	await room.joinUser(inviteEvent.roomId, inviteEvent.event.state_key);
 
 	// now we create the room we saved post joining
-	const matrixRoom = await state.getFullRoomState2(inviteEvent.roomId);
+	const matrixRoom = await state.getLatestRoomState2(inviteEvent.roomId);
 	if (!matrixRoom) {
 		throw new Error('room not found not processing invite');
 	}
@@ -265,6 +265,10 @@ async function joinRoom({
 	}
 
 	await Room.addUserToRoom(internalRoomId, { _id: user._id }, { _id: senderUserId, username: inviteEvent.sender });
+
+	for await (const event of matrixRoom.getMemberJoinEvents()) {
+		await FederationMatrix.emitJoin(event.event, event.eventId);
+	}
 }
 
 async function startJoiningRoom(...opts: Parameters<typeof joinRoom>) {
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
@@ -8,6 +8,7 @@
 		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
+		"@rocket.chat/federation-sdk": "0.1.19",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@types/jest": "~30.0.0",
@@ -43,5 +44,8 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~"
+	},
+	"peerDependencies": {
+		"@rocket.chat/federation-sdk": "*"
 	}
 }
diff --git a/packages/core-services/src/types/IFederationMatrixService.ts b/packages/core-services/src/types/IFederationMatrixService.ts
@@ -1,4 +1,5 @@
 import type { IMessage, IRoomFederated, IRoomNativeFederated, IUser } from '@rocket.chat/core-typings';
+import type { EventID, PduForType } from '@rocket.chat/federation-sdk';
 
 export interface IFederationMatrixService {
 	createRoom(room: IRoomFederated, owner: IUser, members: string[]): Promise<{ room_id: string; event_id: string }>;
@@ -23,4 +24,5 @@ export interface IFederationMatrixService {
 	inviteUsersToRoom(room: IRoomFederated, usersUserName: string[], inviter: IUser): Promise<void>;
 	notifyUserTyping(rid: string, user: string, isTyping: boolean): Promise<void>;
 	verifyMatrixIds(matrixIds: string[]): Promise<{ [key: string]: string }>;
+	emitJoin(membershipEvent: PduForType<'m.room.member'>, eventId: EventID): Promise<void>;
 }
diff --git a/yarn.lock b/yarn.lock
