diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js index 0d9f265..d76b1a7 100644 --- a/src/d2m/actions/create-room.js +++ b/src/d2m/actions/create-room.js @@ -437,7 +437,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 @@ -461,7 +461,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}`, `Error trace${stack}`) + builder.addLine(`Error trace:\n${stack}`, tag`Error trace${stack}`) // How - builder.addLine("", `Original payload${util.inspect(payload, false, 4, false)}`) + builder.addLine("", tag`Original payload${util.inspect(payload, false, 4, false)}`) } // Send
${stack}
${util.inspect(payload, false, 4, false)}