Create guild_active table instead of column
This commit is contained in:
parent
06f502dd89
commit
dbbb8281e6
6 changed files with 87 additions and 7 deletions
70
docs/self-service-room-creation-rules.md
Normal file
70
docs/self-service-room-creation-rules.md
Normal file
|
@ -0,0 +1,70 @@
|
|||
# Self-service room creation rules
|
||||
|
||||
Before version 3 of Out Of Your Element, new Matrix rooms would be created on-demand when a Discord channel is spoken in for the first time. This has worked pretty well.
|
||||
|
||||
This is done through functions like ensureRoom and ensureSpace in actions:
|
||||
|
||||
```js
|
||||
async function sendMessage(message, channel, guild, row) {
|
||||
const roomID = await createRoom.ensureRoom(message.channel_id)
|
||||
...
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures the room exists. If it doesn't, creates the room with an accurate initial state.
|
||||
* @param {string} channelID
|
||||
* @returns {Promise<string>} Matrix room ID
|
||||
*/
|
||||
function ensureRoom(channelID) {
|
||||
return _syncRoom(channelID, /* shouldActuallySync */ false) /* calls ensureSpace */
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures the space exists. If it doesn't, creates the space with an accurate initial state.
|
||||
* @param {DiscordTypes.APIGuild} guild
|
||||
* @returns {Promise<string>} Matrix space ID
|
||||
*/
|
||||
function ensureSpace(guild) {
|
||||
return _syncSpace(guild, /* shouldActuallySync */ false)
|
||||
}
|
||||
```
|
||||
|
||||
With the introduction of self-service mode, we still want to retain this as a possible mode of operation, since some people prefer to have OOYE handle this administrative work. However, other people prefer to manage the links between channels and rooms themselves, and have control over what new rooms get linked up to.
|
||||
|
||||
Visibly, this is managed through the web interface. The web interface lets moderators enable/disable auto-creation of new rooms, as well as set which channels and rooms are linked together.
|
||||
|
||||
There is a small complication. Not only are Matrix rooms created automatically, their Matrix spaces are also created automatically during room sync: ensureRoom calls ensureSpace. If a user opts in to self-service mode by clicking the specific button in the web portal, we must ensure the _space is not created automatically either,_ because the Matrix user will provide a space to link to.
|
||||
|
||||
To solve this, we need a way to suppress specific guilds from having auto-created spaces. The natural way to represent this is a column on guild_space, but that doesn't work, because each guild_space row requires a guild and space to be linked, and we _don't want_ them to be linked.
|
||||
|
||||
So, internally, OOYE keeps track of this through a new table:
|
||||
|
||||
```sql
|
||||
CREATE TABLE "guild_active" (
|
||||
"guild_id" TEXT NOT NULL, -- only guilds that are bridged are present in this table
|
||||
"autocreate" INTEGER NOT NULL, -- 0 or 1
|
||||
PRIMARY KEY("guild_id")
|
||||
) WITHOUT ROWID;
|
||||
```
|
||||
|
||||
There is one more complication. When adding a Discord bot through web oauth with a redirect_uri, Discord adds the bot to the server normally, _then_ redirects back to OOYE, and only then does OOYE know which guild the bot was just added to. So, for a short time between the bot being added and the user being redirected, OOYE might receive Discord events in the server before it has the chance to create the guild_active database row.
|
||||
|
||||
So to prevent this, self-service behaviour needs to be an implicit default, and users must firmly choose one system or another to begin using OOYE. It is important for me to design this in a way that doesn't force users to do any extra work or make a choice they don't understand to keep the pre-v3 behaviour.
|
||||
|
||||
So there will be 3 states of whether a guild is self-service or not. At first, it could be absent from the table, in which case events for it will be dropped. Or it could be in the table with autocomplete = 0, in which case only rooms that already exist in channel_room will have messages bridged. Or it could have autocomplete = 1, in which case Matrix rooms will be created as needed, as per the pre-v3 behaviour.
|
||||
|
||||
| Auto-create | Meaning |
|
||||
| -- | ------------ |
|
||||
| 😶🌫️ | Unbridged - waiting |
|
||||
| ❌ | Bridged - self-service |
|
||||
| ✅ | Bridged - auto-create |
|
||||
|
||||
Pressing buttons on web or using the /invite command on a guild will insert a row into guild_active, allowing it to be bridged.
|
||||
|
||||
So here's all the technical changes needed to support self-service in v3:
|
||||
|
||||
- New guild_active table showing whether, and how, a guild is bridged
|
||||
- When /invite command is used, INSERT OR IGNORE INTO state 1 and ensureRoom + ensureSpace.
|
||||
- When bot is added through "easy mode" web button, REPLACE INTO state 1 and ensureSpace.
|
||||
- When bot is added through "self-service" web button, REPLACE INTO state 2.
|
||||
- Event dispatcher will only ensureRoom if the guild_active state is 1
|
11
src/db/migrations/0014-add-guild-active.sql
Normal file
11
src/db/migrations/0014-add-guild-active.sql
Normal file
|
@ -0,0 +1,11 @@
|
|||
BEGIN TRANSACTION;
|
||||
|
||||
CREATE TABLE "guild_active" (
|
||||
"guild_id" TEXT NOT NULL,
|
||||
"autocreate" INTEGER NOT NULL,
|
||||
PRIMARY KEY("guild_id")
|
||||
) WITHOUT ROWID;
|
||||
|
||||
INSERT INTO guild_active (guild_id, autocreate) SELECT guild_id, 1 FROM guild_space;
|
||||
|
||||
COMMIT;
|
|
@ -1,5 +0,0 @@
|
|||
BEGIN TRANSACTION;
|
||||
|
||||
ALTER TABLE guild_space ADD COLUMN autocreate INTEGER NOT NULL DEFAULT 1;
|
||||
|
||||
COMMIT;
|
4
src/db/orm-defs.d.ts
vendored
4
src/db/orm-defs.d.ts
vendored
|
@ -31,6 +31,10 @@ export type Models = {
|
|||
guild_id: string
|
||||
space_id: string
|
||||
privacy_level: number
|
||||
}
|
||||
|
||||
guild_active: {
|
||||
guild_id: string
|
||||
autocreate: number
|
||||
}
|
||||
|
||||
|
|
|
@ -137,7 +137,7 @@ block body
|
|||
label.s-label.fl-grow1(for="autocreate")
|
||||
| Create new Matrix rooms automatically
|
||||
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_space", "autocreate", {guild_id}).pluck().get()
|
||||
- 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)
|
||||
.is-loading#autocreate-loading
|
||||
|
|
|
@ -18,6 +18,6 @@ as.router.post("/api/autocreate", defineEventHandler(async event => {
|
|||
const session = await useSession(event, {password: reg.as_token})
|
||||
if (!(session.data.managedGuilds || []).includes(parsedBody.guild_id)) throw createError({status: 403, message: "Forbidden", data: "Can't change settings for a guild you don't have Manage Server permissions in"})
|
||||
|
||||
db.prepare("UPDATE guild_space SET autocreate = ? WHERE guild_id = ?").run(+!!parsedBody.autocreate, parsedBody.guild_id)
|
||||
db.prepare("UPDATE guild_active SET autocreate = ? WHERE guild_id = ?").run(+!!parsedBody.autocreate, parsedBody.guild_id)
|
||||
return sendRedirect(event, `/guild?guild_id=${parsedBody.guild_id}`, 302)
|
||||
}))
|
||||
|
|
Loading…
Reference in a new issue