Implement MSC4142: Remove unintentional intentional mentions in replies (#28209)

* Implement MSC4142: Remove unintentional intentional mentions in replies

* Fix comment

Author: tulir

src/components/views/rooms/SendMessageComposer.tsx

@@ -95,16 +95,9 @@ export function attachMentions(
     const userMentions = new Set<string>();
     let roomMention = false;
 
-    // If there's a reply, initialize the mentioned users as the sender of that
-    // event + any mentioned users in that event.
+    // If there's a reply, initialize the mentioned users as the sender of that event.
     if (replyToEvent) {
         userMentions.add(replyToEvent.sender!.userId);
-        // TODO What do we do if the reply event *doeesn't* have this property?
-        // Try to fish out replies from the contents?
-        const userIds = replyToEvent.getContent()["m.mentions"]?.user_ids;
-        if (Array.isArray(userIds)) {
-            userIds.forEach((userId) => userMentions.add(userId));
-        }
     }
 
     // If user provided content is available, check to see if any users are mentioned.

test/unit-tests/components/views/rooms/EditMessageComposer-test.tsx

@@ -432,8 +432,6 @@ describe("<EditMessageComposer/>", () => {
                     user_ids: [
                         // sender of event we replied to
                         originalEvent.getSender()!,
-                        // mentions from this event
-                        "@bob:server.org",
                     ],
                 },
             },

test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx

@@ -194,7 +194,7 @@ describe("<SendMessageComposer/>", () => {
                 "m.mentions": { user_ids: ["@bob:test"] },
             });
 
-            // It also adds any other mentioned users, but removes yourself.
+            // It no longer adds any other mentioned users
             replyToEvent = mkEvent({
                 type: "m.room.message",
                 user: "@bob:test",
@@ -205,7 +205,7 @@ describe("<SendMessageComposer/>", () => {
             content = {};
             attachMentions("@alice:test", content, model, replyToEvent);
             expect(content).toEqual({
-                "m.mentions": { user_ids: ["@bob:test", "@charlie:test"] },
+                "m.mentions": { user_ids: ["@bob:test"] },
             });
         });