Merge branch 'cinnyapp:dev' into master

Kx501 · web-flow · commit fad49f0c6166 · 2026-01-15T21:19:01.000+08:00
diff --git a/src/app/components/editor/output.ts b/src/app/components/editor/output.ts
@@ -212,9 +212,10 @@ export const getMentions = (mx: MatrixClient, roomId: string, editor: Editor): M
     if (node.type === BlockType.CodeBlock) return;
 
     if (node.type === BlockType.Mention) {
-      if (node.id === getCanonicalAliasOrRoomId(mx, roomId)) {
+      if (node.name === '@room') {
         mentionData.room = true;
       }
+      
       if (isUserId(node.id) && node.id !== mx.getUserId()) {
         mentionData.users.add(node.id);
       }

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,10 @@ export const getMentions = (mx: MatrixClient, roomId: string, editor: Editor): M`
`212`	`212`	`if (node.type === BlockType.CodeBlock) return;`
`213`	`213`
`214`	`214`	`if (node.type === BlockType.Mention) {`
`215`		`- if (node.id === getCanonicalAliasOrRoomId(mx, roomId)) {`
	`215`	`+ if (node.name === '@room') {`
`216`	`216`	`mentionData.room = true;`
`217`	`217`	`}`
	`218`	`+`
`218`	`219`	`if (isUserId(node.id) && node.id !== mx.getUserId()) {`
`219`	`220`	`mentionData.users.add(node.id);`
`220`	`221`	`}`