Compare commits
2 Commits
217a815750
...
20bacce068
Author | SHA1 | Date |
---|---|---|
Bad | 20bacce068 | |
Bad | f80bf36991 |
|
@ -14,7 +14,6 @@ class MatrixEvent extends ElemJS {
|
||||||
// predicates
|
// predicates
|
||||||
|
|
||||||
canGroup() {
|
canGroup() {
|
||||||
//return this.data.type === "m.room.message"
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,17 +51,4 @@ class MatrixEvent extends ElemJS {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function simpleEvent(filter, render) {
|
module.exports = {MatrixEvent}
|
||||||
return class extends MatrixEvent {
|
|
||||||
render() {
|
|
||||||
super.render()
|
|
||||||
return this.text(render(this.data))
|
|
||||||
}
|
|
||||||
|
|
||||||
static canRender(event) {
|
|
||||||
return filter(event)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {MatrixEvent, simpleEvent}
|
|
||||||
|
|
|
@ -1,13 +1,47 @@
|
||||||
const {simpleEvent} = require("./event")
|
const {MatrixEvent} = require("./event")
|
||||||
|
|
||||||
const UnknownMembership = simpleEvent((e) => e.type == "m.room.member", (e) => "unknown membership event")
|
class MembershipEvent extends MatrixEvent {
|
||||||
|
static canRender(event) {
|
||||||
function createMembershipEvent(membership, message) {
|
return event.type == "m.room.member"
|
||||||
return simpleEvent((e) => e.type == "m.room.member" && e.content.membership === membership, message)
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const JoinedEvent = createMembershipEvent("join", (e) => "joined the room")
|
|
||||||
const InvitedEvent = createMembershipEvent("invite", (e) => `invited ${e.content.displayname} the room`)
|
class JoinedEvent extends MembershipEvent {
|
||||||
const LeaveEvent = createMembershipEvent("leave", () => "left the room")
|
static canRender(event) {
|
||||||
|
return super.canRender(event) && event.content.membership === "join"
|
||||||
|
}
|
||||||
|
render() {
|
||||||
|
super.render()
|
||||||
|
return this.text("joined the room")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class InvitedEvent extends MembershipEvent {
|
||||||
|
static canRender(event) {
|
||||||
|
return super.canRender(event) && event.content.membership === "invite"
|
||||||
|
}
|
||||||
|
render() {
|
||||||
|
super.render()
|
||||||
|
return this.text(`invited ${this.data.content.displayname}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class LeaveEvent extends MembershipEvent {
|
||||||
|
static canRender(event) {
|
||||||
|
return super.canRender(event) && event.content.membership === "leave"
|
||||||
|
}
|
||||||
|
render() {
|
||||||
|
super.render()
|
||||||
|
return this.text(`left the room`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class UnknownMembership extends MembershipEvent {
|
||||||
|
render() {
|
||||||
|
super.render()
|
||||||
|
return this.text("unknown membership event")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = [JoinedEvent, InvitedEvent, LeaveEvent, UnknownMembership]
|
module.exports = [JoinedEvent, InvitedEvent, LeaveEvent, UnknownMembership]
|
||||||
|
|
|
@ -8,7 +8,7 @@ const {MatrixEvent} = require("./event")
|
||||||
const purifier = DOMPurify()
|
const purifier = DOMPurify()
|
||||||
|
|
||||||
purifier.addHook("uponSanitizeAttribute", (node, hookevent, config) => {
|
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;
|
if (hookevent.keepAttr === false) return;
|
||||||
|
|
||||||
const allowedElementAttributes = {
|
const allowedElementAttributes = {
|
||||||
|
@ -24,8 +24,8 @@ purifier.addHook("uponSanitizeAttribute", (node, hookevent, config) => {
|
||||||
hookevent.keepAttr = allowed_attributes.indexOf(hookevent.attrName) > -1;
|
hookevent.keepAttr = allowed_attributes.indexOf(hookevent.attrName) > -1;
|
||||||
})
|
})
|
||||||
|
|
||||||
//Remove bad classes from our code element
|
|
||||||
purifier.addHook("uponSanitizeElement", (node, hookevent, config) => {
|
purifier.addHook("uponSanitizeElement", (node, hookevent, config) => {
|
||||||
|
// Remove bad classes from our code element
|
||||||
if (node.tagName == "CODE") {
|
if (node.tagName == "CODE") {
|
||||||
node.classList.forEach(c => {
|
node.classList.forEach(c => {
|
||||||
if (!c.startsWith("language-")) {
|
if (!c.startsWith("language-")) {
|
||||||
|
@ -53,7 +53,7 @@ function cleanHTML(html) {
|
||||||
return purifier.sanitize(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) {
|
function postProcessElements(rootNode) {
|
||||||
const element = rootNode.element
|
const element = rootNode.element
|
||||||
element.querySelectorAll("code").forEach((n) => rootNode.child(new HighlightedCode(n)))
|
element.querySelectorAll("code").forEach((n) => rootNode.child(new HighlightedCode(n)))
|
||||||
|
|
|
@ -1,3 +1,13 @@
|
||||||
const {simpleEvent} = require("./event")
|
const {MatrixEvent} = require("./event")
|
||||||
const UnknownEvent = simpleEvent(() => true, () => "Cannot render event")
|
|
||||||
|
class UnknownEvent extends MatrixEvent {
|
||||||
|
static canRender() {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
render() {
|
||||||
|
super.render()
|
||||||
|
return this.text(`cannot render event`)
|
||||||
|
}
|
||||||
|
}
|
||||||
module.exports = [UnknownEvent]
|
module.exports = [UnknownEvent]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue