Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 37f8503

Browse files
committed
Implement MSC4142: Remove unintentional intentional mentions in replies
Signed-off-by: Tulir Asokan <tulir@maunium.net>
1 parent 75918f5 commit 37f8503

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

src/components/views/rooms/SendMessageComposer.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ export function attachMentions(
100100
// event + any mentioned users in that event.
101101
if (replyToEvent) {
102102
userMentions.add(replyToEvent.sender!.userId);
103-
// TODO What do we do if the reply event *doeesn't* have this property?
104-
// Try to fish out replies from the contents?
105-
const userIds = replyToEvent.getContent()["m.mentions"]?.user_ids;
106-
if (Array.isArray(userIds)) {
107-
userIds.forEach((userId) => userMentions.add(userId));
108-
}
109103
}
110104

111105
// If user provided content is available, check to see if any users are mentioned.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,6 @@ describe("<EditMessageComposer/>", () => {
432432
user_ids: [
433433
// sender of event we replied to
434434
originalEvent.getSender()!,
435-
// mentions from this event
436-
"@bob:server.org",
437435
],
438436
},
439437
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ describe("<SendMessageComposer/>", () => {
196196
"m.mentions": { user_ids: ["@bob:test"] },
197197
});
198198

199-
// It also adds any other mentioned users, but removes yourself.
199+
// It no longer adds any other mentioned users
200200
replyToEvent = mkEvent({
201201
type: "m.room.message",
202202
user: "@bob:test",
@@ -207,7 +207,7 @@ describe("<SendMessageComposer/>", () => {
207207
content = {};
208208
attachMentions("@alice:test", content, model, replyToEvent);
209209
expect(content).toEqual({
210-
"m.mentions": { user_ids: ["@bob:test", "@charlie:test"] },
210+
"m.mentions": { user_ids: ["@bob:test"] },
211211
});
212212
});
213213

0 commit comments

Comments
 (0)