Move room linking logic out of template

scripts/setup.js

@@ -230,7 +230,6 @@ async function validateHomeserverOrigin(serverUrlPrompt, url) {
 	// Done with user prompts, reg is now guaranteed to be valid
 	const api = require("../src/matrix/api")
 	const file = require("../src/matrix/file")
-	const utils = require("../src/m2d/converters/utils")
 	const DiscordClient = require("../src/d2m/discord-client")
 	const discord = new DiscordClient(reg.ooye.discord_token, "no")
 	passthrough.discord = discord
@@ -267,21 +266,11 @@ async function validateHomeserverOrigin(serverUrlPrompt, url) {
 
 	const mxid = `@${reg.sender_localpart}:${reg.ooye.server_name}`
 
-	// ensure registration is correctly set...
-	assert(reg.sender_localpart.startsWith(reg.ooye.namespace_prefix), "appservice's localpart must be in the namespace it controls")
-	assert(utils.eventSenderIsFromDiscord(mxid), "appservice's mxid must be in the namespace it controls")
-	assert(reg.ooye.server_origin.match(/^https?:\/\//), "server origin must start with http or https")
-	assert.notEqual(reg.ooye.server_origin.slice(-1), "/", "server origin must not end in slash")
-	const botID = Buffer.from(reg.ooye.discord_token.split(".")[0], "base64").toString()
-	assert(botID.match(/^[0-9]{10,}$/), "discord token must follow the correct format")
-	assert.match(reg.url, /^https?:/, "url must start with http:// or https://")
-
-	console.log("✅ Configuration looks good...")
-
 	// database ddl...
 	await migrate.migrate(db)
 
 	// add initial rows to database, like adding the bot to sim...
+	const botID = Buffer.from(reg.ooye.discord_token.split(".")[0], "base64").toString()
 	db.prepare("INSERT OR IGNORE INTO sim (user_id, sim_name, localpart, mxid) VALUES (?, ?, ?, ?)").run(botID, reg.sender_localpart.slice(reg.ooye.namespace_prefix.length), reg.sender_localpart, mxid)
 
 	console.log("✅ Database is ready...")

src/m2d/converters/utils.js

@@ -30,9 +30,7 @@ const NEWLINE_ELEMENTS = BLOCK_ELEMENTS.concat(["BR"])
  */
 function eventSenderIsFromDiscord(sender) {
 	// If it's from a user in the bridge's namespace, then it originated from discord
-	// This includes messages sent by the appservice's bot user, because that is what's used for webhooks
-	// TODO: It would be nice if bridge system messages wouldn't trigger this check and could be bridged from matrix to discord, while webhook reflections would remain ignored...
-	// TODO that only applies to the above todo: But you'd have to watch out for the /icon command, where the bridge bot would set the room avatar, and that shouldn't be reflected into the room a second time.
+	// This could include messages sent by the appservice's bot user, because that is what's used for webhooks
 	if (userRegex.some(x => sender.match(x))) {
 		return true
 	}

src/web/pug/guild.pug

@@ -102,33 +102,7 @@ block body
     h2.mt48.fs-headline1 Matrix setup
 
     h3.mt32.fs-category Linked channels
-    -
-      function getPosition(channel) {
-        let position = 0
-        let looking = channel
-        while (looking.parent_id) {
-          looking = discord.channels.get(looking.parent_id)
-          position = looking.position * 1000
-        }
-        if (channel.position) position += channel.position
-        return position
-      }
-      let channelIDs = discord.guildChannelMap.get(guild_id)
 
-      let linkedChannels = select("channel_room", ["channel_id", "room_id", "name", "nick"], {channel_id: channelIDs}).all()
-      let linkedChannelsWithDetails = linkedChannels.map(c => ({channel: discord.channels.get(c.channel_id), ...c})).filter(c => c.channel)
-      let linkedChannelIDs = linkedChannelsWithDetails.map(c => c.channel_id)
-      linkedChannelsWithDetails.sort((a, b) => getPosition(a.channel) - getPosition(b.channel))
-
-      let unlinkedChannelIDs = channelIDs.filter(c => !linkedChannelIDs.includes(c))
-      let unlinkedChannels = unlinkedChannelIDs.map(c => discord.channels.get(c)).filter(c => [0, 5].includes(c.type))
-      unlinkedChannels.sort((a, b) => getPosition(a) - getPosition(b))
-
-      let linkedRoomIDs = linkedChannels.map(c => c.room_id)
-      let unlinkedRooms = rooms.filter(r => !linkedRoomIDs.includes(r.room_id) && !r.room_type)
-      // 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
-      unlinkedRooms = unlinkedRooms.filter(r => !r.name.match(/^\[(🔒)?⛓️\]/))
     .s-card.bs-sm.p0
       .s-table-container
         table.s-table.s-table__bx-simple

src/web/routes/invite.js

@@ -34,6 +34,39 @@ const schema = {
 /** @type {LRUCache<string, string>} nonce to guild id */
 const validNonce = new LRUCache({max: 200})
 
+function getChannelRoomsLinks(guildID, rooms) {
+	function getPosition(channel) {
+		let position = 0
+		let looking = channel
+		while (looking.parent_id) {
+			looking = discord.channels.get(looking.parent_id)
+			position = looking.position * 1000
+		}
+		if (channel.position) position += channel.position
+		return position
+	}
+
+	let channelIDs = discord.guildChannelMap.get(guildID)
+	assert(channelIDs)
+
+	let linkedChannels = select("channel_room", ["channel_id", "room_id", "name", "nick"], {channel_id: channelIDs}).all()
+	let linkedChannelsWithDetails = linkedChannels.map(c => ({channel: discord.channels.get(c.channel_id), ...c})).filter(c => c.channel)
+	let linkedChannelIDs = linkedChannelsWithDetails.map(c => c.channel_id)
+	linkedChannelsWithDetails.sort((a, b) => getPosition(a.channel) - getPosition(b.channel))
+
+	let unlinkedChannelIDs = channelIDs.filter(c => !linkedChannelIDs.includes(c))
+	let unlinkedChannels = unlinkedChannelIDs.map(c => discord.channels.get(c)).filter(c => [0, 5].includes(c.type))
+	unlinkedChannels.sort((a, b) => getPosition(a) - getPosition(b))
+
+	let linkedRoomIDs = linkedChannels.map(c => c.room_id)
+	let unlinkedRooms = rooms.filter(r => !linkedRoomIDs.includes(r.room_id) && !r.room_type)
+	// 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
+	unlinkedRooms = unlinkedRooms.filter(r => !r.name.match(/^\[(🔒)?⛓️\]/))
+
+	return {linkedChannelsWithDetails, unlinkedChannels, unlinkedRooms}
+}
+
 as.router.get("/guild", defineEventHandler(async event => {
 	const {guild_id} = await getValidatedQuery(event, schema.guild.parse)
 	const session = await useSession(event, {password: reg.as_token})
@@ -47,7 +80,8 @@ as.router.get("/guild", defineEventHandler(async event => {
 	const mods = await api.getStateEvent(row.space_id, "m.room.power_levels", "")
 	const banned = await api.getMembers(row.space_id, "ban")
 	const rooms = await api.getFullHierarchy(row.space_id)
-	return pugSync.render(event, "guild.pug", {guild_id, nonce, mods, banned, rooms, ...row})
+	const links = getChannelRoomsLinks(guild_id, rooms)
+	return pugSync.render(event, "guild.pug", {guild_id, nonce, mods, banned, rooms, ...links, ...row})
 }))
 
 as.router.get("/invite", defineEventHandler(async event => {