From d6e2784916c023e633d9ebefeeb8bc4d250cf25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=87=E3=83=AF=E3=83=B3=E3=82=B7=E3=83=A5?=
 <61188295+Dnouv@users.noreply.github.com>
Date: Tue, 17 Oct 2023 01:20:26 +0530
Subject: [PATCH] fix: apps typing indicator not working (#30360)

---
 .changeset/rich-dogs-smell.md                   | 5 +++++
 apps/meteor/app/apps/server/bridges/messages.ts | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/rich-dogs-smell.md

diff --git a/.changeset/rich-dogs-smell.md b/.changeset/rich-dogs-smell.md
new file mode 100644
index 0000000000000..be27db28e2272
--- /dev/null
+++ b/.changeset/rich-dogs-smell.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Fix typing indicator of Apps user
diff --git a/apps/meteor/app/apps/server/bridges/messages.ts b/apps/meteor/app/apps/server/bridges/messages.ts
index d75a0c2446743..e4d09018176d5 100644
--- a/apps/meteor/app/apps/server/bridges/messages.ts
+++ b/apps/meteor/app/apps/server/bridges/messages.ts
@@ -103,7 +103,11 @@ export class AppMessageBridge extends MessageBridge {
 	protected async typing({ scope, id, username, isTyping }: ITypingDescriptor): Promise<void> {
 		switch (scope) {
 			case 'room':
-				notifications.notifyRoom(id, 'typing', username!, isTyping);
+				if (!username) {
+					throw new Error('Invalid username');
+				}
+
+				notifications.notifyRoom(id, 'user-activity', username, isTyping ? ['user-typing'] : []);
 				return;
 			default:
 				throw new Error('Unrecognized typing scope provided');