#23837 Plaintext mod <> for username used #23837

This commit is contained in:
SidheshwarSarangal 2024-12-03 23:44:09 +05:30
parent d2acce1221
commit 1e6d183d00
194 changed files with 1401 additions and 1401 deletions

View file

@ -86,7 +86,7 @@ describe("<SendMessageComposer/>", () => {
const documentOffset = new DocumentOffset(11, true);
model.update("hello world", "insertText", documentOffset);
const content = createMessageContent("@alice:test", model, undefined, undefined);
const content = createMessageContent("@<alice>:test", model, undefined, undefined);
expect(content).toEqual({
"body": "hello world",
@ -100,7 +100,7 @@ describe("<SendMessageComposer/>", () => {
const documentOffset = new DocumentOffset(13, true);
model.update("hello *world*", "insertText", documentOffset);
const content = createMessageContent("@alice:test", model, undefined, undefined);
const content = createMessageContent("@<alice>:test", model, undefined, undefined);
expect(content).toEqual({
"body": "hello *world*",
@ -116,7 +116,7 @@ describe("<SendMessageComposer/>", () => {
const documentOffset = new DocumentOffset(22, true);
model.update("/me blinks __quickly__", "insertText", documentOffset);
const content = createMessageContent("@alice:test", model, undefined, undefined);
const content = createMessageContent("@<alice>:test", model, undefined, undefined);
expect(content).toEqual({
"body": "blinks __quickly__",
@ -133,7 +133,7 @@ describe("<SendMessageComposer/>", () => {
model.update("/me ✨sparkles✨", "insertText", documentOffset);
expect(model.parts.length).toEqual(4); // Emoji count as non-text
const content = createMessageContent("@alice:test", model, undefined, undefined);
const content = createMessageContent("@<alice>:test", model, undefined, undefined);
expect(content).toEqual({
"body": "✨sparkles✨",
@ -148,7 +148,7 @@ describe("<SendMessageComposer/>", () => {
model.update("//dev/null is my favourite place", "insertText", documentOffset);
const content = createMessageContent("@alice:test", model, undefined, undefined);
const content = createMessageContent("@<alice>:test", model, undefined, undefined);
expect(content).toEqual({
"body": "/dev/null is my favourite place",
@ -164,7 +164,7 @@ describe("<SendMessageComposer/>", () => {
it("no mentions", () => {
const model = new EditorModel([], partsCreator);
const content: IContent = {};
attachMentions("@alice:test", content, model, undefined);
attachMentions("@<alice>:test", content, model, undefined);
expect(content).toEqual({
"m.mentions": {},
});
@ -173,7 +173,7 @@ describe("<SendMessageComposer/>", () => {
it("test user mentions", () => {
const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
const content: IContent = {};
attachMentions("@alice:test", content, model, undefined);
attachMentions("@<alice>:test", content, model, undefined);
expect(content).toEqual({
"m.mentions": { user_ids: ["@bob:test"] },
});
@ -190,7 +190,7 @@ describe("<SendMessageComposer/>", () => {
event: true,
});
let content: IContent = {};
attachMentions("@alice:test", content, model, replyToEvent);
attachMentions("@<alice>:test", content, model, replyToEvent);
expect(content).toEqual({
"m.mentions": { user_ids: ["@bob:test"] },
});
@ -200,11 +200,11 @@ describe("<SendMessageComposer/>", () => {
type: "m.room.message",
user: "@bob:test",
room: "!abc:test",
content: { "m.mentions": { user_ids: ["@alice:test", "@charlie:test"] } },
content: { "m.mentions": { user_ids: ["@<alice>:test", "@charlie:test"] } },
event: true,
});
content = {};
attachMentions("@alice:test", content, model, replyToEvent);
attachMentions("@<alice>:test", content, model, replyToEvent);
expect(content).toEqual({
"m.mentions": { user_ids: ["@bob:test", "@charlie:test"] },
});
@ -213,7 +213,7 @@ describe("<SendMessageComposer/>", () => {
it("test room mention", () => {
const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
const content: IContent = {};
attachMentions("@alice:test", content, model, undefined);
attachMentions("@<alice>:test", content, model, undefined);
expect(content).toEqual({
"m.mentions": { room: true },
});
@ -224,13 +224,13 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([], partsCreator);
const replyToEvent = mkEvent({
type: "m.room.message",
user: "@alice:test",
user: "@<alice>:test",
room: "!abc:test",
content: { "m.mentions": { room: true } },
event: true,
});
const content: IContent = {};
attachMentions("@alice:test", content, model, replyToEvent);
attachMentions("@<alice>:test", content, model, replyToEvent);
expect(content).toEqual({
"m.mentions": {},
});
@ -241,14 +241,14 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([], partsCreator);
const replyToEvent = mkEvent({
type: "m.room.message",
user: "@alice:test",
user: "@<alice>:test",
room: "!abc:test",
// @ts-ignore - Purposefully testing invalid data.
content: { "m.mentions": { user_ids: "@bob:test" } },
event: true,
});
const content: IContent = {};
attachMentions("@alice:test", content, model, replyToEvent);
attachMentions("@<alice>:test", content, model, replyToEvent);
expect(content).toEqual({
"m.mentions": {},
});
@ -259,7 +259,7 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([], partsCreator);
const content: IContent = { "m.new_content": {} };
const prevContent: IContent = {};
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": {},
"m.new_content": { "m.mentions": {} },
@ -272,7 +272,7 @@ describe("<SendMessageComposer/>", () => {
const prevContent: IContent = {
"m.mentions": { user_ids: ["@bob:test"], room: true },
};
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": {},
"m.new_content": { "m.mentions": {} },
@ -283,7 +283,7 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
const content: IContent = { "m.new_content": {} };
const prevContent: IContent = {};
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": { user_ids: ["@bob:test"] },
"m.new_content": { "m.mentions": { user_ids: ["@bob:test"] } },
@ -294,7 +294,7 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([partsCreator.userPill("Bob", "@bob:test")], partsCreator);
const content: IContent = { "m.new_content": {} };
const prevContent: IContent = { "m.mentions": { user_ids: ["@bob:test"] } };
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": {},
"m.new_content": { "m.mentions": { user_ids: ["@bob:test"] } },
@ -305,7 +305,7 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
const content: IContent = { "m.new_content": {} };
const prevContent: IContent = {};
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": { room: true },
"m.new_content": { "m.mentions": { room: true } },
@ -316,7 +316,7 @@ describe("<SendMessageComposer/>", () => {
const model = new EditorModel([partsCreator.atRoomPill("@room")], partsCreator);
const content: IContent = { "m.new_content": {} };
const prevContent: IContent = { "m.mentions": { room: true } };
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": {},
"m.new_content": { "m.mentions": { room: true } },
@ -329,7 +329,7 @@ describe("<SendMessageComposer/>", () => {
const content: IContent = { "m.new_content": {} };
// @ts-ignore - Purposefully testing invalid data.
const prevContent: IContent = { "m.mentions": { user_ids: "@bob:test" } };
attachMentions("@alice:test", content, model, undefined, prevContent);
attachMentions("@<alice>:test", content, model, undefined, prevContent);
expect(content).toEqual({
"m.mentions": {},
"m.new_content": { "m.mentions": {} },