src/d2m/event-dispatcher.js

@@ -103,19 +103,13 @@ module.exports = {
 	async checkMissedMessages(client, guild) {
 		if (guild.unavailable) return
 		const bridgedChannels = select("channel_room", "channel_id").pluck().all()
-		const preparedExists = db.prepare("SELECT channel_id FROM message_channel WHERE channel_id = ? LIMIT 1")
-		const preparedGet = select("event_message", "event_id", {}, "WHERE message_id = ?").pluck()
+		const prepared = select("event_message", "event_id", {}, "WHERE message_id = ?").pluck()
 		for (const channel of guild.channels.concat(guild.threads)) {
 			if (!bridgedChannels.includes(channel.id)) continue
 			if (!("last_message_id" in channel) || !channel.last_message_id) continue
-
-			// Skip if channel is already up-to-date
-			const latestWasBridged = preparedGet.get(channel.last_message_id)
+			const latestWasBridged = prepared.get(channel.last_message_id)
 			if (latestWasBridged) continue
 
-			// Skip if channel was just added to the bridge (there's no place to resume from if it's brand new)
-			if (!preparedExists.get(channel.id)) continue
-
 			// Permissions check
 			const member = guild.members.find(m => m.user?.id === client.user.id)
 			if (!member) return
@@ -137,7 +131,7 @@ module.exports = {
 				}
 			}
 			let latestBridgedMessageIndex = messages.findIndex(m => {
-				return preparedGet.get(m.id)
+				return prepared.get(m.id)
 			})
 			// console.log(`[check missed messages] got ${messages.length} messages; last message that IS bridged is at position ${latestBridgedMessageIndex} in the channel`)
 			if (latestBridgedMessageIndex === -1) latestBridgedMessageIndex = 1 // rather than crawling the ENTIRE channel history, let's just bridge the most recent 1 message to make it up to date.

src/discord/interactions/reactions.js

@@ -2,8 +2,6 @@
 
 const DiscordTypes = require("discord-api-types/v10")
 const {discord, sync, select, from} = require("../../passthrough")
-const {id: botID} = require("../../../addbot")
-const {InteractionMethods} = require("snowtransfer")
 
 /** @type {import("../../matrix/api")} */
 const api = sync.require("../../matrix/api")
@@ -13,27 +11,20 @@ const utils = sync.require("../../m2d/converters/utils")
 /**
  * @param {DiscordTypes.APIMessageApplicationCommandGuildInteraction} interaction
  * @param {{api: typeof api}} di
- * @returns {AsyncGenerator<{[k in keyof InteractionMethods]?: Parameters<InteractionMethods[k]>[2]}>}
+ * @returns {Promise<DiscordTypes.APIInteractionResponse>}
  */
-async function* _interact({data}, {api}) {
+async function _interact({data}, {api}) {
 	const row = from("event_message").join("message_channel", "message_id").join("channel_room", "channel_id")
 		.select("event_id", "room_id").where({message_id: data.target_id}).get()
 	if (!row) {
-		return yield {createInteractionResponse: {
+		return {
 			type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
 			data: {
 				content: "This message hasn't been bridged to Matrix.",
 				flags: DiscordTypes.MessageFlags.Ephemeral
 			}
-		}}
 		}
-
-	yield {createInteractionResponse: {
-		type: DiscordTypes.InteractionResponseType.DeferredChannelMessageWithSource,
-		data: {
-			flags: DiscordTypes.MessageFlags.Ephemeral
 	}
-	}}
 
 	const reactions = await api.getFullRelations(row.room_id, row.event_id, "m.annotation")
 
@@ -49,27 +40,29 @@ async function* _interact({data}, {api}) {
 	}
 
 	if (inverted.size === 0) {
-		return yield {editOriginalInteractionResponse: {
+		return {
+			type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
+			data: {
 				content: "Nobody from Matrix reacted to this message.",
-		}}
+				flags: DiscordTypes.MessageFlags.Ephemeral
+			}
+		}
 	}
 
-	return yield {editOriginalInteractionResponse: {
+	return {
+		type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
+		data: {
 			content: [...inverted.entries()].map(([key, value]) => `${key} ⮞ ${value.join(" ⬩ ")}`).join("\n"),
-	}}
+			flags: DiscordTypes.MessageFlags.Ephemeral
+		}
+	}
 }
 
 /* c8 ignore start */
 
 /** @param {DiscordTypes.APIMessageApplicationCommandGuildInteraction} interaction */
 async function interact(interaction) {
-	for await (const response of _interact(interaction, {api})) {
-		if (response.createInteractionResponse) {
-			await discord.snow.interaction.createInteractionResponse(interaction.id, interaction.token, response.createInteractionResponse)
-		} else if (response.editOriginalInteractionResponse) {
-			await discord.snow.interaction.editOriginalInteractionResponse(botID, interaction.token, response.editOriginalInteractionResponse)
-		}
-	}
+	await discord.snow.interaction.createInteractionResponse(interaction.id, interaction.token, await _interact(interaction, {api}))
 }
 
 module.exports.interact = interact

src/discord/interactions/reactions.test.js

@@ -1,31 +1,17 @@
 const {test} = require("supertape")
 const {_interact} = require("./reactions")
 
-/**
- * @template T
- * @param {AsyncIterable<T>} ai
- * @returns {Promise<T[]>}
- */
-async function fromAsync(ai) {
-	const result = []
-	for await (const value of ai) {
-		result.push(value)
-	}
-	return result
-}
-
 test("reactions: checks if message is bridged", async t => {
-	const msgs = await fromAsync(_interact({
+	const msg = await _interact({
 		data: {
 			target_id: "0"
 		}
-	}, {}))
-	t.equal(msgs.length, 1)
-	t.equal(msgs[0].createInteractionResponse.data.content, "This message hasn't been bridged to Matrix.")
+	}, {})
+	t.equal(msg.data.content, "This message hasn't been bridged to Matrix.")
 })
 
 test("reactions: different response if nobody reacted", async t => {
-	const msgs = await fromAsync(_interact({
+	const msg = await _interact({
 		data: {
 			target_id: "1126786462646550579"
 		}
@@ -37,14 +23,13 @@ test("reactions: different response if nobody reacted", async t => {
 				return []
 			}
 		}
-	}))
-	t.equal(msgs.length, 2)
-	t.equal(msgs[1].editOriginalInteractionResponse.content, "Nobody from Matrix reacted to this message.")
+	})
+	t.equal(msg.data.content, "Nobody from Matrix reacted to this message.")
 })
 
 test("reactions: shows reactions if there are some, ignoring discord users", async t => {
 	let called = 1
-	const msgs = await fromAsync(_interact({
+	const msg = await _interact({
 		data: {
 			target_id: "1126786462646550579"
 		}
@@ -88,10 +73,9 @@ test("reactions: shows reactions if there are some, ignoring discord users", asy
 				}]
 			}
 		}
-	}))
-	t.equal(msgs.length, 2)
+	})
 	t.equal(
-		msgs[1].editOriginalInteractionResponse.content,
+		msg.data.content,
 		"🐈 ⮞ cadence [they] ⬩ @rnl:cadence.moe"
 		+ "\n🐈‍⬛ ⮞ cadence [they]"
 	)