Improve message body output from plain text editor (#11124)
* add failing test * WIP - pause work until we can implement with new patch release of RTE * focus tests purely on the body output * remove unused importpull/28788/head^2
parent
ad8543eb58
commit
d64018ce26
|
@ -18,8 +18,9 @@ import { richToPlain, plainToRich } from "@matrix-org/matrix-wysiwyg";
|
||||||
import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix";
|
import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix";
|
||||||
|
|
||||||
import SettingsStore from "../../../../../settings/SettingsStore";
|
import SettingsStore from "../../../../../settings/SettingsStore";
|
||||||
import { RoomPermalinkCreator } from "../../../../../utils/permalinks/Permalinks";
|
import { parsePermalink, RoomPermalinkCreator } from "../../../../../utils/permalinks/Permalinks";
|
||||||
import { addReplyToMessageContent } from "../../../../../utils/Reply";
|
import { addReplyToMessageContent } from "../../../../../utils/Reply";
|
||||||
|
import { isNotNull } from "../../../../../Typeguards";
|
||||||
|
|
||||||
export const EMOTE_PREFIX = "/me ";
|
export const EMOTE_PREFIX = "/me ";
|
||||||
|
|
||||||
|
@ -94,8 +95,8 @@ export async function createMessageContent(
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we're editing rich text, the message content is pure html
|
// if we're editing rich text, the message content is pure html
|
||||||
// BUT if we're not, the message content will be plain text
|
// BUT if we're not, the message content will be plain text where we need to convert the mentions
|
||||||
const body = isHTML ? await richToPlain(message) : message;
|
const body = isHTML ? await richToPlain(message) : convertPlainTextToBody(message);
|
||||||
const bodyPrefix = (isReplyAndEditing && getTextReplyFallback(editedEvent)) || "";
|
const bodyPrefix = (isReplyAndEditing && getTextReplyFallback(editedEvent)) || "";
|
||||||
const formattedBodyPrefix = (isReplyAndEditing && getHtmlReplyFallback(editedEvent)) || "";
|
const formattedBodyPrefix = (isReplyAndEditing && getHtmlReplyFallback(editedEvent)) || "";
|
||||||
|
|
||||||
|
@ -141,3 +142,51 @@ export async function createMessageContent(
|
||||||
|
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Without a model, we need to manually amend mentions in uncontrolled message content
|
||||||
|
* to make sure that mentions meet the matrix specification.
|
||||||
|
*
|
||||||
|
* @param content - the output from the `MessageComposer` state when in plain text mode
|
||||||
|
* @returns - a string formatted with the mentions replaced as required
|
||||||
|
*/
|
||||||
|
function convertPlainTextToBody(content: string): string {
|
||||||
|
const document = new DOMParser().parseFromString(content, "text/html");
|
||||||
|
const mentions = Array.from(document.querySelectorAll("a[data-mention-type]"));
|
||||||
|
|
||||||
|
mentions.forEach((mention) => {
|
||||||
|
const mentionType = mention.getAttribute("data-mention-type");
|
||||||
|
switch (mentionType) {
|
||||||
|
case "at-room": {
|
||||||
|
mention.replaceWith("@room");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "user": {
|
||||||
|
const innerText = mention.innerHTML;
|
||||||
|
mention.replaceWith(innerText);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "room": {
|
||||||
|
// for this case we use parsePermalink to try and get the mx id
|
||||||
|
const href = mention.getAttribute("href");
|
||||||
|
|
||||||
|
// if the mention has no href attribute, leave it alone
|
||||||
|
if (href === null) break;
|
||||||
|
|
||||||
|
// otherwise, attempt to parse the room alias or id from the href
|
||||||
|
const permalinkParts = parsePermalink(href);
|
||||||
|
|
||||||
|
// then if we have permalink parts with a valid roomIdOrAlias, replace the
|
||||||
|
// room mention with that text
|
||||||
|
if (isNotNull(permalinkParts) && isNotNull(permalinkParts.roomIdOrAlias)) {
|
||||||
|
mention.replaceWith(permalinkParts.roomIdOrAlias);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return document.body.innerHTML;
|
||||||
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ describe("createMessageContent", () => {
|
||||||
jest.resetAllMocks();
|
jest.resetAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("Richtext composer input", () => {
|
||||||
it("Should create html message", async () => {
|
it("Should create html message", async () => {
|
||||||
// When
|
// When
|
||||||
const content = await createMessageContent(message, true, { permalinkCreator });
|
const content = await createMessageContent(message, true, { permalinkCreator });
|
||||||
|
@ -155,3 +156,31 @@ describe("createMessageContent", () => {
|
||||||
expect(content).toMatchObject({ msgtype: MsgType.Emote });
|
expect(content).toMatchObject({ msgtype: MsgType.Emote });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("Plaintext composer input", () => {
|
||||||
|
it("Should replace at-room mentions with `@room` in body", async () => {
|
||||||
|
const messageComposerState = `<a href="#" contenteditable="false" data-mention-type="at-room" style="some styling">@room</a> `;
|
||||||
|
|
||||||
|
const content = await createMessageContent(messageComposerState, false, { permalinkCreator });
|
||||||
|
expect(content).toMatchObject({ body: "@room " });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Should replace user mentions with user name in body", async () => {
|
||||||
|
const messageComposerState = `<a href="https://matrix.to/#/@test_user:element.io" contenteditable="false" data-mention-type="user" style="some styling">a test user</a> `;
|
||||||
|
|
||||||
|
const content = await createMessageContent(messageComposerState, false, { permalinkCreator });
|
||||||
|
|
||||||
|
expect(content).toMatchObject({ body: "a test user " });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Should replace room mentions with room mxid in body", async () => {
|
||||||
|
const messageComposerState = `<a href="https://matrix.to/#/#test_room:element.io" contenteditable="false" data-mention-type="room" style="some styling">a test room</a> `;
|
||||||
|
|
||||||
|
const content = await createMessageContent(messageComposerState, false, { permalinkCreator });
|
||||||
|
|
||||||
|
expect(content).toMatchObject({
|
||||||
|
body: "#test_room:element.io ",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in New Issue