From d983385e166857edcb4ee329c4b8970f8a41b0c6 Mon Sep 17 00:00:00 2001 From: Bad Date: Mon, 26 Oct 2020 22:58:38 +0100 Subject: [PATCH] Fix compiler warnings --- src/js/events/encrypted.js | 4 ++-- src/js/events/event.js | 8 ++------ src/js/events/membership.js | 6 +++--- src/js/events/message.js | 6 +++--- src/js/events/unknown.js | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/js/events/encrypted.js b/src/js/events/encrypted.js index 32dbe19..6d9d6d0 100644 --- a/src/js/events/encrypted.js +++ b/src/js/events/encrypted.js @@ -1,6 +1,6 @@ -const {Event} = require("./event") +const {MatrixEvent} = require("./event") -class EncryptedMessage extends Event { +class EncryptedMessage extends MatrixEvent { render() { super.render() return this.text("Carbon cannot render encrypted messages yet") diff --git a/src/js/events/event.js b/src/js/events/event.js index ddb412d..06d8a50 100644 --- a/src/js/events/event.js +++ b/src/js/events/event.js @@ -1,7 +1,7 @@ const {ElemJS, ejs} = require("../basic") const {dateFormatter} = require("../dateFormatter") -class Event extends ElemJS { +class MatrixEvent extends ElemJS { constructor(data) { super("div") this.class("c-message") @@ -52,8 +52,4 @@ class Event extends ElemJS { -function renderEvent(event) { - return new events.find(e => e.canRender(event))(event) -} - -module.exports = {renderEvent, Event} +module.exports = {MatrixEvent} diff --git a/src/js/events/membership.js b/src/js/events/membership.js index 9b554cf..285fc9e 100644 --- a/src/js/events/membership.js +++ b/src/js/events/membership.js @@ -1,7 +1,7 @@ -const {Event} = require("./event") +const {MatrixEvent} = require("./event") function createMembershipEvent(membership, message) { - return class extends Event { + return class extends MatrixEvent { render() { super.render() return this.text(message(this.data)) @@ -13,7 +13,7 @@ function createMembershipEvent(membership, message) { } } -class UnknownMembership extends Event { +class UnknownMembership extends MatrixEvent { render() { super.render() return this.text("Unsupported membership event") diff --git a/src/js/events/message.js b/src/js/events/message.js index 549b2a0..c50ec57 100644 --- a/src/js/events/message.js +++ b/src/js/events/message.js @@ -1,7 +1,7 @@ const {ejs} = require("../basic") const DOMPurify = require("dompurify") const {resolveMxc} = require("../functions") -const {Event} = require("./event") +const {MatrixEvent} = require("./event") const purifier = DOMPurify() @@ -67,7 +67,7 @@ function sanitize(html) { return purifier.sanitize(html) } -class HTMLMessage extends Event { +class HTMLMessage extends MatrixEvent { render() { super.render() let html = this.data.content.formatted_body @@ -89,7 +89,7 @@ class HTMLMessage extends Event { } -class TextMessage extends Event { +class TextMessage extends MatrixEvent { render() { super.render() return this.text(this.data.content.body) diff --git a/src/js/events/unknown.js b/src/js/events/unknown.js index d644de7..6fb1a02 100644 --- a/src/js/events/unknown.js +++ b/src/js/events/unknown.js @@ -1,6 +1,6 @@ -const {Event} = require("./event") +const {MatrixEvent} = require("./event") -class UnknownEvent extends Event { +class UnknownEvent extends MatrixEvent { render() { super.render() this.text("Cannot render event")