src/js/events/encrypted.js

@@ -1,13 +1,17 @@
 const {MatrixEvent} = require("./event")
+const {ejs} = require("../basic")
 
 class EncryptedMessage extends MatrixEvent {
 	render() {
+		this.clearChildren()
+		this.child(
+			ejs("i").text("Carbon cannot render encrypted messages yet")
+		)
 		super.render()
-		return this.text("Carbon cannot render encrypted messages yet")
 	}
 
-	static canRender(event) {
+	static canRender(eventData) {
-		return event.type == "m.room.encrypted"
+		return eventData.type === "m.room.encrypted"
 	}
 
 	canGroup() {

src/js/events/event.js

@@ -46,7 +46,7 @@ class MatrixEvent extends ElemJS {
 		return this
 	}
 
-	static canRender(_event) {
+	static canRender(eventData) {
 		return false
 	}
 }

src/js/events/membership.js

@@ -1,46 +1,54 @@
 const {MatrixEvent} = require("./event")
+const {ejs} = require("../basic")
 
 class MembershipEvent extends MatrixEvent {
-	static canRender(event) {
+	static canRender(eventData) {
-		return event.type == "m.room.member"
+		return eventData.type === "m.room.member"
+	}
+
+	renderText(text) {
+		this.clearChildren()
+		this.child(
+			ejs("i").text(text)
+		)
+		super.render()
 	}
 }
 
 
 class JoinedEvent extends MembershipEvent {
-	static canRender(event) {
+	static canRender(eventData) {
-		return super.canRender(event) && event.content.membership === "join"
+		return super.canRender(eventData) && eventData.content.membership === "join"
 	}
+
 	render() {
-		super.render()
+		this.renderText("joined the room")
-		return this.text("joined the room")
 	}
 }
 
 class InvitedEvent extends MembershipEvent {
-	static canRender(event) {
+	static canRender(eventData) {
-		return super.canRender(event) && event.content.membership === "invite"
+		return super.canRender(eventData) && eventData.content.membership === "invite"
 	}
+
 	render() {
-		super.render()
+		this.renderText(`invited ${this.data.content.displayname}`)
-		return this.text(`invited ${this.data.content.displayname}`)
 	}
 }
 
 class LeaveEvent extends MembershipEvent {
-	static canRender(event) {
+	static canRender(eventData) {
-		return super.canRender(event) && event.content.membership === "leave"
+		return super.canRender(eventData) && eventData.content.membership === "leave"
 	}
+
 	render() {
-		super.render()
+		this.renderText("left the room")
-		return this.text(`left the room`)
 	}
 }
 
 class UnknownMembership extends MembershipEvent {
 	render() {
-		super.render()
+		this.renderText("unknown membership event")
-		return this.text("unknown membership event")
 	}
 }
 

src/js/events/unknown.js

@@ -1,13 +1,19 @@
 const {MatrixEvent} = require("./event")
+const {ejs} = require("../basic")
 
 class UnknownEvent extends MatrixEvent {
 	static canRender() {
 		return true
 	}
+
 	render() {
+		this.clearChildren()
+		this.child(
+			ejs("i").text(`Unknown event of type ${this.data.type}`)
+		)
 		super.render()
-		return this.text(`cannot render event`)
 	}
 }
+
 module.exports = [UnknownEvent]
 

src/js/timeline.js

@@ -5,7 +5,7 @@ const {Anchor} = require("./anchor.js")
 const {Sender} = require("./sender.js")
 const lsm = require("./lsm.js")
 const {resolveMxc} = require("./functions.js")
-const {renderEvent} = require("./events/renderEvent")
+const {renderEvent} = require("./events/render-event")
 const {dateFormatter} = require("./date-formatter")
 
 let debug = false