cadence/Carbon
3
9
Fork 1
Code Issues 14 Pull requests 1 Releases Wiki Activity

Rich message rendering #24

Merged
cadence merged 28 commits from rich-messages into princess 2020-11-07 10:46:48 +00:00
Conversation 5 Commits 28 Files changed 17 +3 -4
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f80bf36991 - Show all commits

1
src/js/events/event.js
View file

@ -14,7 +14,6 @@ class MatrixEvent extends ElemJS {
// predicates
canGroup() {
cadence commented 2020-10-29 07:46:24 +00:00
Copy link

The original idea here was that we'd have a predicate for things like whether the method can be displayed as a message group, whether it should show a timestamp, or whatever other things could affect the display based on the class. I haven't actually put this method to any use yet.

The original idea here was that we'd have a predicate for things like whether the method can be displayed as a message group, whether it should show a timestamp, or whatever other things could affect the display based on the class. I haven't actually put this method to any use yet.
//return this.data.type === "m.room.message"
return false
}

6
src/js/events/message.js
View file

@ -8,7 +8,7 @@ const {MatrixEvent} = require("./event")
const purifier = DOMPurify()
purifier.addHook("uponSanitizeAttribute", (node, hookevent, config) => {
//If purifier already rejected an attribute there is no point in checking it
// If purifier already rejected an attribute there is no point in checking it
if (hookevent.keepAttr === false) return;
const allowedElementAttributes = {
@ -24,8 +24,8 @@ purifier.addHook("uponSanitizeAttribute", (node, hookevent, config) => {
hookevent.keepAttr = allowed_attributes.indexOf(hookevent.attrName) > -1;
})
//Remove bad classes from our code element
purifier.addHook("uponSanitizeElement", (node, hookevent, config) => {
// Remove bad classes from our code element
if (node.tagName == "CODE") {
node.classList.forEach(c => {
if (!c.startsWith("language-")) {
@ -53,7 +53,7 @@ function cleanHTML(html) {
return purifier.sanitize(html)
}
//Here we put all the processing of the messages that isn't as likely to potentially lead to security issues
// Here we put all the processing of the messages that isn't as likely to potentially lead to security issues
function postProcessElements(rootNode) {
const element = rootNode.element
element.querySelectorAll("code").forEach((n) => rootNode.child(new HighlightedCode(n)))