From 493bc2560222f64d0359dc54771b5c8dafb072c7 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Fri, 28 Nov 2025 17:20:44 +1300
Subject: [PATCH] Fix unbridging procedure

---
 src/d2m/actions/create-room.js | 4 ++--
 src/m2d/event-dispatcher.js    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js
index 87c3701..4e59a17 100644
--- a/src/d2m/actions/create-room.js
+++ b/src/d2m/actions/create-room.js
@@ -434,7 +434,7 @@ async function unbridgeChannel(channelID) {
 async function unbridgeDeletedChannel(channel, guildID) {
 	const roomID = select("channel_room", "room_id", {channel_id: channel.id}).pluck().get()
 	assert.ok(roomID)
-	const row = from("guild_space").join("guild_active", "guild_id").select("space_id", "autocreate").get()
+	const row = from("guild_space").join("guild_active", "guild_id").select("space_id", "autocreate").where({guild_id: guildID}).get()
 	assert.ok(row)
 
 	let botInRoom = true
@@ -458,7 +458,7 @@ async function unbridgeDeletedChannel(channel, guildID) {
 	// delete webhook on discord
 	const webhook = select("webhook", ["webhook_id", "webhook_token"], {channel_id: channel.id}).get()
 	if (webhook) {
-		await discord.snow.webhook.deleteWebhook(webhook.webhook_id, webhook.webhook_token)
+		await discord.snow.webhook.deleteWebhook(webhook.webhook_id, webhook.webhook_token).catch(() => {})
 		db.prepare("DELETE FROM webhook WHERE channel_id = ?").run(channel.id)
 	}
 
diff --git a/src/m2d/event-dispatcher.js b/src/m2d/event-dispatcher.js
index 1f816db..c102d01 100644
--- a/src/m2d/event-dispatcher.js
+++ b/src/m2d/event-dispatcher.js
@@ -7,6 +7,7 @@
 const util = require("util")
 const Ty = require("../types")
 const {discord, db, sync, as, select} = require("../passthrough")
+const {tag} = require("@cloudrac3r/html-template-tag")
 
 /** @type {import("./actions/send-event")} */
 const sendEvent = sync.require("./actions/send-event")
@@ -121,10 +122,10 @@ async function sendError(roomID, source, type, e, payload) {
 
 		// Where
 		const stack = stringifyErrorStack(e)
-		builder.addLine(`Error trace:\n${stack}`, `<details><summary>Error trace</summary><pre>${stack}</pre></details>`)
+		builder.addLine(`Error trace:\n${stack}`, tag`<details><summary>Error trace</summary><pre>${stack}</pre></details>`)
 
 		// How
-		builder.addLine("", `<details><summary>Original payload</summary><pre>${util.inspect(payload, false, 4, false)}</pre></details>`)
+		builder.addLine("", tag`<details><summary>Original payload</summary><pre>${util.inspect(payload, false, 4, false)}</pre></details>`)
 	}
 
 	// Send