fix: bad state for event member creation

ggazzo · ggazzo · commit 0e738748fbf3 · 2025-09-15T21:03:01.000-03:00
diff --git a/packages/federation-sdk/src/services/state.service.ts b/packages/federation-sdk/src/services/state.service.ts
@@ -114,7 +114,10 @@ export class StateService {
 	 * Returns the state used to validate the event
 	 * This is the state prior to the event
 	 */
-	async findStateAtEvent(eventId: string): Promise<State> {
+	async findStateAtEvent(
+		eventId: string,
+		include: 'always' | 'event' = 'event',
+	): Promise<State> {
 		this.logger.debug({ eventId }, 'finding state before event');
 
 		const event = await this.eventRepository.findById(eventId);
@@ -136,7 +139,10 @@ export class StateService {
 
 		// The fully resolved state for the room, prior to considering any state changes induced by the requested event. Includes the authorization chain for the events.
 
-		if (pdu.type === 'm.room.create') {
+		const includeEvent =
+			include === 'always' || (include === 'event' && !pdu.isState());
+
+		if (pdu.isCreateEvent() && !includeEvent) {
 			return new Map();
 		}
 
@@ -157,8 +163,6 @@ export class StateService {
 
 		const state = new Map<StateMapKey, PersistentEventBase>();
 
-		const includeEvent = !pdu.isState();
-
 		/**
 		 * If the event is a state event, we don't include the event in the state, otherwise the state would be the new state
 		 * computed because of the event
@@ -621,7 +625,7 @@ export class StateService {
 			lastState?._id?.toString(),
 		);
 
-		const state = await this.findStateAtEvent(lastEvent._id);
+		const state = await this.findStateAtEvent(lastEvent._id, 'always');
 
 		this.logState('state at last event seen:', state);
 
