From 04eb044b0b8ae90599eda66d24360f9f9792462e Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 1 Oct 2025 17:12:11 -0300
Subject: [PATCH] regresion: fix typing loop

---
 apps/meteor/server/modules/listeners/listeners.module.ts | 2 +-
 ee/packages/federation-matrix/src/events/edu.ts          | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/meteor/server/modules/listeners/listeners.module.ts b/apps/meteor/server/modules/listeners/listeners.module.ts
index 017108bdec0be..a9e220211a9d5 100644
--- a/apps/meteor/server/modules/listeners/listeners.module.ts
+++ b/apps/meteor/server/modules/listeners/listeners.module.ts
@@ -186,7 +186,7 @@ export class ListenersModule {
 		});
 
 		service.onEvent('user.activity', ({ isTyping, roomId, user }) => {
-			notifications.notifyRoom(roomId, 'user-activity', user, isTyping ? ['user-typing'] : []);
+			notifications.notifyRoomInThisInstance(roomId, 'user-activity', user, isTyping ? ['user-typing'] : []);
 		});
 
 		service.onEvent('watch.messages', async ({ message }) => {
diff --git a/ee/packages/federation-matrix/src/events/edu.ts b/ee/packages/federation-matrix/src/events/edu.ts
index 563ae4d404f1c..7628a520624b4 100644
--- a/ee/packages/federation-matrix/src/events/edu.ts
+++ b/ee/packages/federation-matrix/src/events/edu.ts
@@ -20,14 +20,8 @@ export const edus = async (emitter: Emitter<HomeserverEventSignatures>, eduProce
 				return;
 			}
 
-			const matrixUser = await Users.findOne({ 'federation.mui': data.user_id });
-			if (!matrixUser?.username) {
-				logger.debug(`No bridged user found for Matrix user_id: ${data.user_id}`);
-				return;
-			}
-
 			void api.broadcast('user.activity', {
-				user: matrixUser.username,
+				user: data.user_id,
 				isTyping: data.typing,
 				roomId: matrixRoom._id,
 			});