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

make editor event parsing suitable for parsing messages to be quoted

pull/21833/head
Bruno Windels 2019-08-20 12:34:35 +02:00
parent a9d6d01f10
commit d4fbe7ed69
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/editor/deserialize.js
View File

@ -130,29 +130,29 @@ function checkIgnored(n) {
return true; return true;
} }
const QUOTE_LINE_PREFIX = "> ";
function prefixQuoteLines(isFirstNode, parts, partCreator) { function prefixQuoteLines(isFirstNode, parts, partCreator) {
const PREFIX = "> ";
// a newline (to append a > to) wouldn't be added to parts for the first line // a newline (to append a > to) wouldn't be added to parts for the first line
// if there was no content before the BLOCKQUOTE, so handle that // if there was no content before the BLOCKQUOTE, so handle that
if (isFirstNode) { if (isFirstNode) {
parts.splice(0, 0, partCreator.plain(PREFIX)); parts.splice(0, 0, partCreator.plain(QUOTE_LINE_PREFIX));
} }
for (let i = 0; i < parts.length; i += 1) { for (let i = 0; i < parts.length; i += 1) {
if (parts[i].type === "newline") { if (parts[i].type === "newline") {
parts.splice(i + 1, 0, partCreator.plain(PREFIX)); parts.splice(i + 1, 0, partCreator.plain(QUOTE_LINE_PREFIX));
i += 1; i += 1;
} }
} }
} }
function parseHtmlMessage(html, partCreator) { function parseHtmlMessage(html, partCreator, isQuotedMessage) {
// no nodes from parsing here should be inserted in the document, // no nodes from parsing here should be inserted in the document,
// as scripts in event handlers, etc would be executed then. // as scripts in event handlers, etc would be executed then.
// we're only taking text, so that is fine // we're only taking text, so that is fine
const rootNode = new DOMParser().parseFromString(html, "text/html").body; const rootNode = new DOMParser().parseFromString(html, "text/html").body;
const parts = []; const parts = [];
let lastNode; let lastNode;
let inQuote = false; let inQuote = isQuotedMessage;
const state = {}; const state = {};
function onNodeEnter(n) { function onNodeEnter(n) {
@ -220,22 +220,29 @@ function parseHtmlMessage(html, partCreator) {
return parts; return parts;
} }
export function parseEvent(event, partCreator) { function parsePlainTextMessage(body, partCreator, isQuotedMessage) {
const lines = body.split("\n");
const parts = lines.reduce((parts, line, i) => {
const isLast = i === lines.length - 1;
if (!isLast) {
parts.push(partCreator.newline());
}
if (isQuotedMessage) {
parts.push(partCreator.plain(QUOTE_LINE_PREFIX));
}
parts.push(...parseAtRoomMentions(line, partCreator));
return parts;
}, []);
return parts;
}
export function parseEvent(event, partCreator, {isQuotedMessage = false}) {
const content = event.getContent(); const content = event.getContent();
let parts; let parts;
if (content.format === "org.matrix.custom.html") { if (content.format === "org.matrix.custom.html") {
parts = parseHtmlMessage(content.formatted_body || "", partCreator); parts = parseHtmlMessage(content.formatted_body || "", partCreator, isQuotedMessage);
} else { } else {
const body = content.body || ""; parts = parsePlainTextMessage(content.body || "", partCreator, isQuotedMessage);
const lines = body.split("\n");
parts = lines.reduce((parts, line, i) => {
const isLast = i === lines.length - 1;
const newParts = parseAtRoomMentions(line, partCreator);
if (!isLast) {
newParts.push(partCreator.newline());
}
return parts.concat(newParts);
}, []);
} }
if (content.msgtype === "m.emote") { if (content.msgtype === "m.emote") {
parts.unshift(partCreator.plain("/me ")); parts.unshift(partCreator.plain("/me "));