Spoilerfix COMPLETED!

I've come to fix conflicts, and then pretend you don't exist, again.

.gitignore

@@ -1,17 +1,18 @@
-# Secrets
+# Personal
 config.js
 registration.yaml
 ooye.db*
 events.db*
 backfill.db*
 custom-webroot
+icon.svg
+.devcontainer
 
 # Automatically generated
 node_modules
 coverage
 test/res/*
 !test/res/lottie*
-icon.svg
 *~
 .#*
 \#*#

docs/threads-as-rooms.md

@@ -0,0 +1,9 @@
+I thought pretty hard about it and I opted to make threads separate rooms because
+
+1. parity: discord has separate things like permissions and pins for threads, matrix cannot do this at all unless the thread is a separate room
+2. usage styles: most discord threads I've seen tend to be long-lived, spanning months or years, which isn't suited to matrix because of the timeline
+  - I'm in a discord thread for posting photos of food that gets a couple posts a week and has a timeline going back to 2023
+3. the timeline: if a matrix room has threads, and you want to scroll back through the timeline of a room OR of one of its threads, the timeline is merged, so you have to download every message linearised and throw them away if they aren't part of the thread you're looking through. it's bad for threads and it's bad for the main room
+4. it is also very very complex for clients to implement read receipts and typing indicators correctly for the merged timeline. if your client doesn't implement this, or doesn't do it correctly, you have a bad experience. many clients don't. element seems to have done it well enough, but is an exception
+
+overall in my view, threads-as-rooms has better parity and fewer downsides over native threads. but if there are things you don't like about this approach, I'm happy to discuss and see if we can improve them.

src/d2m/actions/create-room.js

@@ -35,6 +35,7 @@ const PRIVACY_ENUMS = {
 	ROOM_HISTORY_VISIBILITY: ["shared", "shared", "world_readable"], // any events sent after <value> are visible, but for world_readable anybody can read without even joining
 	GUEST_ACCESS: ["can_join", "forbidden", "forbidden"], // whether guests can join space if other conditions are met
 	SPACE_JOIN_RULES: ["invite", "public", "public"],
+	/** @type {import("../../types").JoinRule[]} */
 	ROOM_JOIN_RULES: ["restricted", "public", "public"]
 }
 
@@ -63,12 +64,13 @@ function convertNameAndTopic(channel, guild, customName) {
 	const chosenName = customName || (channelPrefix + channel.name);
 	const maybeTopicWithPipe = channel.topic ? ` | ${channel.topic}` : '';
 	const maybeTopicWithNewlines = channel.topic ? `${channel.topic}\n\n` : '';
+	const maybeWithin = parentChannel ? `Within: ${parentChannel.name} (ID: ${parentChannel.id})\n` : '';
 	const channelIDPart = `Channel ID: ${channel.id}`;
 	const guildIDPart = `Guild ID: ${guild.id}`;
 
 	const convertedTopic = customName
-		 ? `#${channel.name}${maybeTopicWithPipe}\n\n${channelIDPart}\n${guildIDPart}`
-		 : `${maybeTopicWithNewlines}${channelIDPart}\n${guildIDPart}`;
+		 ? `#${channel.name}${maybeTopicWithPipe}\n\n${maybeWithin}${channelIDPart}\n${guildIDPart}`
+		 : `${maybeTopicWithNewlines}${maybeWithin}${channelIDPart}\n${guildIDPart}`;
 
 	return [chosenName, convertedTopic];
 }
@@ -87,7 +89,7 @@ async function channelToKState(channel, guild, di) {
 	const guildSpaceID = await createSpace.ensureSpace(guild)
 	/** Used as the literal parent on Matrix, for categorisation. Will be the same as `guildSpaceID` unless it's a forum channel's thread, in which case a different space is used to group those threads. */
 	let parentSpaceID = guildSpaceID
-	if (parentChannel?.type === DiscordTypes.ChannelType.GuildForum) {
+	if (parentChannel?.type === DiscordTypes.ChannelType.GuildForum || parentChannel?.type === DiscordTypes.ChannelType.GuildMedia) { //TODO: Once Ellie's and Guzio's MSC for room-in-room embedding starts being implemented, make this check for whether THIS channel (not its parent) is a thread of ANY type (not just threads in forum/media channels) - thus making it so that threads always appear embedded under their parent.
 		parentSpaceID = await ensureRoom(channel.parent_id)
 		assert(typeof parentSpaceID === "string")
 	}
@@ -110,7 +112,7 @@ async function channelToKState(channel, guild, di) {
 	let history_visibility = PRIVACY_ENUMS.ROOM_HISTORY_VISIBILITY[privacyLevel]
 	if (channel["thread_metadata"]) history_visibility = "world_readable"
 
-	/** @type {{join_rule: string, allow?: any}} */
+	/** @type {{join_rule: import("../../types").JoinRule, allow?: {type: "m.room_membership", room_id: string}[]}} */
 	let join_rules = {
 		join_rule: "restricted",
 		allow: [{
@@ -118,6 +120,13 @@ async function channelToKState(channel, guild, di) {
 			room_id: guildSpaceID
 		}]
 	}
+	if (guildSpaceID !== parentSpaceID) {
+		//@ts-ignore - join_rules.allow most certainly IS defined because we literally define it ~5 lines earlier
+		join_rules.allow[1] = {
+			type: "m.room_membership",
+			room_id: parentSpaceID
+		}
+	}
 	if (PRIVACY_ENUMS.ROOM_JOIN_RULES[privacyLevel] !== "restricted") {
 		join_rules = {join_rule: PRIVACY_ENUMS.ROOM_JOIN_RULES[privacyLevel]}
 	}
@@ -195,7 +204,7 @@ async function channelToKState(channel, guild, di) {
 	if (hasCustomTopic) delete channelKState["m.room.topic/"]
 
 	// Make voice channels be a Matrix voice room (MSC3417)
-	if (channel.type === DiscordTypes.ChannelType.GuildVoice) {
+	if (channel.type === DiscordTypes.ChannelType.GuildVoice || channel.type === DiscordTypes.ChannelType.GuildStageVoice) {
 		creationContent.type = "org.matrix.msc3417.call"
 		channelKState["org.matrix.msc3401.call/"] = {
 			"m.intent": "m.room",
@@ -440,12 +449,12 @@ async function _syncRoom(channelID, shouldActuallySync) {
 	return roomID
 }
 
-/** Ensures the room exists. If it doesn't, creates the room with an accurate initial state. Please check that a channel_room entry exists or guild autocreate = 1 before calling this. */
+/** Ensures the room exists. If it doesn't, creates the room with an accurate initial state. Before calling this, please make sure that: a channel_room entry exists, guild autocreate = 1, or you're operating on a thread.*/
 function ensureRoom(channelID) {
 	return _syncRoom(channelID, false)
 }
 
-/** Actually syncs. Gets all room state from the homeserver in order to diff, and uploads the icon to mxc if it has changed. Please check that a channel_room entry exists or guild autocreate = 1 before calling this. */
+/** Actually syncs. Gets all room state from the homeserver in order to diff, and uploads the icon to mxc if it has changed. Before calling this, please make sure that: a channel_room entry exists, guild autocreate = 1, or you're operating on a thread.*/
 function syncRoom(channelID) {
 	return _syncRoom(channelID, true)
 }

src/d2m/converters/thread-to-announcement.js

@@ -1,9 +1,7 @@
 // @ts-check
 
-const assert = require("assert").strict
-
 const passthrough = require("../../passthrough")
-const {discord, sync, db, select} = passthrough
+const {sync, select} = passthrough
 /** @type {import("../../matrix/utils")} */
 const mxUtils = sync.require("../../matrix/utils")
 const {reg} = require("../../matrix/read-registration.js")
@@ -19,24 +17,28 @@ const userRegex = reg.namespaces.users.map(u => new RegExp(u.regex))
  */
 async function threadToAnnouncement(parentRoomID, threadRoomID, creatorMxid, thread, di) {
 	const branchedFromEventID = select("event_message", "event_id", {message_id: thread.id}).pluck().get()
-	/** @type {{"m.mentions"?: any, "m.in_reply_to"?: any}} */
+
+	/** @type {{"m.mentions"?: any, "m.relates_to"?: {event_id?: string, is_falling_back?: boolean, "m.in_reply_to"?: {event_id: string}, rel_type?: "m.replace"|"m.thread"}}} */
 	const context = {}
+	let suffix = ""
 	if (branchedFromEventID) {
 		// Need to figure out who sent that event...
 		const event = await di.api.getEvent(parentRoomID, branchedFromEventID)
+		suffix = "\n[ YOU MUST continue the conversation in that thread-room, rather than in this Matrix thread, even if your client supports MX threads. Any messages sent in MX threads ARE !DELETED! and copied to thread-rooms, which makes OOYE the author, and strips you from edit/delete rights! ]"
 		context["m.relates_to"] = {"m.in_reply_to": {event_id: event.event_id}}
 		if (event.sender && !userRegex.some(rx => event.sender.match(rx))) context["m.mentions"] = {user_ids: [event.sender]}
+		//...And actually branch from that event
+		context["m.relates_to"] = {"m.in_reply_to": {event_id: event.event_id}, is_falling_back:false, event_id: event.event_id, rel_type: "m.thread"}
 	}
 
-	const msgtype = creatorMxid ? "m.emote" : "m.text"
-	const template = creatorMxid ? "started a thread:" : "Thread started:"
+	const msgtype =  creatorMxid ? "m.emote" : "m.text"
+	const template = creatorMxid ? "started a thread called" : "New thread started:"
 	const via = await mxUtils.getViaServersQuery(threadRoomID, di.api)
-	let body = `${template} ${thread.name} https://matrix.to/#/${threadRoomID}?${via.toString()}`
+	let body = `${template} \"${thread.name}\" in room: https://matrix.to/#/${threadRoomID}?${via.toString()}${suffix}`
 
 	return {
 		msgtype,
 		body,
-		"m.mentions": {},
 		...context
 	}
 }

src/d2m/converters/thread-to-announcement.test.js

@@ -1,8 +1,8 @@
-const {test} = require("supertape")
-const {threadToAnnouncement} = require("./thread-to-announcement")
+const { test } = require("supertape")
+const { threadToAnnouncement } = require("./thread-to-announcement")
 const data = require("../../../test/data")
 const Ty = require("../../types")
-const {mockGetEffectivePower} = require("../../matrix/utils.test")
+const { mockGetEffectivePower } = require("../../matrix/utils.test")
 
 /**
  * @param {string} roomID
@@ -10,7 +10,7 @@ const {mockGetEffectivePower} = require("../../matrix/utils.test")
  * @returns {(roomID: string, eventID: string) => Promise<Ty.Event.Outer<Ty.Event.M_Room_Message>>}
  */
 function mockGetEvent(t, roomID_in, eventID_in, outer) {
-	return async function(roomID, eventID) {
+	return async function (roomID, eventID) {
 		t.equal(roomID, roomID_in)
 		t.equal(eventID, eventID_in)
 		return new Promise(resolve => {
@@ -35,8 +35,8 @@ const viaApi = {
 	async getJoinedMembers(roomID) {
 		return {
 			joined: {
-				"@_ooye_bot:cadence.moe": {display_name: null, avatar_url: null},
-				"@user:matrix.org": {display_name: null, avatar_url: null}
+				"@_ooye_bot:cadence.moe": { display_name: null, avatar_url: null },
+				"@user:matrix.org": { display_name: null, avatar_url: null }
 			}
 		}
 	}
@@ -46,11 +46,10 @@ test("thread2announcement: no known creator, no branched from event", async t =>
 	const content = await threadToAnnouncement("!parent", "!thread", null, {
 		name: "test thread",
 		id: "-1"
-	}, {api: viaApi})
+	}, { api: viaApi })
 	t.deepEqual(content, {
 		msgtype: "m.text",
-		body: "Thread started: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
-		"m.mentions": {}
+		body: "New thread started: \"test thread\" in room: https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
 	})
 })
 
@@ -58,11 +57,10 @@ test("thread2announcement: known creator, no branched from event", async t => {
 	const content = await threadToAnnouncement("!parent", "!thread", "@_ooye_crunch_god:cadence.moe", {
 		name: "test thread",
 		id: "-1"
-	}, {api: viaApi})
+	}, { api: viaApi })
 	t.deepEqual(content, {
 		msgtype: "m.emote",
-		body: "started a thread: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
-		"m.mentions": {}
+		body: "started a thread called \"test thread\" in room: https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
 	})
 })
 
@@ -85,12 +83,14 @@ test("thread2announcement: no known creator, branched from discord event", async
 	})
 	t.deepEqual(content, {
 		msgtype: "m.text",
-		body: "Thread started: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
-		"m.mentions": {},
+		body: "New thread started: \"test thread\" in room: https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org\n[ YOU MUST continue the conversation in that thread-room, rather than in this Matrix thread, even if your client supports MX threads. Any messages sent in MX threads ARE !DELETED! and copied to thread-rooms, which makes OOYE the author, and strips you from edit/delete rights! ]",
 		"m.relates_to": {
+			"event_id": "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg",
+			"is_falling_back": false,
 			"m.in_reply_to": {
-				event_id: "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg"
-			}
+				"event_id": "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg",
+			},
+			"rel_type": "m.thread",
 		}
 	})
 })
@@ -114,12 +114,14 @@ test("thread2announcement: known creator, branched from discord event", async t
 	})
 	t.deepEqual(content, {
 		msgtype: "m.emote",
-		body: "started a thread: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
-		"m.mentions": {},
+		body: "started a thread called \"test thread\" in room: https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org\n[ YOU MUST continue the conversation in that thread-room, rather than in this Matrix thread, even if your client supports MX threads. Any messages sent in MX threads ARE !DELETED! and copied to thread-rooms, which makes OOYE the author, and strips you from edit/delete rights! ]",
 		"m.relates_to": {
+			"event_id": "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg",
+			"is_falling_back": false,
 			"m.in_reply_to": {
-				event_id: "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg"
-			}
+				"event_id": "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg",
+			},
+			"rel_type": "m.thread",
 		}
 	})
 })
@@ -143,14 +145,51 @@ test("thread2announcement: no known creator, branched from matrix event", async
 	})
 	t.deepEqual(content, {
 		msgtype: "m.text",
-		body: "Thread started: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
+		body: "New thread started: \"test thread\" in room: https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org\n[ YOU MUST continue the conversation in that thread-room, rather than in this Matrix thread, even if your client supports MX threads. Any messages sent in MX threads ARE !DELETED! and copied to thread-rooms, which makes OOYE the author, and strips you from edit/delete rights! ]",
 		"m.mentions": {
 			user_ids: ["@cadence:cadence.moe"]
 		},
 		"m.relates_to": {
+			"event_id": "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4",
+			"is_falling_back": false,
 			"m.in_reply_to": {
-				event_id: "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4"
-			}
+				"event_id": "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4",
+			},
+			"rel_type": "m.thread",
+		}
+	})
+})
+
+test("thread2announcement: known creator, branched from matrix event", async t => {
+	const content = await threadToAnnouncement("!kLRqKKUQXcibIMtOpl:cadence.moe", "!thread", "@_ooye_crunch_god:cadence.moe", {
+		name: "test thread",
+		id: "1128118177155526666"
+	}, {
+		api: {
+			getEvent: mockGetEvent(t, "!kLRqKKUQXcibIMtOpl:cadence.moe", "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4", {
+				type: "m.room.message",
+				content: {
+					msgtype: "m.text",
+					body: "so can you reply to my webhook uwu"
+				},
+				sender: "@cadence:cadence.moe"
+			}),
+			...viaApi
+		}
+	})
+	t.deepEqual(content, {
+		msgtype: "m.emote",
+		body: "started a thread called \"test thread\" in room: https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org\n[ YOU MUST continue the conversation in that thread-room, rather than in this Matrix thread, even if your client supports MX threads. Any messages sent in MX threads ARE !DELETED! and copied to thread-rooms, which makes OOYE the author, and strips you from edit/delete rights! ]",
+		"m.mentions": {
+			user_ids: ["@cadence:cadence.moe"]
+		},
+		"m.relates_to": {
+			"event_id": "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4",
+			"is_falling_back": false,
+			"m.in_reply_to": {
+				"event_id": "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4",
+			},
+			"rel_type": "m.thread",
 		}
 	})
 })

src/d2m/event-dispatcher.js

@@ -69,7 +69,7 @@ module.exports = {
 	},
 
 	/**
-	 * When logging back in, check if we missed any conversations in any channels. Bridge up to 49 missed messages per channel.
+	 * When logging back in, check if we missed any conversations in any channels. Bridge up to 99 missed messages per channel.
 	 * If more messages were missed, only the latest missed message will be posted. TODO: Consider bridging more, or post a warning when skipping history?
 	 * This can ONLY detect new messages, not any other kind of event. Any missed edits, deletes, reactions, etc will not be bridged.
 	 * @param {import("./discord-client")} client
@@ -213,7 +213,7 @@ module.exports = {
 		const channelID = thread.parent_id || undefined
 		const parentRoomID = select("channel_room", "room_id", {channel_id: channelID}).pluck().get()
 		if (!parentRoomID) return // Not interested in a thread if we aren't interested in its wider channel (won't autocreate)
-		const threadRoomID = await createRoom.syncRoom(thread.id) // Create room (will share the same inflight as the initial message to the thread)
+		const threadRoomID = await createRoom.ensureRoom(thread.id)
 		await announceThread.announceThread(parentRoomID, threadRoomID, thread)
 	},
 

src/m2d/converters/event-to-message.js

@@ -468,6 +468,7 @@ async function checkWrittenMentions(content, event, guild, di) {
 					// @ts-ignore - typescript doesn't know about indices yet
 					content: content.slice(0, writtenMentionMatch.indices[1][0]-1) + (roleID ? `<@&${roleID}>` : "@everyone") + content.slice(writtenMentionMatch.indices[1][1]),
 					ensureJoined: [],
+					/**@type {DiscordTypes.AllowedMentionsTypes[]}*/ // @ts-ignore - TypeScript is for whatever reason convinced that "everyone" cannot be assigned to AllowedMentionsTypes, but if you „Go to Definition”, you'll see that "everyone" is a valid enum value.
 					allowedMentionsParse: roleID ? [] : ["everyone"],
 					allowedMentionsUsers: []
 				}
@@ -542,6 +543,7 @@ async function getL1L2ReplyLine(called = false) {
 async function eventToMessage(event, guild, channel, di) {
 	let displayName = event.sender
 	let avatarURL = undefined
+	/**@type {DiscordTypes.AllowedMentionsTypes[]}*/ // @ts-ignore - TypeScript is for whatever reason conviced that neither "users" no "roles" cannot be assigned to AllowedMentionsTypes, but if you „Go to Definition”, you'll see that both are valid enum values.
 	const allowedMentionsParse = ["users", "roles"]
 	const allowedMentionsUsers = []
 	/** @type {string[]} */

src/m2d/converters/threads-and-forums.js

@@ -0,0 +1,106 @@
+//@ts-check
+
+/*
+ * Misc. utils for transforming various Matrix events (eg. those sent in Forum-bridged channels; those sent) so that they're usable as threads, and for creating said threads.
+ */
+
+const Ty = require("../../types")
+const {discord, sync, select, from} = require("../../passthrough")
+const DiscordTypes = require("discord-api-types/v10")
+
+/** @type {import("../../matrix/api")}) */
+const api = sync.require("../../matrix/api")
+/** @type {import("../../d2m/actions/create-room")} */
+const createRoom = sync.require("../../d2m/actions/create-room")
+
+/**
+ * @param {Ty.Event.Outer_M_Room_Message | Ty.Event.Outer_M_Room_Message_File} event Used for determining the branching-point and the title; any relation data will be stripped and its room_id will mutate to the target thread-room, if one gets created.
+ * @returns {Promise<boolean>} whether a thread-room was created
+ */
+async function bridgeThread(event) {
+	/** @type {string} */ // @ts-ignore
+	const channelID = select("channel_room", "channel_id", {room_id: event.room_id}).pluck().get()
+	const channel = discord.channels.get(channelID)
+	const guildID = channel?.["guild_id"]
+	if (!guildID) return false; //Room not bridged? We don't care. It's a Matrix-native room, let Matrix users have standard Matrix-native threads there.
+
+	const threadEventID = event.content["m.relates_to"]?.event_id
+	if (!threadEventID) throw new Error("There was an event sent inside SOME Matrix thread, but it lacked any information as to what thread it actually was!"); //An „ugly error” is justified because if something like this DOES happen, then that means that it should be reported to us, as there is some broken client out there that we should account for.
+	const messageID = select("event_message", "message_id", {event_id: threadEventID}).pluck().get()
+	if (!messageID) return false; //Message not bridged? Too bad! Discord users will just see normal replies, and Matrix uses won't get a thread-room. We COULD technically create a "headless" thread on Discord side and bridge it to a new thread-room, but that comes with a whole host of complications on its own (notably: what do we do if the message gets bridged later (by reaction emoji), and then hypothetically gets its own thread; and: getThreadRoomFromThreadEvent will have to be much more complex than a simple DB call (probably a whole new DB table would have to be created, just to hold these Matrix-branched-but-headless-on-Discord threads) because the simple „MX event --(db)--> Discord Message --(Discord spec)--> Discord thread” relation would no longer hold true), which may not be worth it, as an unbridged message in a bridged channel is already an edge-case (so it seems pointless to introduce a whole bunch of edgier-cases that handling this edge-case "properly" would bring).
+	
+	try {
+		event.room_id = await createRoom.ensureRoom((await discord.snow.channel.createThreadWithMessage(channelID, messageID, {name: computeName(event, await api.getEvent(event.room_id, threadEventID)).name})).id)
+		return true;
+	}
+	catch (e){
+		if (e.message?.includes("50024")){ //see: https://docs.discord.com/developers/topics/opcodes-and-status-codes
+			api.sendEvent(event.room_id, "m.room.message", {
+				body: "Hey, please don't do that! This room is already a thread on Discord (or it could also be a voice-chat or something adjacent) - trying to embed threads inside it, like you just did, will not work. DC users will just see a regular reply, which is distracting and also probably not what you want.",
+				"m.mentions": { "user_ids": [event.sender]},
+				"m.relates_to": {
+					event_id: threadEventID,
+					is_falling_back: false,
+					"m.in_reply_to": { event_id: event.event_id },
+					rel_type: "m.thread"
+				},
+				msgtype: "m.text"
+			})
+			
+			return false;
+		}
+		else throw e
+	}
+}
+
+/**
+ * @param {Ty.Event.Outer_M_Room_Message | Ty.Event.Outer_M_Room_Message_File} event
+ * @returns {Promise<boolean>} whether a forum-thread-room was created
+ */
+async function handleForums(event) {
+	if (event.content.body === "/thread") return false; //Let the help be shown normally
+
+	const row = from("channel_room").where({room_id: event.room_id}).select("channel_id").get()
+	/** @type {string}*/ //@ts-ignore the possibility that it's undefined - get() will return back an undefined if it's fed one (so that's undefined-safe), and createThreadWithoutMessage() won't be reached because "undefined" is neither DiscordTypes.ChannelType.GuildMedia nor DiscordTypes.ChannelType.GuildForum, so the guard clause kicks in.
+	let channelID = row?.channel_id
+	const channel = discord.channels.get(channelID)
+	if (channel?.type != DiscordTypes.ChannelType.GuildForum && channel?.type != DiscordTypes.ChannelType.GuildMedia) return false
+
+	const name = computeName(event)
+	let resetNeeded = false
+	try {		
+		if(channel.flags && channel.flags & DiscordTypes.ChannelFlags.RequireTag){
+			await discord.snow.channel.updateChannel(channelID, {flags:(channel.flags^DiscordTypes.ChannelFlags.RequireTag)}, "Temporary override of tagging requirements because Matrix threads that can't be tagged yet.")
+			resetNeeded = true
+		}
+		//@ts-ignore the presence of message:{} and the absence of type:11 - that's intended for threads in Forum channels (*and no, createThreadWithMessage wouldn't work here, either - that one takes an ALREADY EXISTING message ID, whereas this needs a new message)
+		await discord.snow.channel.createThreadWithoutMessage(channelID, {name: name.name, message:{content:"**Created by: `"+ event.sender +"`**"}})
+		if (!name.truncated) api.redactEvent(event.room_id, event.event_id) //Don't destroy people's texts - only remove if no truncation is guaranteed.
+		if (resetNeeded) discord.snow.channel.updateChannel(channelID, {flags:channel.flags}, "Restoring flags to their original state.")
+	}
+	catch (e){
+		if (e.message?.includes("50013")){
+			api.sendEvent(event.room_id, "m.room.message", {
+				body: "You can't create threads in this forum right now! This forum is configured to require tags on post (Matrix users can't yet use tags yet), and OOYE doesn't have the permission to edit this channel on Discord (needed to bypass the requirement of tags). Unless this is intentional (see room description - the admins may have left a note), please ask someone on the Discord side to either grant OOYE the necessary permissions, or to remove tagging requirements.",
+				msgtype: "m.text"
+			})
+		}
+		else throw e
+	}
+	return true	
+}
+
+/**
+ * @param {Ty.Event.Outer_M_Room_Message | Ty.Event.Outer_M_Room_Message_File} from event
+ * @param {Ty.Event.Outer<any> | null | false | undefined} fallback Reuses the "from" param value if empty.
+ * @returns {{name: string, truncated: boolean}}
+ */
+function computeName(from, fallback=null){
+	let name = from.content.body
+	if (name.startsWith("/thread ") && name.length > 8) name = name.substring(8);
+	else name = (fallback ? fallback : from).content.body;
+	return name.length < 100 ? {name: name.replaceAll("\n", " "), truncated: false} : {name: name.slice(0, 96).replaceAll("\n", " ") + "...", truncated: true}
+}
+
+module.exports.handleForums = handleForums
+module.exports.bridgeThread = bridgeThread

src/m2d/event-dispatcher.js

@@ -9,6 +9,7 @@ const Ty = require("../types")
 const {discord, db, sync, as, select} = require("../passthrough")
 const {tag} = require("@cloudrac3r/html-template-tag")
 const {Semaphore} = require("@chriscdn/promise-semaphore")
+const {bridgeThread, handleForums} = require("./converters/threads-and-forums")
 
 /** @type {import("./actions/send-event")} */
 const sendEvent = sync.require("./actions/send-event")
@@ -133,6 +134,15 @@ async function sendError(roomID, source, type, e, payload) {
 	}
 }
 
+/**
+ * Wraps the function with an automated error catching and reporting mechanism
+ * @template {Ty.Event.Outer<any>} EVENT The event that the wrapped function processes, its first argument.
+ * @template {[]} ARGS Other arguments of the wrapped function
+ * @template RETURNS The output of the wrapped function
+ * @param {string} type Type of the event, during the processing of which the error may occur.
+ * @param {(event: EVENT, ...args: ARGS)=>RETURNS|Promise<RETURNS>} fn Function to wrap
+ * @returns {(event: EVENT, ...args: ARGS)=>Promise<RETURNS|undefined>} Wrapped function
+ */
 function guard(type, fn) {
 	return async function(event, ...args) {
 		try {
@@ -182,15 +192,35 @@ sync.addTemporaryListener(as, "type:m.room.message", guard("m.room.message",
  * @param {Ty.Event.Outer_M_Room_Message | Ty.Event.Outer_M_Room_Message_File} event it is a m.room.message because that's what this listener is filtering for
  */
 async event => {
-	if (!utils.eventSenderIsFromDiscord(event.sender)) {
+	if (!utils.eventSenderIsFromDiscord(event.sender)){
+		if (await handleForums(event)) return
+	
+		let processCommands = true
+		if (event.content["m.relates_to"]?.rel_type === "m.thread") {
+			/**@type {string|null} */
+			let redactAndMoveShouldOccurIn = event.room_id
+			const bridgedTo = utils.getThreadRoomFromThreadEvent(event.content["m.relates_to"].event_id)
+			processCommands = false
+	
+			if (bridgedTo) event.room_id = bridgedTo;
+			else if (!await bridgeThread(event)) redactAndMoveShouldOccurIn = null; //Don't remove anything, if there is nowhere to relocate it to.
+	
+			if (redactAndMoveShouldOccurIn) {
+				api.redactEvent(redactAndMoveShouldOccurIn, event.event_id)
+				event.content["m.relates_to"] = undefined
+				api.sendEvent(event.room_id, event.type, {...event.content, body: `${event.content.body}\n ~ ${event.sender}`, formatted_body: event.content.formatted_body ? `${event.content.formatted_body}<br> ~ ${event.sender}` : undefined })
+			}
+		}
+	
 		const messageResponses = await sendEvent.sendEvent(event)
 		if (!messageResponses.length) return
-		if (event.type === "m.room.message" && event.content.msgtype === "m.text") {
-			// @ts-ignore
-			await matrixCommandHandler.execute(event)
-		}
-		retrigger.finishedBridging(event.event_id)
-		await api.ackEvent(event)
+	
+		if (event.type === "m.room.message" && event.content.msgtype === "m.text" && processCommands) {
+			await matrixCommandHandler.parseAndExecute(
+				// @ts-ignore - TypeScript doesn't know that the event.content.msgtype === "m.text" check ensures that event isn't of type Ty.Event.Outer_M_Room_Message_File (which, indeed, wouldn't fit here)
+				event
+			)
+		}	
 	}
 	if (!event.content["m.relates_to"]) { // Ignore edits since they don't update the timeline on Discord
 		sendEvent.latestSenderPerRoom.set(event.room_id, event.sender)

src/matrix/matrix-command-handler.js

@@ -274,8 +274,65 @@ const commands = [{
 					body: "This command creates a thread on Discord. But you aren't allowed to do this, because if you were a Discord user, you wouldn't have the Create Public Threads permission."
 				})
 			}
+			
+			const relation = event.content["m.relates_to"]
+			let isFallingBack = false;
+			let branchedFromMxEvent = relation?.["m.in_reply_to"]?.event_id // By default, attempt to branch the thread from the message to which /thread was replying.
+			if (relation?.rel_type === "m.thread") branchedFromMxEvent = relation?.event_id // If /thread was sent inside a Matrix thread, attempt to branch the Discord thread from the message, which that Matrix thread already is branching from.
+			if (!branchedFromMxEvent){
+				branchedFromMxEvent = event.event_id // If /thread wasn't replying to anything (ie. branchedFromMxEvent was undefined at initial assignment), or if the event was somehow malformed (in such a way that that - one way or another - branchedFromMxEvent ended up being undefined, even if according to the spec it shouldn't), branch the thread from the /thread command-message that created it.
+				isFallingBack = true;
+			}
+			const branchedFromDiscordMessage = select("event_message", "message_id", {event_id: branchedFromMxEvent}).pluck().get()
 
-			await discord.snow.channel.createThreadWithoutMessage(channelID, {type: 11, name: words.slice(1).join(" ")})
+			if (words.length < 2){
+				if (isFallingBack) return api.sendEvent(event.room_id, "m.room.message", {
+					...ctx,
+					msgtype: "m.text",
+					body: "**`/thread` usage:**\nRun this command as `/thread [Thread Name]` to create a thread. The message from which said thread will branch, is chosen based on the following rules:\n*  If ran stand-alone (not as a reply, nor in a Matrix thread), the created thread will branch from the command-message itself. The `Thread Name` argument must be provided in this case, otherwise you get this help message.\n*  If sent as a reply (outside a Matrix thread), the thread will branch from the message to which you replied.\n*  If ran inside an existing Matrix thread (regardless of whether it's a reply or not), the created Discord thread will be branching from the same message as the Matrix thread already is.",
+					format: "org.matrix.custom.html",
+					formatted_body: "<strong><code>/thread</code> usage:</strong><br>Run this command as <code>/thread [Thread Name]</code> to create a thread on Discord (and optionally Matrix, if one doesn't exist already). The message from which said thread will branch, is chosen based on the following rules:<br><ul><li>If ran stand-alone (not as a reply, nor in a Matrix thread), the created thread will branch from the command-message itself. The <code>Thread Name</code> argument must be provided in this case, otherwise you get this help message.</li><li>If sent as a reply (outside a Matrix thread), the thread will branch from the message to which you replied.</li><li>If ran inside an existing Matrix thread (regardless of whether it's a reply or not), the created Discord thread will be branching from the same message as the Matrix thread already is.</li></ul>"
+				})
+				words[1] = (await api.getEvent(event.room_id, branchedFromMxEvent)).content.body.replaceAll("\n", " ")
+				words[1] = words[1].length < 100 ? words[1] : words[1].slice(0, 96) + "..."
+			}
+			
+			try {
+				if (branchedFromDiscordMessage) return await discord.snow.channel.createThreadWithMessage(channelID, branchedFromDiscordMessage, {name: words.slice(1).join(" ")}) //can't just return the promise directly like in 99% of other cases here in commands, otherwise the error-handling below will not work
+				else {return api.sendEvent(event.room_id, "m.room.message", {
+					...ctx,
+					msgtype: "m.text",
+					body: "⚠️ Couldn't find a Discord representation of the message from which you're trying to branch this thread (event ID `"+branchedFromMxEvent+"` on Matrix), so it wasn't created. Either you ran this command on an unbridged message (one sent by this bot or one that failed to bridge due to a previous error), or this is an error on our side and should be reported.",
+					format: "org.matrix.custom.html",
+					formatted_body: "⚠️ Couldn't find a Discord representation of the message from which you're trying to branch this thread (event ID <code>"+branchedFromMxEvent+"</code> on Matrix), so it wasn't created. Either you ran this command on an unbridged message (one sent by this bot or one that failed to bridge due to a previous error), or this is an error on our side and should be reported."
+				})};
+			}
+			catch (e){
+				/**@type {string|undefined} */
+				let err = e.message // see: https://docs.discord.com/developers/topics/opcodes-and-status-codes
+				
+				if (err?.includes("160004")) {
+					if (isFallingBack) throw e; //Discord claims that there already exists a thread for the message ran this command was ran on, but that doesn't make logical sense, as it doesn't seem like it was ran on any message. Either the Matrix client did something funny with reply/thread tags, or this is a logic error on our side. At any rate, this should be reported to OOYE for further investigation, which the user should do when encountering an „ugly error” (if they follow the „every error should be reported” directive), so this is re-thrown as-is (no stacktrace-breaking exception wrapping) to be turned into such an „ugly error” upstream.
+					const thread = mxUtils.getThreadRoomFromThreadEvent(branchedFromMxEvent)
+					return api.sendEvent(event.room_id, "m.room.message", {
+						...ctx,
+						msgtype: "m.text",
+						body: "There already exists a Discord thread for the message you ran this command on" + (thread ? " - you may join its bridged room here: https://matrix.to/#/"+thread+"?"+(await mxUtils.getViaServersQuery(thread, api)).toString() : ", so a new one cannot be crated. However, it seems like that thread isn't bridged to any Matrix rooms. Please ask the space/server admins to rectify this issue by creating the bridge. (If you're said admin and you can see that said bridge already exists, but this error message is still showing up, please report that as a bug.)")
+					})
+				}
+				if (err?.includes("50024")) return api.sendEvent(event.room_id, "m.room.message", {
+					...ctx,
+					msgtype: "m.text",
+					body: "You cannot create threads in a Discord channel of the type, to which this Matrix room is bridged to. It could be something like a VC, or perhaps... Did you try to embed a thread inside a thread, silly?"
+				})
+				if (err?.includes("50035")) return api.sendEvent(event.room_id, "m.room.message", {
+					...ctx,
+					msgtype: "m.text",
+					body: "Specified thread name is too long - thread creation failed. Please yap a bit less in the title, the thread body is for that. ;)"
+				})
+
+				throw e //Some other error happened, one that OOYE didn't anticipate the possibility of? It should be reported to us for further investigation, which the user should do when encountering an „ugly error” (if they follow the „every error should be reported” directive), so this is re-thrown as-is (no stacktrace-breaking exception wrapping) to be turned into such an „ugly error” upstream.
+			}
 		}
 	)
 }, {
@@ -442,8 +499,11 @@ const commands = [{
 }]
 
 
-/** @type {CommandExecute} */
-async function execute(event) {
+/**
+ * @param {Ty.Event.Outer_M_Room_Message} event
+ * @returns {Promise<any>|undefined} the executed command's in-process promise or undefined if no command execution was performed
+*/
+function parseAndExecute(event) {
 	let realBody = event.content.body
 	while (realBody.startsWith("> ")) {
 		const i = realBody.indexOf("\n")
@@ -463,8 +523,8 @@ async function execute(event) {
 	const command = commands.find(c => c.aliases.includes(commandName))
 	if (!command) return
 
-	await command.execute(event, realBody, words)
+	return command.execute(event, realBody, words)
 }
 
-module.exports.execute = execute
+module.exports.parseAndExecute = parseAndExecute
 module.exports.onReactionAdd = onReactionAdd

src/matrix/utils.js

@@ -4,7 +4,7 @@ const assert = require("assert").strict
 const Ty = require("../types")
 const {tag} = require("@cloudrac3r/html-template-tag")
 const passthrough = require("../passthrough")
-const {db} = passthrough
+const {db, select} = passthrough
 
 const {reg} = require("./read-registration")
 const userRegex = reg.namespaces.users.map(u => new RegExp(u.regex))
@@ -385,6 +385,16 @@ async function setUserPowerCascade(spaceID, mxid, power, api) {
 	}
 }
 
+/**
+ * @param {undefined|string?} eventID
+ */      //^For some reason, „?” doesn't include Undefined and it needs to be explicitly specified
+function getThreadRoomFromThreadEvent(eventID){
+	if (!eventID) return eventID;
+	const threadID = select("event_message", "message_id", {event_id: eventID}).pluck().get() //Discord thread ID === its message ID
+	if (!threadID) return threadID;
+	return select("channel_room", "room_id", {channel_id: threadID}).pluck().get()
+}
+
 module.exports.bot = bot
 module.exports.BLOCK_ELEMENTS = BLOCK_ELEMENTS
 module.exports.eventSenderIsFromDiscord = eventSenderIsFromDiscord
@@ -400,3 +410,4 @@ module.exports.removeCreatorsFromPowerLevels = removeCreatorsFromPowerLevels
 module.exports.getEffectivePower = getEffectivePower
 module.exports.setUserPower = setUserPower
 module.exports.setUserPowerCascade = setUserPowerCascade
+module.exports.getThreadRoomFromThreadEvent = getThreadRoomFromThreadEvent

src/matrix/utils.test.js

@@ -2,7 +2,7 @@
 
 const {select} = require("../passthrough")
 const {test} = require("supertape")
-const {eventSenderIsFromDiscord, getEventIDHash, MatrixStringBuilder, getViaServers, roomHasAtLeastVersion, removeCreatorsFromPowerLevels, setUserPower} = require("./utils")
+const {eventSenderIsFromDiscord, getEventIDHash, MatrixStringBuilder, getViaServers, roomHasAtLeastVersion, removeCreatorsFromPowerLevels, setUserPower, getThreadRoomFromThreadEvent} = require("./utils")
 const util = require("util")
 
 /** @param {string[]} mxids */
@@ -417,4 +417,23 @@ test("set user power: privileged users must demote themselves", async t => {
 	t.equal(called, 3)
 })
 
+test("getThreadRoomFromThreadEvent: real message with a thread", t => {
+	const room = getThreadRoomFromThreadEvent("$fdD9o7NxMA4VPexlAiIx2CB9JbsiGhJeyJgnZG7U5xg")
+	t.equal(room, "!FuDZhlOAtqswlyxzeR:cadence.moe")
+})
+
+test("getThreadRoomFromThreadEvent: real message, but without a thread", t => {
+	const room = getThreadRoomFromThreadEvent("$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4")
+	const msg = "Expected null/undefined, got: "+room
+	if(room) t.fail(msg);
+	else t.pass(msg)
+})
+
+test("getThreadRoomFromThreadEvent: fake message", t => {
+	const room = getThreadRoomFromThreadEvent("$ThisEvent-IdDoesNotExistInTheDatabase4Sure")
+	const msg = "Expected null/undefined, got: "+room
+	if(room) t.fail(msg);
+	else t.pass(msg)
+})
+
 module.exports.mockGetEffectivePower = mockGetEffectivePower

src/types.d.ts

@@ -216,11 +216,12 @@ export namespace Event {
 		format?: "org.matrix.custom.html"
 		formatted_body?: string,
 		"m.relates_to"?: {
-			"m.in_reply_to": {
+			event_id?: string
+			is_falling_back?: boolean
+			"m.in_reply_to"?: {
 				event_id: string
 			}
-			rel_type?: "m.replace"
-			event_id?: string
+			rel_type?: "m.replace"|"m.thread"
 		}
 	}
 
@@ -236,11 +237,12 @@ export namespace Event {
 		info?: any
 		"page.codeberg.everypizza.msc4193.spoiler"?: boolean
 		"m.relates_to"?: {
-			"m.in_reply_to": {
+			event_id?: string
+			is_falling_back?: boolean
+			"m.in_reply_to"?: {
 				event_id: string
 			}
-			rel_type?: "m.replace"
-			event_id?: string
+			rel_type?: "m.replace"|"m.thread"
 		}
 	}
 
@@ -272,11 +274,12 @@ export namespace Event {
 		},
 		info?: any
 		"m.relates_to"?: {
-			"m.in_reply_to": {
+			event_id?: string
+			is_falling_back?: boolean
+			"m.in_reply_to"?: {
 				event_id: string
 			}
-			rel_type?: "m.replace"
-			event_id?: string
+			rel_type?: "m.replace"|"m.thread"
 		}
 	}
 
@@ -536,6 +539,8 @@ export namespace R {
 
 export type Membership = "invite" | "knock" | "join" | "leave" | "ban"
 
+export type JoinRule = "public" | "knock" | "invite" | "private" | "restricted" | "knock_restricted"
+
 export type Pagination<T> = {
 	chunk: T[]
 	next_batch?: string

src/web/pug/explain.pug

@@ -0,0 +1,5 @@
+extends includes/template.pug
+
+block body
+  .ta-center.wmx5.p48.mx-auto#ok
+    p.mt24.fs-body2= msg

src/web/pug/guild.pug

@@ -1,349 +1,353 @@
-extends includes/template.pug
-
-mixin badge-readonly
-  .s-badge.s-badge__xs.s-badge__icon.s-badge__muted
-    != icons.Icons.IconEyeSm
-    | Read-only
-
-mixin badge-private
-  .s-badge.s-badge__xs.s-badge__icon.s-badge__warning
-    != icons.Icons.IconLockSm
-    | Private
-
-mixin discord(channel, radio=false)
-  //- Previously, we passed guild.roles as the second parameter, but this doesn't quite match Discord's behaviour. See issue #42 for why this was changed.
-  //- Basically we just want to assign badges based on the channel overwrites, without considering the guild's base permissions. /shrug
-  - let permissions = dUtils.getPermissions(guild_id, [], [{id: guild_id, name: "@everyone", permissions: 1<<10 | 1<<11}], null, channel.permission_overwrites)
-  .s-user-card.s-user-card__small
-    if !dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.ViewChannel)
-      != icons.Icons.IconLock
-    else if channel.type === 5
-      != icons.Icons.IconBullhorn
-    else if channel.type === 2
-      != icons.Icons.IconPhone
-    else if channel.type === 11 || channel.type === 12
-      != icons.Icons.IconCollection
-    else
-      include includes/hash.svg
-    .s-user-card--info.ws-nowrap
-      if radio
-        = channel.name
-      else
-        .s-user-card--link.fs-body1
-          a(href=`https://discord.com/channels/${channel.guild_id}/${channel.id}`)= channel.name
-      if channel.parent_id
-        .s-user-card--location= discord.channels.get(channel.parent_id).name
-      if !dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.ViewChannel)
-        +badge-private
-      else if !dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.SendMessages)
-        +badge-readonly
-
-mixin matrix(row, radio=false, badge="")
-  .s-user-card.s-user-card__small
-    != icons.Icons.IconMessage
-    .s-user-card--info.ws-nowrap
-      if radio
-        = row.nick || row.name
-      else
-        .s-user-card--link.fs-body1
-          a(href=`https://matrix.to/#/${row.room_id}`)= row.nick || row.name
-      if row.join_rule === "invite"
-        +badge-private
-
-block body
-  .s-page-title.mb24
-    h1.s-page-title--header= guild.name
-
-  .d-flex.g16(class="sm:fw-wrap")
-    .fl-grow1
-      h2.fs-headline1 Invite a Matrix user
-
-      form.d-grid.g-af-column.gy4.gx8.jc-start(method="post" action=rel("/api/invite") hx-post=rel("/api/invite") hx-trigger="submit" hx-swap="none" hx-on::after-request="if (event.detail.successful) this.reset()" hx-disabled-elt="input, button" hx-indicator="#invite-button")
-        label.s-label(for="mxid") Matrix ID
-        input.fl-grow1.s-input.wmx3#mxid(name="mxid" required placeholder="@user:example.org" pattern="@([^:]+):([a-z0-9:\\-]+\\.[a-z0-9.:\\-]+)")
-        label.s-label(for="permissions") Permissions
-        .s-select
-          select#permissions(name="permissions")
-            option(value="default") Default
-            option(value="moderator") Moderator
-            option(value="admin") Admin
-        input(type="hidden" name="guild_id" value=guild_id)
-        .grid--row-start2
-          button.s-btn.s-btn__filled#invite-button Invite
-    div
-      .s-card.d-flex.ai-center.jc-center(style="min-width: 132px; min-height: 132px;")
-        button.s-btn(class=space_id ? "s-btn__muted" : "s-btn__filled" hx-get=rel(`/qr?guild_id=${guild_id}`) hx-indicator="closest button" hx-swap="outerHTML" hx-disabled-elt="this") Show QR
-
-  if space_id
-    h2.mt48.fs-headline1 Server settings
-    h3.mt32.fs-category How Matrix users join
-      span#privacy-level-loading
-    .s-card
-      form(hx-post=rel("/api/privacy-level") hx-trigger="change" hx-indicator="#privacy-level-loading" hx-disabled-elt="input")
-        input(type="hidden" name="guild_id" value=guild_id)
-
-        .s-toggle-switch.s-toggle-switch__multiple.s-toggle-switch__incremental.d-grid.gx16.ai-center(style="grid-template-columns: auto 1fr")
-          input(type="radio" name="privacy_level" value="directory" id="privacy-level-directory" checked=(privacy_level === 2))
-          label.d-flex.gx8.jc-center.grid--row-start3(for="privacy-level-directory")
-            != icons.Icons.IconPlusSm
-            != icons.Icons.IconInternationalSm
-            .fl-grow1 Directory
-
-          input(type="radio" name="privacy_level" value="link" id="privacy-level-link" checked=(privacy_level === 1))
-          label.d-flex.gx8.jc-center.grid--row-start2(for="privacy-level-link")
-            != icons.Icons.IconPlusSm
-            != icons.Icons.IconLinkSm
-            .fl-grow1 Link
-
-          input(type="radio" name="privacy_level" value="invite" id="privacy-level-invite" checked=(privacy_level === 0))
-          label.d-flex.gx8.jc-center.grid--row-start1(for="privacy-level-invite")
-            svg.svg-icon(width="14" height="14" viewBox="0 0 14 14")
-            != icons.Icons.IconLockSm
-            .fl-grow1 Invite
-
-          p.s-description.m0 In-app direct invite from another user
-          p.s-description.m0 Shareable invite links, like Discord
-          p.s-description.m0 Publicly listed in directory, like Discord server discovery
-
-    h3.mt32.fs-category Default roles
-    .s-card
-      form(method="post" action=rel("/api/default-roles") hx-post=rel("/api/default-roles") hx-sync="this:drop" hx-indicator="#add-role-loading" hx-target="#default-roles-list" hx-select="#default-roles-list" hx-swap="outerHTML")#default-roles
-        input(type="hidden" name="guild_id" value=guild_id)
-        .d-flex.fw-wrap.g4
-          .s-tag.s-tag__md.fs-body1.s-tag__required @everyone
-
-          block default-roles-list requires guild, guild_id
-            #default-roles-list(style="display: contents")
-              each roleID in select("role_default", "role_id", {guild_id}).pluck().all()
-                - let r = guild.roles.find(r => r.id === roleID)
-                if r
-                  .s-tag.s-tag__md.fs-body1= r.name
-                    span(id=`role-loading-${roleID}`)
-                    button(name="remove_role" value=roleID hx-post="api/default-roles" hx-trigger="click consume" hx-indicator=`#role-loading-${roleID}`).s-tag--dismiss
-                      != icons.Icons.IconClearSm
-
-          button(type="button" popovertarget="role-add").s-btn__dropdown.s-tag.s-tag__md.fs-body1.p0
-            .s-tag--dismiss.m1
-              != icons.Icons.IconPlusSm
-
-          #role-add.s-popover(popover style="display: revert").ws2.px0.py4.bs-lg.overflow-visible.box-border.lh-sm
-            .s-popover--arrow.s-popover--arrow__tc
-
-            block add-roles-menu requires guild, guild_id
-              ul.s-menu(role="menu" hx-swap-oob="true").overflow-y-auto.overflow-x-hidden#add-roles-menu
-                li.s-menu--title.d-flex(role="separator") Select role
-                  span#add-role-loading
-                each r in guild.roles.sort((a, b) => b.position - a.position)
-                  if r.id !== guild_id && !r.managed
-                    - let selected = !!select("role_default", "role_id", {guild_id, role_id: r.id}).get()
-                    li(role="menuitem")
-                      button(name="toggle_role" value=r.id class={"is-selected": selected}).s-block-link.s-block-link__left= r.name
-
-        p.fc-light.mb0.mt8 Matrix users will start with these roles. If your main channels are gated by a role, use this to let Matrix users skip the gate.
-
-    h3.mt32.fs-category Features
-    .s-card.d-grid.px0.g16
-      form.d-flex.ai-center.g16
-        #url-preview-loading.p8
-        - let value = !!select("guild_space", "url_preview", {guild_id}).pluck().get()
-        input(type="hidden" name="guild_id" value=guild_id)
-        input.s-toggle-switch#url-preview(name="url_preview" type="checkbox" hx-post=rel("/api/url-preview") hx-indicator="#url-preview-loading" hx-disabled-elt="this" checked=value autocomplete="off")
-        label.s-label.fl-grow1(for="url-preview")
-          | Show Discord's URL previews on Matrix
-          p.s-description Shows info about links posted to chat. Discord's previews are generally better quality than Synapse's, especially for social media and videos.
-
-      form.d-flex.ai-center.g16
-        #presence-loading.p8
-        - value = !!select("guild_space", "presence", {guild_id}).pluck().get()
-        input(type="hidden" name="guild_id" value=guild_id)
-        input.s-toggle-switch#presence(name="presence" type="checkbox" hx-post=rel("/api/presence") hx-indicator="#presence-loading" hx-disabled-elt="this" checked=value autocomplete="off")
-        label.s-label(for="presence")
-          | Show online statuses on Matrix
-          p.s-description This might cause lag on really big Discord servers.
-
-      form.d-flex.ai-center.g16
-        #webhook-profile-loading.p8
-        - value = !!select("guild_space", "webhook_profile", {guild_id}).pluck().get()
-        input(type="hidden" name="guild_id" value=guild_id)
-        input.s-toggle-switch#webhook-profile(name="webhook_profile" type="checkbox" hx-post=rel("/api/webhook-profile") hx-indicator="#webhook-profile-loading" hx-disabled-elt="this" checked=value autocomplete="off")
-        label.s-label(for="webhook-profile")
-          | Create persistent Matrix sims for webhooks
-          p.s-description Useful when using other Discord bridges. Otherwise, not ideal, as sims will clutter the Matrix user list and will never be cleaned up.
-
-  if space_id
-    h2.mt48.fs-headline1 Channel setup
-
-    h3.mt32.fs-category Linked channels
-    .s-card.bs-sm.p0
-      form.s-table-container(method="post" action=rel("/api/unlink"))
-        input(type="hidden" name="guild_id" value=guild_id)
-        table.s-table.s-table__bx-simple
-          each row in linkedChannelsWithDetails
-            tr
-              td.w40: +discord(row.channel)
-              td.p2: button.s-btn.s-btn__muted.s-btn__xs(name="channel_id" cx-prevent-default hx-post=rel("/api/unlink") hx-confirm="Do you want to unlink these channels?\nIt may take a moment to clean up Matrix resources." value=row.channel.id hx-indicator="this" hx-disabled-elt="this")!= icons.Icons.IconLinkSm
-              td: +matrix(row)
-          else
-            tr
-              td(colspan="3")
-                .s-empty-state No channels linked between Discord and Matrix yet...
-
-  if space_id && linkedChannelsWithDetails.length
-    - const customMentionRooms = linkedChannelsWithDetails.filter(row => row.room_mention_role)
-    - const defaultMentionRooms = linkedChannelsWithDetails.filter(row => !row.room_mention_role)
-    - const mentionRoles = [...guild.roles].filter(role => role.id !== guild_id).sort((a, b) => b.position - a.position)
+extends includes/template.pug
+
+mixin badge-readonly
+  .s-badge.s-badge__xs.s-badge__icon.s-badge__muted
+    != icons.Icons.IconEyeSm
+    | Read-only
+
+mixin badge-private
+  .s-badge.s-badge__xs.s-badge__icon.s-badge__warning
+    != icons.Icons.IconLockSm
+    | Private
+
+mixin discord(channel, radio=false)
+  //- Previously, we passed guild.roles as the second parameter, but this doesn't quite match Discord's behaviour. See issue #42 for why this was changed.
+  //- Basically we just want to assign badges based on the channel overwrites, without considering the guild's base permissions. /shrug
+  - let permissions = dUtils.getPermissions(guild_id, [], [{id: guild_id, name: "@everyone", permissions: 1<<10 | 1<<11}], null, channel.permission_overwrites)
+  .s-user-card.s-user-card__small
+    if !dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.ViewChannel)
+      != icons.Icons.IconLock
+    else if channel.type === 5
+      != icons.Icons.IconBullhorn
+    else if channel.type === 2
+      != icons.Icons.IconPhone
+    else if channel.type === 11 || channel.type === 12
+      != icons.Icons.IconCollection
+    else
+      include includes/hash.svg
+    .s-user-card--info.ws-nowrap
+      if radio
+        = channel.name
+      else
+        .s-user-card--link.fs-body1
+          a(href=`https://discord.com/channels/${channel.guild_id}/${channel.id}`)= channel.name
+      if channel.parent_id
+        .s-user-card--location= discord.channels.get(channel.parent_id).name
+      if !dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.ViewChannel)
+        +badge-private
+      else if !dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.SendMessages)
+        +badge-readonly
+
+mixin matrix(row, radio=false, badge="")
+  .s-user-card.s-user-card__small
+    != icons.Icons.IconMessage
+    .s-user-card--info.ws-nowrap
+      if radio
+        = row.nick || row.name
+      else
+        .s-user-card--link.fs-body1
+          a(href=`https://matrix.to/#/${row.room_id}`)= row.nick || row.name
+      if row.join_rule === "invite"
+        +badge-private
+
+block body
+  .s-page-title.mb24
+    h1.s-page-title--header= guild.name
+
+  .d-flex.g16(class="sm:fw-wrap")
+    .fl-grow1
+      h2.fs-headline1 Invite a Matrix user
+
+      form.d-grid.g-af-column.gy4.gx8.jc-start(method="post" action=rel("/api/invite") hx-post=rel("/api/invite") hx-trigger="submit" hx-swap="none" hx-on::after-request="if (event.detail.successful) this.reset()" hx-disabled-elt="input, button" hx-indicator="#invite-button")
+        label.s-label(for="mxid") Matrix ID
+        input.fl-grow1.s-input.wmx3#mxid(name="mxid" required placeholder="@user:example.org" pattern="@([^:]+):([a-z0-9:\\-]+\\.[a-z0-9.:\\-]+)")
+        label.s-label(for="permissions") Permissions
+        .s-select
+          select#permissions(name="permissions")
+            option(value="default") Default
+            option(value="moderator") Moderator
+            option(value="admin") Admin
+        input(type="hidden" name="guild_id" value=guild_id)
+        .grid--row-start2
+          button.s-btn.s-btn__filled#invite-button Invite
+    div
+      .s-card.d-flex.ai-center.jc-center(style="min-width: 132px; min-height: 132px;")
+        button.s-btn(class=space_id ? "s-btn__muted" : "s-btn__filled" hx-get=rel(`/qr?guild_id=${guild_id}`) hx-indicator="closest button" hx-swap="outerHTML" hx-disabled-elt="this") Show QR
+
+  if space_id
+    h2.mt48.fs-headline1 Server settings
+    h3.mt32.fs-category How Matrix users join
+      span#privacy-level-loading
+    .s-card
+      form(hx-post=rel("/api/privacy-level") hx-trigger="change" hx-indicator="#privacy-level-loading" hx-disabled-elt="input")
+        input(type="hidden" name="guild_id" value=guild_id)
+
+        .s-toggle-switch.s-toggle-switch__multiple.s-toggle-switch__incremental.d-grid.gx16.ai-center(style="grid-template-columns: auto 1fr")
+          input(type="radio" name="privacy_level" value="directory" id="privacy-level-directory" checked=(privacy_level === 2))
+          label.d-flex.gx8.jc-center.grid--row-start3(for="privacy-level-directory")
+            != icons.Icons.IconPlusSm
+            != icons.Icons.IconInternationalSm
+            .fl-grow1 Directory
+
+          input(type="radio" name="privacy_level" value="link" id="privacy-level-link" checked=(privacy_level === 1))
+          label.d-flex.gx8.jc-center.grid--row-start2(for="privacy-level-link")
+            != icons.Icons.IconPlusSm
+            != icons.Icons.IconLinkSm
+            .fl-grow1 Link
+
+          input(type="radio" name="privacy_level" value="invite" id="privacy-level-invite" checked=(privacy_level === 0))
+          label.d-flex.gx8.jc-center.grid--row-start1(for="privacy-level-invite")
+            svg.svg-icon(width="14" height="14" viewBox="0 0 14 14")
+            != icons.Icons.IconLockSm
+            .fl-grow1 Invite
+
+          p.s-description.m0 In-app direct invite from another user
+          p.s-description.m0 Shareable invite links, like Discord
+          p.s-description.m0 Publicly listed in directory, like Discord server discovery
+
+    h3.mt32.fs-category Default roles
+    .s-card
+      form(method="post" action=rel("/api/default-roles") hx-post=rel("/api/default-roles") hx-sync="this:drop" hx-indicator="#add-role-loading" hx-target="#default-roles-list" hx-select="#default-roles-list" hx-swap="outerHTML")#default-roles
+        input(type="hidden" name="guild_id" value=guild_id)
+        .d-flex.fw-wrap.g4
+          .s-tag.s-tag__md.fs-body1.s-tag__required @everyone
+
+          block default-roles-list requires guild, guild_id
+            #default-roles-list(style="display: contents")
+              each roleID in select("role_default", "role_id", {guild_id}).pluck().all()
+                - let r = guild.roles.find(r => r.id === roleID)
+                if r
+                  .s-tag.s-tag__md.fs-body1= r.name
+                    span(id=`role-loading-${roleID}`)
+                    button(name="remove_role" value=roleID hx-post="api/default-roles" hx-trigger="click consume" hx-indicator=`#role-loading-${roleID}`).s-tag--dismiss
+                      != icons.Icons.IconClearSm
+
+          button(type="button" popovertarget="role-add").s-btn__dropdown.s-tag.s-tag__md.fs-body1.p0
+            .s-tag--dismiss.m1
+              != icons.Icons.IconPlusSm
+
+          #role-add.s-popover(popover style="display: revert").ws2.px0.py4.bs-lg.overflow-visible.box-border.lh-sm
+            .s-popover--arrow.s-popover--arrow__tc
+
+            block add-roles-menu requires guild, guild_id
+              ul.s-menu(role="menu" hx-swap-oob="true").overflow-y-auto.overflow-x-hidden#add-roles-menu
+                li.s-menu--title.d-flex(role="separator") Select role
+                  span#add-role-loading
+                each r in guild.roles.sort((a, b) => b.position - a.position)
+                  if r.id !== guild_id && !r.managed
+                    - let selected = !!select("role_default", "role_id", {guild_id, role_id: r.id}).get()
+                    li(role="menuitem")
+                      button(name="toggle_role" value=r.id class={"is-selected": selected}).s-block-link.s-block-link__left= r.name
+
+        p.fc-light.mb0.mt8 Matrix users will start with these roles. If your main channels are gated by a role, use this to let Matrix users skip the gate.
+
+    h3.mt32.fs-category Features
+    .s-card.d-grid.px0.g16
+      form.d-flex.ai-center.g16
+        #url-preview-loading.p8
+        - let value = !!select("guild_space", "url_preview", {guild_id}).pluck().get()
+        input(type="hidden" name="guild_id" value=guild_id)
+        input.s-toggle-switch#url-preview(name="url_preview" type="checkbox" hx-post=rel("/api/url-preview") hx-indicator="#url-preview-loading" hx-disabled-elt="this" checked=value autocomplete="off")
+        label.s-label.fl-grow1(for="url-preview")
+          | Show Discord's URL previews on Matrix
+          p.s-description Shows info about links posted to chat. Discord's previews are generally better quality than Synapse's, especially for social media and videos.
+
+      form.d-flex.ai-center.g16
+        #presence-loading.p8
+        - value = !!select("guild_space", "presence", {guild_id}).pluck().get()
+        input(type="hidden" name="guild_id" value=guild_id)
+        input.s-toggle-switch#presence(name="presence" type="checkbox" hx-post=rel("/api/presence") hx-indicator="#presence-loading" hx-disabled-elt="this" checked=value autocomplete="off")
+        label.s-label(for="presence")
+          | Show online statuses on Matrix
+          p.s-description This might cause lag on really big Discord servers.
+
+      form.d-flex.ai-center.g16
+        #webhook-profile-loading.p8
+        - value = !!select("guild_space", "webhook_profile", {guild_id}).pluck().get()
+        input(type="hidden" name="guild_id" value=guild_id)
+        input.s-toggle-switch#webhook-profile(name="webhook_profile" type="checkbox" hx-post=rel("/api/webhook-profile") hx-indicator="#webhook-profile-loading" hx-disabled-elt="this" checked=value autocomplete="off")
+        label.s-label(for="webhook-profile")
+          | Create persistent Matrix sims for webhooks
+          p.s-description Useful when using other Discord bridges. Otherwise, not ideal, as sims will clutter the Matrix user list and will never be cleaned up.
+
+  if space_id
+    h2.mt48.fs-headline1 Channel setup
+
+    h3.mt32.fs-category Linked channels
+    .s-card.bs-sm.p0
+      form.s-table-container(method="post" action=rel("/api/unlink"))
+        input(type="hidden" name="guild_id" value=guild_id)
+        table.s-table.s-table__bx-simple
+          each row in linkedChannelsWithDetails
+            tr
+              td.w40: +discord(row.channel)
+              td.p2: button.s-btn.s-btn__muted.s-btn__xs(name="channel_id" cx-prevent-default hx-post=rel("/api/unlink") hx-confirm="Do you want to unlink these channels?\nIt may take a moment to clean up Matrix resources." value=row.channel.id hx-indicator="this" hx-disabled-elt="this")!= icons.Icons.IconLinkSm
+              td: +matrix(row)
+          else
+            tr
+              td(colspan="3")
+                .s-empty-state No channels linked between Discord and Matrix yet...
+
+  if space_id && linkedChannelsWithDetails.length
+    - const customMentionRooms = linkedChannelsWithDetails.filter(row => row.room_mention_role)
+    - const defaultMentionRooms = linkedChannelsWithDetails.filter(row => !row.room_mention_role)
+    - const mentionRoles = [...guild.roles].filter(role => role.id !== guild_id).sort((a, b) => b.position - a.position)
     h3.mt32.fs-category#room-notifications Room notifications
     .s-card.p0
       p.s-description.m12 Choose which Discord role receives Matrix @room notifications
       if customMentionRooms.length
         .s-table-container(style="container-type: inline-size")
           table.s-table.s-table__bx-simple(style="table-layout: fixed")
-            thead
-              tr
+            thead
+              tr
                 th(scope="col" style="width: calc(50cqw - 40px)") Channel
                 th.pr12(scope="col") Notify role
-            tbody
-              each row in customMentionRooms
-                tr
+            tbody
+              each row in customMentionRooms
+                tr
                   td.va-middle
                     +discord(row.channel)
                   td.pr12
                     .d-flex.ai-start.g8
                       form.fl-grow1.wmn0.d-flex.ai-stretch.g8(method="post" action=rel("/api/room-mention-role"))
-                        input(type="hidden" name="guild_id" value=guild_id)
-                        input(type="hidden" name="channel_id" value=row.channel.id)
+                        input(type="hidden" name="guild_id" value=guild_id)
+                        input(type="hidden" name="channel_id" value=row.channel.id)
                         .s-select.fl-grow1.wmn0
                           select.w100(name="room_mention_role" id="mention-role-" + row.channel.id aria-label="Notify role for #" + row.channel.name onchange="this.form.requestSubmit()" style="height: 32px")
-                            if !mentionRoles.some(role => role.id === row.room_mention_role)
-                              option(value=row.room_mention_role selected disabled) Deleted role (choose a replacement)
-                            each role in mentionRoles
-                              option(value=role.id selected=row.room_mention_role === role.id)= "@" + role.name
+                            if !mentionRoles.some(role => role.id === row.room_mention_role)
+                              option(value=row.room_mention_role selected disabled) Deleted role (choose a replacement)
+                            each role in mentionRoles
+                              option(value=role.id selected=row.room_mention_role === role.id)= "@" + role.name
                         button.s-btn.s-btn__outlined.py0.box-border(type="submit" data-room-mention-save style="height: 32px; min-height: 0") Save
-                      form.d-flex.ai-stretch(method="post" action=rel("/api/room-mention-role"))
-                        input(type="hidden" name="guild_id" value=guild_id)
-                        input(type="hidden" name="channel_id" value=row.channel.id)
-                        input(type="hidden" name="room_mention_role" value="")
+                      form.d-flex.ai-stretch(method="post" action=rel("/api/room-mention-role"))
+                        input(type="hidden" name="guild_id" value=guild_id)
+                        input(type="hidden" name="channel_id" value=row.channel.id)
+                        input(type="hidden" name="room_mention_role" value="")
                         button.s-btn.s-btn__danger.s-btn__outlined.py0(type="submit" aria-label="Remove custom role for #" + row.channel.name style="height: 32px") Remove
-
+
         script.
           document.querySelectorAll('[data-room-mention-save]').forEach(button => button.remove())
 
       if defaultMentionRooms.length && mentionRoles.length
         details.mt16.mx12.mb12
-          summary.s-label.cursor-pointer Add custom role
+          summary.s-label.cursor-pointer Add custom role
           form.mt16(method="post" action=rel("/api/room-mention-role"))
-            input(type="hidden" name="guild_id" value=guild_id)
+            input(type="hidden" name="guild_id" value=guild_id)
             .d-flex.fw-wrap.ai-end.g16
               .fl-grow1.wmn0(style="flex-basis: 0; min-width: 180px")
-                label.s-label(for="mention-role-channel") Channel
-                .s-select
+                label.s-label(for="mention-role-channel") Channel
+                .s-select
                   select.w100.box-border#mention-role-channel(name="channel_id" required style="height: 32px")
-                    option(value="" selected disabled) Choose a channel
-                    each row in defaultMentionRooms
-                      - const parent = discord.channels.get(row.channel.parent_id)
-                      option(value=row.channel.id)= "#" + row.channel.name + (parent ? " - " + parent.name : "")
+                    option(value="" selected disabled) Choose a channel
+                    each row in defaultMentionRooms
+                      - const parent = discord.channels.get(row.channel.parent_id)
+                      option(value=row.channel.id)= "#" + row.channel.name + (parent ? " - " + parent.name : "")
               .fl-grow1.wmn0(style="flex-basis: 0; min-width: 180px")
-                label.s-label(for="mention-role-new") Notify role
-                .s-select
+                label.s-label(for="mention-role-new") Notify role
+                .s-select
                   select.w100.box-border#mention-role-new(name="room_mention_role" required style="height: 32px")
-                    option(value="" selected disabled) Choose a role
-                    each role in mentionRoles
-                      option(value=role.id)= "@" + role.name
+                    option(value="" selected disabled) Choose a role
+                    each role in mentionRoles
+                      option(value=role.id)= "@" + role.name
               .d-flex.ai-stretch(style="height: 32px")
                 button.s-btn.s-btn__icon.s-btn__filled.d-inline-flex.ai-center.g4.py0.box-border(type="submit" style="min-height: 0")
                   != icons.Icons.IconPlusSm
                   span Add
-
-  h3.fs-category.mt32 Auto-create
-  .s-card.d-grid.px0
-    form.d-flex.ai-center.g16
-      #autocreate-loading.p8
-      - let value = !!select("guild_active", "autocreate", {guild_id}).pluck().get()
-      input(type="hidden" name="guild_id" value=guild_id)
-      input.s-toggle-switch#autocreate(name="autocreate" type="checkbox" hx-post=rel("/api/autocreate") hx-indicator="#autocreate-loading" hx-disabled-elt="this" checked=value autocomplete="off")
-      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 an unlinked Discord channel is spoken in.
-
-  if space_id
-    h3.mt32.fs-category Manually link channels
-    form.d-flex.g16.ai-start(hx-post=rel("/api/link") hx-trigger="submit" hx-disabled-elt="input, button" hx-indicator="#link-button")
-      .fl-grow2.s-btn-group.fd-column.w40
-        each channel in unlinkedChannels
-          input.s-btn--radio(type="radio" name="discord" required id=channel.id value=channel.id)
-          label.s-btn.s-btn__muted.ta-left.truncate(for=channel.id)
-            +discord(channel, true, "Announcement")
-        else
-          .s-empty-state.p8 No Discord channels available.
-      .fl-grow1.s-btn-group.fd-column.w30
-        each room in unlinkedRooms
-          input.s-btn--radio(type="radio" name="matrix" required id=room.room_id value=room.room_id)
-          label.s-btn.s-btn__muted.ta-left.truncate(for=room.room_id)
-            +matrix(room, true)
-        else
-          .s-empty-state.p8 No Matrix rooms available.
-      input(type="hidden" name="guild_id" value=guild_id)
-      div
-        button.s-btn.s-btn__icon.s-btn__filled#link-button
-          != icons.Icons.IconMerge
-          = ` Link`
-
-  h3.mt32.fs-category Unlink server
-  form.s-card.d-flex.gx16.ai-center(method="post" action=rel("/api/unlink-space"))
-    input(type="hidden" name="guild_id" value=guild.id)
-    .fl-grow1.s-prose.s-prose__sm.lh-lg
-      p.fc-medium.
-        Not using this bridge, or just made a mistake? You can unlink the whole server and all its channels.#[br]
-        This may take a minute to process. Please be patient and wait until the page refreshes.
-    div
-      button.s-btn.s-btn__icon.s-btn__danger.s-btn__outlined(cx-prevent-default hx-post=rel("/api/unlink-space") hx-confirm="Do you want to unlink this server and all its channels?\nIt may take a minute to clean up Matrix resources." hx-indicator="this" hx-disabled-elt="this")
-        != icons.Icons.IconUnsync
-        span.ml4= ` Unlink`
-
-  if space_id
-    details.mt48
-      summary Debug room list
-      .d-grid.grid__2.gx24
-        div
-          h3.mt24 Channels
-          p Channels are read from the channel_room table and then merged with the discord.channels memory cache to make the merged list. Anything in memory cache that's not in channel_room is considered unlinked.
-        div
-          h3.mt24 Rooms
-          p Rooms use the same merged list as channels, based on augmented channel_room data. Then, rooms are read from the space. Anything in the space that's not merged is considered unlinked.
-        div
-          h3.mt24 Unavailable channels: Deleted from Discord
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedUncachedChannels
-                li: a(href=`https://discord.com/channels/${guild_id}/${row.id}`)= row.nick || row.name
-          h3.mt24 Unavailable channels: Wrong type
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedWrongTypeChannels
-                li: a(href=`https://discord.com/channels/${guild_id}/${row.id}`) (#{row.type}) #{row.name}
-          h3.mt24 Unavailable channels: Discord bot can't access
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedPrivateChannels
-                li: a(href=`https://discord.com/channels/${guild_id}/${row.id}`)= row.name
-        div- // Rooms
-          h3.mt24 Unavailable rooms: Already linked
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedLinkedRooms
-                li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
-          h3.mt24 Unavailable rooms: Encryption not supported
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedEncryptedRooms
-                li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
-          h3.mt24 Unavailable rooms: Wrong type
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedWrongTypeRooms
-                li: a(href=`https://matrix.to/#/${row.room_id}`) (#{row.room_type}) #{row.name}
-          h3.mt24 Unavailable rooms: Archived thread
-          .s-card.p0
-            ul.my8.ml24
-              each row in removedArchivedThreadRooms
-                li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
+
+  h3.fs-category.mt32 Auto-create
+  .s-card.d-grid.px0
+    form.d-flex.ai-center.g16
+      #autocreate-loading.p8
+      - let value = !!select("guild_active", "autocreate", {guild_id}).pluck().get()
+      input(type="hidden" name="guild_id" value=guild_id)
+      input.s-toggle-switch#autocreate(name="autocreate" type="checkbox" hx-post=rel("/api/autocreate") hx-indicator="#autocreate-loading" hx-disabled-elt="this" checked=value autocomplete="off")
+      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 an unlinked Discord channel is spoken in.
+
+  if space_id
+    h3.mt32.fs-category Manually link channels
+    form.d-flex.g16.ai-start(hx-post=rel("/api/link") hx-trigger="submit" hx-disabled-elt="input, button" hx-indicator="#link-button")
+      .fl-grow2.s-btn-group.fd-column.w40
+        each channel in unlinkedChannels
+          input.s-btn--radio(type="radio" name="discord" required id=channel.id value=channel.id)
+          label.s-btn.s-btn__muted.ta-left.truncate(for=channel.id)
+            +discord(channel, true, "Announcement")
+        else
+          .s-empty-state.p8 No Discord channels available.
+      .fl-grow1.s-btn-group.fd-column.w30
+        each room in unlinkedRooms
+          input.s-btn--radio(type="radio" name="matrix" required id=room.room_id value=room.room_id)
+          label.s-btn.s-btn__muted.ta-left.truncate(for=room.room_id)
+            +matrix(room, true)
+        else
+          .s-empty-state.p8 No Matrix rooms available.
+      input(type="hidden" name="guild_id" value=guild_id)
+      div
+        button.s-btn.s-btn__icon.s-btn__filled#link-button
+          != icons.Icons.IconMerge
+          = ` Link`
+
+  h3.mt32.fs-category Unlink server
+  form.s-card.d-flex.gx16.ai-center(method="post" action=rel("/api/unlink-space"))
+    input(type="hidden" name="guild_id" value=guild.id)
+    .fl-grow1.s-prose.s-prose__sm.lh-lg
+      p.fc-medium.
+        Not using this bridge, or just made a mistake? You can unlink the whole server and all its channels.#[br]
+        This may take a minute to process. Please be patient and wait until the page refreshes.
+    div
+      button.s-btn.s-btn__icon.s-btn__danger.s-btn__outlined(cx-prevent-default hx-post=rel("/api/unlink-space") hx-confirm="Do you want to unlink this server and all its channels?\nIt may take a minute to clean up Matrix resources." hx-indicator="this" hx-disabled-elt="this")
+        != icons.Icons.IconUnsync
+        span.ml4= ` Unlink`
+
+  if space_id
+    details.mt48
+      summary Debug room list
+      .d-grid.grid__2.gx24
+        div
+          h3.mt24 Channels
+          p Channels are read from the channel_room table and then merged with the discord.channels memory cache to make the merged list. Anything in memory cache that's not in channel_room is considered unlinked.
+        div
+          h3.mt24 Rooms
+          p Rooms use the same merged list as channels, based on augmented channel_room data. Then, rooms are read from the space. Anything in the space that's not merged is considered unlinked.
+        div
+          h3.mt24 Unavailable channels: Deleted from Discord
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedUncachedChannels
+                li: a(href=`https://discord.com/channels/${guild_id}/${row.id}`)= row.nick || row.name
+          h3.mt24 Unavailable channels: Wrong type
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedWrongTypeChannels
+                li
+                 a(href=`https://discord.com/channels/${guild_id}/${row.id}`) (#{row.type}) #{row.name}
+                 span  |
+                 a(href=rel(`/explain?type=${row.type}`))  Why?
+          h3.mt24 Unavailable channels: Discord bot can't access
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedPrivateChannels
+                li: a(href=`https://discord.com/channels/${guild_id}/${row.id}`)= row.name
+        div- // Rooms
+          h3.mt24 Unavailable rooms: Already linked
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedLinkedRooms
+                li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
+          h3.mt24 Unavailable rooms: Encryption not supported
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedEncryptedRooms
+                li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
+          h3.mt24 Unavailable rooms: Root space
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedRootSpaceRooms
+                li: a(href=`https://matrix.to/#/${row.room_id}`) (#{row.room_type}) #{row.name}
+          h3.mt24 Unavailable rooms: Archived thread
+          p If you still want to link with any of these rooms (eg. you accidentally unlinked it and want to bring it back, or you're migrating from a different bridge that happens to use OOYE's prefixes), please remove the [⛓️] or [🔒⛓️] prefix in Matrix's room settings and refresh the page.
+          .s-card.p0
+            ul.my8.ml24
+              each row in removedArchivedThreadRooms
+                li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name

src/web/routes/guild.js

@@ -38,6 +38,9 @@ const schema = {
 	}),
 	inviteNonce: z.object({
 		nonce: z.string()
+	}),
+	explain: z.object({
+		type: z.string()
 	})
 }
 
@@ -53,6 +56,27 @@ function getAPI(event) {
 /** @type {LRUCache<string, string>} nonce to guild id */
 const validNonce = new LRUCache({max: 200})
 
+/**
+ * TYPING = Channels on which Discord messages can be sent. They should be bridgeable to anything other than an m.space (because if it did end up as a space, no one would be able to actually see the text messages sent there).
+ * SPACE = Channels on which Discord messages cannot be sent. They should be bridgeable to m.space only (because not only does m.space make sending messages impossible on any sane client (thus preventing Discord-caused errors), but it also just-so-happens that both currently-existing message-unsupporting channel types (Categories and School hubs) are sort of "indexes", which fits nicely to m.space).
+ * MIXED = Forum-like channels. They can be bridged to both m.space and anything other than an m.space - hence the name.
+ * @type {Map<DiscordTypes.ChannelType, {type: "TYPING"|"MIXED"|"SPACE", humanName:string, unsupported?: string}>}*/
+const linkRules = new Map([
+	[0, {type: "TYPING", humanName:"Normal text channels"}],
+	[1, {type: "TYPING", humanName:"Normal DMs", unsupported: "OOYE won't support DMs until a good way of doing it can be figured out. Please see https://gitdab.com/cadence/out-of-your-element#caveats for more."}],
+	[2, {type: "TYPING", humanName:"Normal VCs"}],
+	[3, {type: "TYPING", humanName:"Group DMs", unsupported: "OOYE won't support DMs until a good way of doing it can be figured out. Please see https://gitdab.com/cadence/out-of-your-element#caveats for more."}],
+	[4, {type: "SPACE", humanName:"Categories", unsupported: "There is no concept of categories on Matrix."}], //...at least officially. In practice, some clients will render sub-spaces as categories. TODO: Research Cadence's stance on bridging categories to sub-spaces.
+	[5, {type: "TYPING", humanName:"Announcement text channels"}],
+	[10, {type: "TYPING", humanName:"Announcement threads"}],
+	[11, {type: "TYPING", humanName:"Normal threads"}],
+	[12, {type: "TYPING", humanName:"Private threads"}],
+	[13, {type: "TYPING", humanName:"Stage VCs"}],
+	[14, {type: "SPACE", humanName:"School hubs", unsupported: "Bots cannot be members of school hubs. With that said, how in the sweet hell did you manage to put OOYE on one???"}],
+	[15, {type: "MIXED", humanName:"Normal forums"}],
+	[16, {type: "MIXED", humanName:"Media forums"}],
+])
+
 /**
  * @param {{type: number, parent_id?: string | null, position?: number}} channel
  * @param {Map<string, {type: number, parent_id?: string | null, position?: number}>} channels
@@ -94,8 +118,9 @@ function getPosition(channel, channels) {
  * @param {DiscordTypes.APIGuild} guild
  * @param {Ty.R.Hierarchy[]} rooms
  * @param {string[]} roles
+ * @param {string?} space
  */
-function getChannelRoomsLinks(guild, rooms, roles) {
+function getChannelRoomsLinks(guild, rooms, roles, space) {
 	let channelIDs = discord.guildChannelMap.get(guild.id)
 	assert(channelIDs)
 
@@ -112,7 +137,10 @@ function getChannelRoomsLinks(guild, rooms, roles) {
 	let unlinkedChannelIDs = channelIDs.filter(c => !linkedChannelIDs.includes(c))
 	/** @type {DiscordTypes.APIGuildChannel[]} */ // @ts-ignore
 	let unlinkedChannels = unlinkedChannelIDs.map(c => discord.channels.get(c))
-	let removedWrongTypeChannels = dUtils.filterTo(unlinkedChannels, c => c && [0, 5].includes(c.type))
+	let removedWrongTypeChannels = dUtils.filterTo(unlinkedChannels, c => {
+		const rule = linkRules.get(c?.type)
+		return rule && !rule.unsupported
+	})
 	let removedPrivateChannels = dUtils.filterTo(unlinkedChannels, c => {
 		const permissions = dUtils.getPermissions(guild.id, roles, guild.roles, botID, c["permission_overwrites"])
 		return dUtils.hasSomePermissions(permissions, ["Administrator", "ViewChannel"])
@@ -122,7 +150,7 @@ function getChannelRoomsLinks(guild, rooms, roles) {
 	let linkedRoomIDs = linkedChannels.map(c => c.room_id)
 	let unlinkedRooms = [...rooms]
 	let removedLinkedRooms = dUtils.filterTo(unlinkedRooms, r => !linkedRoomIDs.includes(r.room_id))
-	let removedWrongTypeRooms = dUtils.filterTo(unlinkedRooms, r => !r.room_type)
+	let removedRootSpaceRooms = dUtils.filterTo(unlinkedRooms, r => r.room_id !== space)
 	let removedEncryptedRooms = dUtils.filterTo(unlinkedRooms, r => !r.encryption && !r["im.nheko.summary.encryption"])
 	// https://discord.com/developers/docs/topics/threads#active-archived-threads
 	// need to filter out linked archived threads from unlinkedRooms, will just do that by comparing against the name
@@ -130,7 +158,7 @@ function getChannelRoomsLinks(guild, rooms, roles) {
 
 	return {
 		linkedChannelsWithDetails, unlinkedChannels, unlinkedRooms,
-		removedUncachedChannels, removedWrongTypeChannels, removedPrivateChannels, removedLinkedRooms, removedWrongTypeRooms, removedArchivedThreadRooms, removedEncryptedRooms
+		removedUncachedChannels, removedWrongTypeChannels, removedPrivateChannels, removedLinkedRooms, removedRootSpaceRooms, removedArchivedThreadRooms, removedEncryptedRooms
 	}
 }
 
@@ -171,17 +199,25 @@ as.router.get("/guild", defineEventHandler(async event => {
 
 	// Easy mode guild that hasn't been linked yet - need to remove elements that would require an existing space
 	if (!row.space_id) {
-		const links = getChannelRoomsLinks(guild, [], roles)
+		const links = getChannelRoomsLinks(guild, [], roles, row.space_id)
 		return pugSync.render(event, "guild.pug", {guild, guild_id, ...links, ...row})
 	}
 
 	// Linked guild
 	const api = getAPI(event)
 	const rooms = await api.getFullHierarchy(row.space_id)
-	const links = getChannelRoomsLinks(guild, rooms, roles)
+	const links = getChannelRoomsLinks(guild, rooms, roles, row.space_id)
 	return pugSync.render(event, "guild.pug", {guild, guild_id, ...links, ...row})
 }))
 
+as.router.get("/explain", defineEventHandler(async event => {
+	const {type} = await getValidatedQuery(event, schema.explain.parse)
+	const rule = linkRules.get(Number.parseInt(type))
+	if (!rule) return pugSync.render(event, "explain.pug", {msg: "You cannot bridge to type-" + type + " channels because OOYE doesn't even know what they are."})
+	else if (rule.unsupported) return pugSync.render(event, "explain.pug", {msg: "You cannot bridge to " + rule.humanName + " (type-" + type + " channels) because: " + rule.unsupported})
+	else return pugSync.render(event, "explain.pug", {msg: "You can bridge to " + rule.humanName + " (type-" + type + " channels) just fine. Why are you even here?"})
+}))
+
 as.router.get("/qr", defineEventHandler(async event => {
 	const {guild_id} = await getValidatedQuery(event, schema.qr.parse)
 	const managed = await webUtils.getManagedGuilds(event)
@@ -267,3 +303,4 @@ as.router.post("/api/invite", defineEventHandler(async event => {
 
 module.exports._getPosition = getPosition
 module.exports.getInviteTargetSpaces = getInviteTargetSpaces
+module.exports.linkRules = linkRules

src/web/routes/link.js

@@ -173,8 +173,9 @@ as.router.post("/api/link", defineEventHandler(async event => {
 	const row = from("channel_room").select("channel_id", "room_id").and("WHERE channel_id = ? OR room_id = ?").get(channel.id, parsedBody.matrix)
 	if (row) throw createError({status: 400, message: "Bad Request", data: `Channel ID ${row.channel_id} or room ID ${parsedBody.matrix} are already bridged and cannot be reused`})
 
-	// Check room is part of the guild's space
+	// Check whether the room is an actual room or a space, and if it's a part of the guild's space
 	let foundRoom = false
+	let foundSpace = false
 	/** @type {string[]?} */
 	let foundVia = null
 	for await (const room of api.generateFullHierarchy(spaceID)) {
@@ -186,13 +187,21 @@ as.router.post("/api/link", defineEventHandler(async event => {
 		}
 
 		// When finding a room during iteration, see if it was the requested room (to confirm that the room is in the space)
-		if (room.room_id === parsedBody.matrix && !room.room_type) {
+		if (room.room_id === parsedBody.matrix) {
 			foundRoom = true
+			// And also, now that we know that the room object is our intended room - we can test for its type.
+			if (room.room_type && room.room_type === "m.space") foundSpace = true
 		}
 
 		if (foundRoom && foundVia) break
 	}
 	if (!foundRoom) throw createError({status: 400, message: "Bad Request", data: "Matrix room needs to be part of the bridged space"})
+	
+	// Ensure link rules are upheld
+	const rule = guildRoute.linkRules.get(channel.type)
+	if (!rule || rule.unsupported) throw createError({status:400, message: "Bad Request", data: "You cannot bridge to " + (rule ? (rule.humanName+" (type-"+channel.type+" channels)") : ("unknown-type ("+channel.type+") channels")) + " because: " + (rule ? rule.unsupported : "OOYE doesn't even know what they are.")})
+	else if (foundSpace && rule.type === "TYPING") throw createError({status: 400, message: "Bad Request", data: "Matrix room cannot be of type m.space when bridging to "+rule.humanName})
+	else if (!foundSpace && rule.type === "SPACE") throw createError({status: 400, message: "Bad Request", data: "Matrix room must be of type m.space when bridging to "+rule.humanName})
 
 	// Check room exists and bridge is joined
 	try {

test/ooye-test-data.sql

@@ -97,12 +97,14 @@ WITH a (message_id, channel_id) AS (VALUES
 ('1401760355339862066', '112760669178241024'),
 ('1439351590262800565', '1438284564815548418'),
 ('1404133238414376971', '112760669178241024'),
+('1162005314908999790', '1100319550446252084'),
 ('1440549403667468320', '1160894080998461480'))
 SELECT message_id, max(historical_room_index) as historical_room_index FROM a INNER JOIN historical_channel_room ON historical_channel_room.reference_channel_id = a.channel_id GROUP BY message_id;
 
 INSERT INTO event_message (event_id, event_type, event_subtype, message_id, part, reaction_part, source) VALUES
 ('$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg', 'm.room.message', 'm.text', '1126786462646550579', 0, 0, 1),
 ('$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4', 'm.room.message', 'm.text', '1128118177155526666', 0, 0, 0),
+('$fdD9o7NxMA4VPexlAiIx2CB9JbsiGhJeyJgnZG7U5xg', 'm.room.message', 'm.text', '1162005314908999790', 0, 0, 1),
 ('$zXSlyI78DQqQwwfPUSzZ1b-nXzbUrCDljJgnGDdoI10', 'm.room.message', 'm.text', '1141619794500649020', 0, 0, 1),
 ('$fdD9OZ55xg3EAsfvLZza5tMhtjUO91Wg3Otuo96TplY', 'm.room.message', 'm.text', '1141206225632112650', 0, 0, 1),
 ('$mtR8cJqM4fKno1bVsm8F4wUVqSntt2sq6jav1lyavuA', 'm.room.message', 'm.text', '1141501302736695316', 0, 1, 1),