cadence/out-of-your-element
cadence/out-of-your-element
3
7
Fork 5
Code Issues 16 Pull requests 2 Releases 27 Activity

fix: handle expired scheduled event links & fix test suite setup #73

Merged
cadence merged 3 commits from beanie/out-of-your-element:bugfix/handle-expired-events into main 2026-03-08 22:11:29 +00:00
Conversation 0 Commits 3 Files changed 3 +25 -43
3 changed files with 25 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3e7ae8474c - Show all commits

13
src/d2m/converters/message-to-event.js
View file

@ -773,15 +773,12 @@ async function messageToEvent(message, guild, options = {}, di) {
try {
invite = await di.snow.invite.getInvite(match[1], {guild_scheduled_event_id: match[2]})
} catch (e) {
// Skip expired events and invites
if (e.code === 10006 || e.httpStatus === 404) {
console.warn(`[Backfill] Skipped expired scheduled event: ${match[0]}`)
const fallbackBody = `[Expired Scheduled Event: ${match[0]}]`
const fallbackHtml = `<blockquote>Expired Scheduled Event: <a href="https://${match[0]}">${match[0]}</a></blockquote>`
await addTextEvent(fallbackBody, fallbackHtml, "m.notice")
continue
// Skip expired/invalid invites and events
if (e.message === `{"message": "Unknown Invite", "code": 10006}`) {
break
} else {
throw e
}
throw e
}
const event = invite.guild_scheduled_event

16
src/d2m/converters/message-to-event.test.js
View file

@ -1538,14 +1538,12 @@ test("message2event: vc invite event renders embed with room link", async t => {
])
})
test("message2event: expired event invite renders fallback notice", async t => {
test("message2event: expired/invalid invites are sent as-is", async t => {
const events = await messageToEvent({content: "https://discord.gg/placeholder?event=1381190945646710824"}, {}, {}, {
snow: {
invite: {
getInvite: async () => {
const error = new Error("Unknown Invite")
error.code = 10006
throw error
async getInvite() {
throw new Error(`{"message": "Unknown Invite", "code": 10006}`)
}
}
}
@ -1558,14 +1556,6 @@ test("message2event: expired event invite renders fallback notice", async t => {
formatted_body: "<a href=\"https://discord.gg/placeholder?event=1381190945646710824\">https://discord.gg/placeholder?event=1381190945646710824</a>",
"m.mentions": {},
msgtype: "m.text",
},
{
$type: "m.room.message",
msgtype: "m.notice",
body: "[Expired Scheduled Event: discord.gg/placeholder?event=1381190945646710824]",
format: "org.matrix.custom.html",
formatted_body: "<blockquote>Expired Scheduled Event: <a href=\"https://discord.gg/placeholder?event=1381190945646710824\">discord.gg/placeholder?event=1381190945646710824</a></blockquote>",
"m.mentions": {}
}
])
})

39
test/test.js
View file

@ -6,34 +6,29 @@ const sqlite = require("better-sqlite3")
const {Writable} = require("stream")
const migrate = require("../src/db/migrate")
const HeatSync = require("heatsync")
const {test, extend} = require("supertape")
const {test} = require("supertape")
const data = require("./data")
const {green} = require("ansi-colors")
const mixin = require("@cloudrac3r/mixin-deep")
const passthrough = require("../src/passthrough")
const db = new sqlite(":memory:")
const readReg = require("../src/matrix/read-registration")
readReg.reg = readReg.getTemplateRegistration("cadence.moe")
const {reg} = readReg
reg.url = "http://localhost:6693"
reg.ooye.discord_token = "Njg0MjgwMTkyNTUzODQ0NzQ3.Xl3zlw.baby"
reg.ooye.server_origin = "https://matrix.cadence.moe" // so that tests will pass even when hard-coded
reg.ooye.server_name = "cadence.moe"
reg.ooye.namespace_prefix = "_ooye_"
reg.sender_localpart = "_ooye_bot"
reg.id = "baby"
reg.as_token = "don't actually take authenticated actions on the server"
reg.hs_token = "don't actually take authenticated actions on the server"
reg.namespaces = {
users: [{regex: "@_ooye_.*:cadence.moe", exclusive: true}],
aliases: [{regex: "#_ooye_.*:cadence.moe", exclusive: true}]
}
reg.ooye.bridge_origin = "https://bridge.example.org"
reg.ooye.time_zone = "Pacific/Auckland"
reg.ooye.max_file_size = 5000000
reg.ooye.web_password = "password123"
reg.ooye.include_user_id_in_mxid = false
const registration = require("../src/matrix/read-registration")
registration.reg = mixin(registration.getTemplateRegistration("cadence.moe"), {
id: "baby",
url: "http://localhost:6693",
as_token: "don't actually take authenticated actions on the server",
hs_token: "don't actually take authenticated actions on the server",
ooye: {
server_origin: "https://matrix.cadence.moe",
bridge_origin: "https://bridge.example.org",
discord_token: "Njg0MjgwMTkyNTUzODQ0NzQ3.Xl3zlw.baby",
discord_client_secret: "baby",
web_password: "password123",
time_zone: "Pacific/Auckland",
}
})
const sync = new HeatSync({watchFS: false})