RocketChat
diff --git a/‎packages/core/src/events/m.room.tombstone.ts‎
Lines changed: 3 additions & 3 deletions b/‎packages/core/src/events/m.room.tombstone.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎packages/federation-sdk/src/services/invite.service.ts‎
Lines changed: 26 additions & 21 deletions b/‎packages/federation-sdk/src/services/invite.service.ts‎
Lines changed: 26 additions & 21 deletions
@@ -20,9 +20,9 @@ declare module './eventBase' {
 }
 
 export type TombstoneAuthEvents = {
-	'm.room.create': string | undefined;
-	'm.room.power_levels': string | undefined;
-	'm.room.member': string | undefined;
+	'm.room.create': string;
+	'm.room.power_levels': string;
+	'm.room.member': string;
 };
 
 type RoomTombstoneEventProps = {
 
@@ -41,27 +41,32 @@ export class InviteService {
 
 		const roomInformation = await stateService.getRoomInformation(roomId);
 
-		const inviteEvent = isDirectMessage
-			? PersistentEventFactory.newDirectMessageMembershipEvent(
-					roomId,
-					sender,
-					userId,
-					'invite',
-					roomInformation,
-				)
-			: PersistentEventFactory.newMembershipEvent(
-					roomId,
-					sender,
-					userId,
-					'invite',
-					roomInformation,
-				);
-
-		await stateService.addAuthEvents(inviteEvent);
-
-		await stateService.addPrevEvents(inviteEvent);
-
-		await stateService.signEvent(inviteEvent);
+		// Extract displayname from userId for direct messages
+		const displayname = isDirectMessage
+			? userId.split(':').shift()?.slice(1)
+			: undefined;
+
+		const inviteEvent = await stateService.buildEvent<'m.room.member'>(
+			{
+				type: 'm.room.member',
+				content: {
+					membership: 'invite',
+					...(isDirectMessage && {
+						is_direct: true,
+						displayname: displayname,
+					}),
+				},
+				room_id: roomId,
+				state_key: userId,
+				auth_events: [],
+				depth: 0,
+				prev_events: [],
+				origin_server_ts: Date.now(),
+				sender: sender,
+			},
+
+			roomInformation.room_version,
+		);
 
 		// SPEC: Invites a remote user to a room. Once the event has been signed by both the inviting homeserver and the invited homeserver, it can be sent to all of the servers in the room by the inviting homeserver.