From 2e84c71d9683f8dcb3d054cd1c90efff877123b0 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Wed, 19 Aug 2026 22:21:46 +1200 Subject: [PATCH] Fix creating webhooks for matrix users --- src/d2m/actions/speedbump.js | 2 ++ src/d2m/converters/message-to-event.test.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/d2m/actions/speedbump.js b/src/d2m/actions/speedbump.js index 88cea07..6e62541 100644 --- a/src/d2m/actions/speedbump.js +++ b/src/d2m/actions/speedbump.js @@ -129,6 +129,8 @@ function onMessageDelete(messageID) { * @param {string} roomID */ async function getWebhookSenderId(message, guildID, roomID) { + const isMatrixWebhook = select("webhook", "webhook_id", {webhook_id: message.webhook_id}).pluck().get() + if (isMatrixWebhook) return null const speedbumpUserID = select("channel_speedbump", "speedbump_user_id", {channel_id: message.channel_id, speedbump_webhook_id: message.webhook_id}).pluck().get() const useWebhookProfile = select("guild_space", "webhook_profile", {guild_id: guildID}).pluck().get() ?? 0 if (speedbumpUserID === "466378653216014359") { // PluralKit public instance diff --git a/src/d2m/converters/message-to-event.test.js b/src/d2m/converters/message-to-event.test.js index be1d99f..0742c7b 100644 --- a/src/d2m/converters/message-to-event.test.js +++ b/src/d2m/converters/message-to-event.test.js @@ -1612,7 +1612,7 @@ test("message2event: expired/invalid invites are sent as-is", async t => { snow: { invite: { async getInvite() { - throw new Error(`{"message": "Unknown Invite", "code": 10006}`) + throw new Error(`Unknown Invite`) } } }