From 3af31385f06e10ebd2bfbc1e050a53702739b560 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Wed, 25 Sep 2024 01:08:29 +1200 Subject: [PATCH 1/2] Use $url resolver in channelToKState --- src/d2m/actions/create-room.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js index 9be489b..2ea9c91 100644 --- a/src/d2m/actions/create-room.js +++ b/src/d2m/actions/create-room.js @@ -180,7 +180,7 @@ async function channelToKState(channel, guild, di) { network: { id: guild.id, displayname: guild.name, - avatar_url: await file.uploadDiscordFileToMxc(file.guildIcon(guild)) + avatar_url: {$url: file.guildIcon(guild)} }, channel: { id: channel.id, From 312ea69d7381bcd16c112ae12432dfb0a8787cf0 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Wed, 25 Sep 2024 01:54:01 +1200 Subject: [PATCH 2/2] Fix page duplicating when clicking toggle switch --- src/web/pug/guild.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/pug/guild.pug b/src/web/pug/guild.pug index b5449a4..2130aff 100644 --- a/src/web/pug/guild.pug +++ b/src/web/pug/guild.pug @@ -139,7 +139,7 @@ block body p.s-description If you want, OOYE can automatically create new Matrix rooms and link them when a new Discord channel is spoken in. - let value = select("guild_active", "autocreate", {guild_id}).pluck().get() input(type="hidden" name="guild_id" value=guild_id) - input.s-toggle-switch.order-last#autocreate(name="autocreate" type="checkbox" hx-post="/api/autocreate" hx-indicator="#autocreate-loading" hx-disabled-elt="this" checked=value) + input.s-toggle-switch.order-last#autocreate(name="autocreate" type="checkbox" hx-post="/api/autocreate" hx-indicator="#autocreate-loading" hx-disabled-elt="this" hx-swap="none" checked=value) .is-loading#autocreate-loading h3.mt32.fs-category Manually link channels