OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Implement MSC4142: Remove unintentional intentional mentions in replies

pull/28209/head
Tulir Asokan 2024-10-16 18:57:09 +03:00
parent 0c19991e3c
commit 8d654d66ef
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/SendMessageComposer.tsx
View File

@ -100,12 +100,6 @@ export function attachMentions(
// event + any mentioned users in 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.

2
test/unit-tests/components/views/rooms/EditMessageComposer-test.tsx
View File

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

4
test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx
View File

@ -196,7 +196,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",
@ -207,7 +207,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"] },
});
});