Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add tentative version of linkification.

Browse source
This commit is contained in:
Danila Fedorin 2021-07-13 16:56:46 -07:00
parent 0c05ff459c
commit 763e1cd5de
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/domain/session/room/timeline/deserialize.js
View file

@ -1,4 +1,5 @@
import { MessageBody, HeaderBlock, ListBlock, CodeBlock, FormatPart, NewLinePart, RulePart, TextPart, LinkPart, ImagePart } from "./MessageBody.js" import { MessageBody, HeaderBlock, ListBlock, CodeBlock, FormatPart, NewLinePart, RulePart, TextPart, LinkPart, ImagePart } from "./MessageBody.js"
import { linkify } from "./linkify/linkify.js";
/* At the time of writing (Jul 1 2021), Matrix Spec recommends /* At the time of writing (Jul 1 2021), Matrix Spec recommends
* allowing the following HTML tags: * allowing the following HTML tags:
@ -113,11 +114,7 @@ class Deserializer {
* element is not inline or not allowed. * element is not inline or not allowed.
*/ */
parseInlineNode(node) { parseInlineNode(node) {
const result = this.result; if (this.result.isElementNode(node)) {
if (result.isTextNode(node)) {
// TODO Linkify
return new TextPart(result.getNodeText(node));
} else if (result.isElementNode(node)) {
return this.parseInlineElement(node); return this.parseInlineElement(node);
} }
return null; return null;
@ -172,15 +169,36 @@ class Deserializer {
* is not a block element. * is not a block element.
*/ */
parseBlockNode(node) { parseBlockNode(node) {
const result = this.result; if (this.result.isElementNode(node)) {
if (result.isElementNode(node)) {
return this.parseBlockElement(node); return this.parseBlockElement(node);
} }
return null; return null;
} }
_parseTextParts(node, into) {
if(!this.result.isTextNode(node)) {
return false;
}
// XXX pretty much identical to `MessageBody`'s.
const linkifyCallback = (text, isLink) => {
if (isLink) {
into.push(new LinkPart(text, [new TextPart(text)]));
} else {
into.push(new TextPart(text));
}
};
linkify(this.result.getNodeText(node), linkifyCallback);
return true;
}
_parseInlineNodes(nodes, into) { _parseInlineNodes(nodes, into) {
for (const htmlNode of nodes) { for (const htmlNode of nodes) {
if (this._parseTextParts(htmlNode, into)) {
// This was a text node, and we already
// dumped its parts into our list.
continue;
}
const node = this.parseInlineNode(htmlNode); const node = this.parseInlineNode(htmlNode);
if (node) { if (node) {
into.push(node); into.push(node);
@ -198,8 +216,14 @@ class Deserializer {
return into; return into;
} }
// XXX very similar to `_parseInlineNodes`.
_parseAnyNodes(nodes, into) { _parseAnyNodes(nodes, into) {
for (const htmlNode of nodes) { for (const htmlNode of nodes) {
if (this._parseTextParts(htmlNode, into)) {
// This was a text node, and we already
// dumped its parts into our list.
continue;
}
const node = this.parseInlineNode(htmlNode) || this.parseBlockNode(htmlNode); const node = this.parseInlineNode(htmlNode) || this.parseBlockNode(htmlNode);
if (node) { if (node) {
into.push(node); into.push(node);