From 8915e8d96c9fb401d1972996cec318f9f68187d0 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Tue, 24 Sep 2024 17:21:55 +1200 Subject: [PATCH] Make invite INSERT OR IGNORE autocreate entry --- src/discord/interactions/invite.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/discord/interactions/invite.js b/src/discord/interactions/invite.js index 689ea1aa..ce80e99a 100644 --- a/src/discord/interactions/invite.js +++ b/src/discord/interactions/invite.js @@ -4,6 +4,10 @@ const DiscordTypes = require("discord-api-types/v10") const assert = require("assert/strict") const {discord, sync, db, select, from} = require("../../passthrough") +/** @type {import("../../d2m/actions/create-room")} */ +const createRoom = sync.require("../../d2m/actions/create-room") +/** @type {import("../../d2m/actions/create-space")} */ +const createSpace = sync.require("../../d2m/actions/create-space") /** @type {import("../../matrix/api")} */ const api = sync.require("../../matrix/api") @@ -12,17 +16,6 @@ const api = sync.require("../../matrix/api") * @returns {Promise} */ async function _interact({data, channel, guild_id}) { - // Check guild is bridged - const spaceID = select("guild_space", "space_id", {guild_id}).pluck().get() - const roomID = select("channel_room", "room_id", {channel_id: channel.id}).pluck().get() - if (!spaceID || !roomID) return { - type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource, - data: { - content: "This server isn't bridged to Matrix, so you can't invite Matrix users.", - flags: DiscordTypes.MessageFlags.Ephemeral - } - } - // Get named MXID /** @type {DiscordTypes.APIApplicationCommandInteractionDataStringOption[] | undefined} */ // @ts-ignore const options = data.options @@ -36,6 +29,13 @@ async function _interact({data, channel, guild_id}) { } } + // Ensure guild and room are bridged + db.prepare("INSERT OR IGNORE INTO guild_active (guild_id, autocreate) VALUES (?, 1)").run(guild_id) + const roomID = await createRoom.ensureRoom(channel.id) + assert(roomID) + const spaceID = select("guild_space", "space_id", {guild_id}).pluck().get() + assert(spaceID) + // Check for existing invite to the space let spaceMember try {