get room mentions formatting working

d2m/converters/message-to-event.js

@@ -20,11 +20,11 @@ function getDiscordParseCallbacks(message, useHTML) {
 			}
 		},
 		channel: node => {
-			const roomID = db.prepare("SELECT room_id FROM channel_room WHERE channel_id = ?").pluck().get(node.id)
-			if (roomID && useHTML) {
-				return "https://matrix.to/#/" + roomID
+			const {room_id, name, nick} = db.prepare("SELECT room_id, name, nick FROM channel_room WHERE channel_id = ?").get(node.id)
+			if (room_id && useHTML) {
+				return `<a href="https://matrix.to/#/${room_id}">#${nick || name}</a>`
 			} else {
-				return "#" + node.id
+				return `#${nick || name}`
 			}
 		},
 		role: node =>

d2m/converters/message-to-event.test.js

@@ -27,9 +27,9 @@ test("message2event: simple room mention", async t => {
 	t.deepEqual(events, [{
 		$type: "m.room.message",
 		msgtype: "m.text",
-		body: "@crunch god: Tell me about Phil, renowned martial arts master and creator of the Chin Trick",
+		body: "#main",
 		format: "org.matrix.custom.html",
-		formatted_body: '<a href="https://matrix.to/#/@_ooye_crunch_god:cadence.moe">@crunch god</a> Tell me about Phil, renowned martial arts master and creator of the Chin Trick'
+		formatted_body: '<a href="https://matrix.to/#/!kLRqKKUQXcibIMtOpl:cadence.moe">#main</a>'
 	}])
 })