Happy O Funny`
+ `
Shoebill stork clattering sounds like machine guun~!! (Japan Matsue...`
+ `
twitter
https://twitter.com/matsuevogelpark
The shoebill (Balaeniceps rex) also known as whalehead, whale-headed stork, or shoe-billed stork, is a very large stork-like bird. It derives its name from its enormous shoe-shaped bill
some people also called them the living dinosaur~~
#shoebill #livingdinosaur #happyofunny #weirdcreature #weirdsoun...`
+ `
๐๏ธ https://www.youtube.com/embed/kDMHHw8JqLE`
diff --git a/src/d2m/converters/message-to-event.test.js b/src/d2m/converters/message-to-event.test.js
index be1d99f0..aea24a83 100644
--- a/src/d2m/converters/message-to-event.test.js
+++ b/src/d2m/converters/message-to-event.test.js
@@ -1103,6 +1103,45 @@ test("message2event: very large attachment is linked instead of being uploaded",
}])
})
+test("message2event: very large png is converted to jpeg for upload", async t => {
+ const events = await messageToEvent({
+ content: "",
+ attachments: [{
+ filename: "855064e9-bdae-487a-a497-c662bd510487.png",
+ url: "https://cdn.discordapp.com/attachments/1160894080998461480/1548656385292509274/855064e9-bdae-487a-a497-c662bd510487.png",
+ proxy_url: "https://media.discordapp.net/attachments/1160894080998461480/1548656385292509274/855064e9-bdae-487a-a497-c662bd510487.png",
+ content_type: "image/png",
+ width: 5472,
+ height: 3648,
+ size: 14967919
+ }]
+ }, data.guild.general, {}, {
+ async fetch(url, init) {
+ t.equal(url, "https://media.discordapp.net/attachments/1160894080998461480/1548656385292509274/855064e9-bdae-487a-a497-c662bd510487.png?format=jpeg")
+ t.equal(init.method, "HEAD")
+ return new Response("wa", {headers: {
+ "Content-Type": "image/jpeg",
+ "Content-Length": 483085
+ }})
+ }
+ })
+ t.deepEqual(events, [{
+ $type: "m.room.message",
+ "m.mentions": {},
+ msgtype: "m.image",
+ body: "855064e9-bdae-487a-a497-c662bd510487.jpg",
+ info: {
+ w: 5472,
+ h: 3648,
+ mimetype: "image/jpeg",
+ size: 483085
+ },
+ external_url: "https://bridge.example.org/download/discordcdn/1160894080998461480/1548656385292509274/855064e9-bdae-487a-a497-c662bd510487.png",
+ filename: "855064e9-bdae-487a-a497-c662bd510487.jpg",
+ url: "mxc://cadence.moe/zXNXRvJwRDMIzZZVqHUXtGeD"
+ }])
+})
+
test("message2event: multiple attachments are combined into the same event where possible", async t => {
const events = await messageToEvent({
content: "hey",
@@ -1612,7 +1651,7 @@ test("message2event: expired/invalid invites are sent as-is", async t => {
snow: {
invite: {
async getInvite() {
- throw new Error(`{"message": "Unknown Invite", "code": 10006}`)
+ throw new Error(`Unknown Invite`)
}
}
}
diff --git a/src/d2m/discord-client.js b/src/d2m/discord-client.js
index c2a05493..408c21c8 100644
--- a/src/d2m/discord-client.js
+++ b/src/d2m/discord-client.js
@@ -14,6 +14,8 @@ const {sync} = passthrough
/** @type {import("./discord-packets")} */
const discordPackets = sync.require("./discord-packets")
+const CONNECTION_DEBUG = false
+
class DiscordClient {
/**
* @param {string} discordToken
@@ -24,7 +26,7 @@ class DiscordClient {
const intents = [
"DIRECT_MESSAGES", "DIRECT_MESSAGE_REACTIONS", "DIRECT_MESSAGE_TYPING",
"GUILDS", "GUILD_EMOJIS_AND_STICKERS", "GUILD_MESSAGES", "GUILD_MESSAGE_REACTIONS", "GUILD_MESSAGE_TYPING", "GUILD_WEBHOOKS", "GUILD_MESSAGE_POLLS",
- "MESSAGE_CONTENT"
+ "MESSAGE_CONTENT", "GUILD_MEMBERS"
]
if (reg.ooye.receive_presences !== false) intents.push("GUILD_PRESENCES")
this.discordToken = discordToken
@@ -53,21 +55,21 @@ class DiscordClient {
this.guildChannelMap = new Map()
if (listen !== "no") {
this.cloud.on("event", message => {
- process.nextTick(() => {
- discordPackets.onPacket(this, message, listen)
- })
+ discordPackets.onPacket(this, message, listen)
})
}
- const addEventLogger = (eventName, logName) => {
- this.cloud.on(eventName, (...args) => {
- const d = new Date().toISOString().slice(0, 19)
- console.error(`[${d} Client ${logName}]`, ...args)
- })
+ if (CONNECTION_DEBUG) {
+ const addEventLogger = (eventName, logName) => {
+ this.cloud.on(eventName, (...args) => {
+ const d = new Date().toISOString().slice(0, 19)
+ console.error(`[${d} Client ${logName}]`, ...args)
+ })
+ }
+ addEventLogger("error", "Error")
+ addEventLogger("disconnected", "Disconnected")
+ addEventLogger("ready", "Ready")
}
- addEventLogger("error", "Error")
- addEventLogger("disconnected", "Disconnected")
- addEventLogger("ready", "Ready")
}
}
diff --git a/src/d2m/discord-packets.js b/src/d2m/discord-packets.js
index afea9ea2..992689ff 100644
--- a/src/d2m/discord-packets.js
+++ b/src/d2m/discord-packets.js
@@ -1,173 +1,256 @@
// @ts-check
-// Discord library internals type beat
-
-const DiscordTypes = require("discord-api-types/v10")
+const assert = require("assert").strict
+const {scheduler} = require("timers/promises")
const passthrough = require("../passthrough")
-const {sync, db} = passthrough
+const {sync} = passthrough
+
+/** @type {import("../matrix/homeserver-status")} */
+const homeserverStatus = sync.require("../matrix/homeserver-status")
+
+const guildReadyStatus = new class {
+ /** @type {Set | null} */
+ unavailableGuilds = null
+ _allReady = Promise.withResolvers()
-const utils = {
/**
- * @param {import("./discord-client")} client
- * @param {import("cloudstorm").IGatewayMessage} message
- * @param {string} listen "full", "half", "no" - whether to set up the event listeners for OOYE to operate
+ * @param {string} guildID
+ * @returns {boolean} true if it was the last one
*/
- async onPacket(client, message, listen) {
- // requiring this later so that the client is already constructed by the time event-dispatcher is loaded
- /** @type {typeof import("./event-dispatcher")} */
- const eventDispatcher = sync.require("./event-dispatcher")
- /** @type {import("../discord/register-interactions")} */
- const interactions = sync.require("../discord/register-interactions")
+ makeReady(guildID) {
+ assert(this.unavailableGuilds)
+ if (this.unavailableGuilds.delete(guildID) && this.unavailableGuilds.size === 0) {
+ this._allReady.resolve(null)
+ return true
+ }
+ return false
+ }
- // Client internals, keep track of the state we need
- if (message.t === "READY") {
- if (client.ready) return
- client.ready = true
- client.user = message.d.user
- client.application = message.d.application
- console.log(`Discord logged in as ${client.user.username}#${client.user.discriminator} (${client.user.id})`)
- interactions.registerInteractions()
+ allReady() {
+ return this.unavailableGuilds && this.unavailableGuilds.size === 0
+ }
- } else if (message.t === "GUILD_CREATE") {
- message.d.members = message.d.members.filter(m => m.user.id === client.user.id) // only keep the bot's own member - it's needed to determine private channels on web
- client.guilds.set(message.d.id, message.d)
- const arr = []
- client.guildChannelMap.set(message.d.id, arr)
- for (const channel of message.d.channels || []) {
- // @ts-ignore
- channel.guild_id = message.d.id
- arr.push(channel.id)
- client.channels.set(channel.id, channel)
- }
- for (const thread of message.d.threads || []) {
- // @ts-ignore
- thread.guild_id = message.d.id
- arr.push(thread.id)
- client.channels.set(thread.id, thread)
- }
+ waitForAllReady() {
+ return this._allReady.promise
+ }
+}
- if (listen === "full") {
- try {
- await eventDispatcher.checkMissedExpressions(message.d)
- await eventDispatcher.checkMissedMessages(client, message.d)
- await eventDispatcher.checkMissedPins(client, message.d)
- await eventDispatcher.checkMissedLeaves(client, message.d)
- } catch (e) {
- console.error("Failed to sync missed events. To retry, please fix this error and restart OOYE:")
- console.error(e)
- }
- }
+/**
+ * @param {import("./discord-client")} client
+ * @param {import("cloudstorm").IGatewayMessage} message
+ * @param {string} listen "full", "half", "no" - whether to set up the event listeners for OOYE to operate
+ */
+async function onPacket(client, message, listen) {
+ // requiring this later so that the client is already constructed by the time event-dispatcher is loaded
+ /** @type {typeof import("./event-dispatcher")} */
+ const eventDispatcher = sync.require("./event-dispatcher")
+ /** @type {import("../discord/register-interactions")} */
+ const interactions = sync.require("../discord/register-interactions")
- } else if (message.t === "GUILD_UPDATE") {
- const guild = client.guilds.get(message.d.id)
- if (guild) {
- for (const prop of Object.keys(message.d)) {
- if (!["channels", "threads"].includes(prop)) {
- guild[prop] = message.d[prop]
- }
- }
- }
+ // Client internals, keep track of the state we need
+ if (message.t === "READY") {
+ if (client.ready) return
+ client.ready = true
+ client.user = message.d.user
+ client.application = message.d.application
+ guildReadyStatus.unavailableGuilds = new Set(message.d.guilds.filter(g => g.unavailable).map(g => g.id))
+ console.log(`Discord logged in as ${client.user.username}#${client.user.discriminator} (${client.user.id})`)
+ process.stdout.write("Waiting for guilds to warm up... ")
+ interactions.registerInteractions()
- } else if (message.t === "GUILD_EMOJIS_UPDATE") {
- const guild = client.guilds.get(message.d.guild_id)
- if (guild) {
- guild.emojis = message.d.emojis
- }
+ } else if (message.t === "GUILD_CREATE") {
+ message.d.members = message.d.members.filter(m => m.user.id === client.user.id) // only keep the bot account's member - it's needed for roles to determine private channels on web
+ client.guilds.set(message.d.id, message.d)
- } else if (message.t === "GUILD_STICKERS_UPDATE") {
- const guild = client.guilds.get(message.d.guild_id)
- if (guild) {
- guild.stickers = message.d.stickers
- }
+ /*
+ Info about guilds is populated one guild at a time.
+ For m->d bridging to work, the guild needs to be populated, so we need to have GUILD_CREATE for the guild.
+ If we ping the homeserver, it will send us any pending events, so we need to wait for all GUILD_CREATES before we ping.
+ We must attempt a ping because we don't want to try sending missed d->m messages to an offline homeserver.
+ The "all guilds ready" delay can be removed if ONE of the following is done:
+ 1. m->d can queue incoming events until their guild exists in memory
+ 2. d->m missed messages can have their errors handled and added to queue, rather than pinging first
+ */
+ const firstReady = guildReadyStatus.allReady()
+ const lastGuildReady = guildReadyStatus.makeReady(message.d.id)
- } else if (message.t === "GUILD_ROLE_CREATE" || message.t === "GUILD_ROLE_UPDATE" || message.t === "GUILD_ROLE_DELETE") {
- const guild = client.guilds.get(message.d.guild_id)
- /** Delete this in case of UPDATE or DELETE */
- const targetID = "role_id" in message.d ? message.d.role_id : message.d.role.id
- /** Add this in case of CREATE or UPDATE */
- const newRoles = []
- if ("role" in message.d) newRoles.push(message.d.role)
- if (guild) {
- const targetIndex = guild.roles.findIndex(r => r.id === targetID)
- if (targetIndex !== -1) {
- // Role already exists. Delete it and maybe replace it.
- guild.roles.splice(targetIndex, 1, ...newRoles)
+ const arr = []
+ client.guildChannelMap.set(message.d.id, arr)
+ for (const channel of message.d.channels || []) {
+ // @ts-ignore
+ channel.guild_id = message.d.id
+ arr.push(channel.id)
+ client.channels.set(channel.id, channel)
+ }
+ for (const thread of message.d.threads || []) {
+ // @ts-ignore
+ thread.guild_id = message.d.id
+ arr.push(thread.id)
+ client.channels.set(thread.id, thread)
+ }
+
+ if (listen === "full") {
+ try {
+ // Wait for guilds to be connected and homeserver to be online. If this is the last guild, a different code path is used to trigger the homeserver check.
+ if (lastGuildReady) {
+ process.stdout.write(`ok, ${client.guilds.size} available.\nConnecting to homeserver... `)
+ // await guildReadyStatus.waitForAllReady() - no need, we already checked this is the last guild
+ await homeserverStatus.homeserverStatus.waitForOnline(true)
+ console.log("ok.\nReplaying past events. Welcome to Out Of Your Element.")
} else {
- // Role doesn't already exist.
- guild.roles.push(...newRoles)
+ await guildReadyStatus.waitForAllReady()
+ await homeserverStatus.homeserverStatus.waitForOnline(false)
}
+
+ await eventDispatcher.checkMissedExpressions(message.d)
+ await eventDispatcher.checkMissedMessages(client, message.d)
+ await eventDispatcher.checkMissedPins(client, message.d)
+ await eventDispatcher.checkMissedLeaves(client, message.d)
+ } catch (e) {
+ if (firstReady) {
+ console.error("Failed to sync missed events. To retry, please fix this error and restart OOYE:")
+ }
+ console.error(e)
}
+ }
- } else if (message.t === "GUILD_MEMBER_UPDATE") {
- const guild = client.guilds.get(message.d.guild_id)
- const member = guild?.members.find(m => m.user.id === message.d.user.id)
- if (member) { // only update existing members (i.e. the bot's own member) - don't want to inflate the cache with new irrelevant ones
- Object.assign(member, message.d)
- }
-
- } else if (message.t === "THREAD_CREATE") {
- client.channels.set(message.d.id, message.d)
- if (message.d["guild_id"]) {
- const channels = client.guildChannelMap.get(message.d["guild_id"])
- if (channels && !channels.includes(message.d.id)) channels.push(message.d.id)
- }
-
- } else if (message.t === "CHANNEL_UPDATE" || message.t === "THREAD_UPDATE") {
- client.channels.set(message.d.id, message.d)
-
-
- } else if (message.t === "CHANNEL_PINS_UPDATE") {
- const channel = client.channels.get(message.d.channel_id)
- if (channel) {
- channel["last_pin_timestamp"] = message.d.last_pin_timestamp
- }
-
-
- } else if (message.t === "GUILD_DELETE") {
- client.guilds.delete(message.d.id)
- const channels = client.guildChannelMap.get(message.d.id)
- if (channels) {
- for (const id of channels) client.channels.delete(id)
- }
- client.guildChannelMap.delete(message.d.id)
-
-
- } else if (message.t === "CHANNEL_CREATE") {
- client.channels.set(message.d.id, message.d)
- if (message.d["guild_id"]) { // obj[prop] notation can be used to access a property without typescript complaining that it doesn't exist on all values something can have
- const channels = client.guildChannelMap.get(message.d["guild_id"])
- if (channels && !channels.includes(message.d.id)) channels.push(message.d.id)
- }
-
- } else if (message.t === "CHANNEL_DELETE") {
- client.channels.delete(message.d.id)
- if (message.d["guild_id"]) {
- const channels = client.guildChannelMap.get(message.d["guild_id"])
- if (channels) {
- const previous = channels.indexOf(message.d.id)
- if (previous !== -1) channels.splice(previous, 1)
+ } else if (message.t === "GUILD_UPDATE") {
+ const guild = client.guilds.get(message.d.id)
+ if (guild) {
+ for (const prop of Object.keys(message.d)) {
+ if (!["channels", "threads"].includes(prop)) {
+ guild[prop] = message.d[prop]
}
}
}
- // Event dispatcher for OOYE bridge operations
- if (listen === "full" && message.t) {
- try {
- if (message.t === "MESSAGE_REACTION_REMOVE" || message.t === "MESSAGE_REACTION_REMOVE_EMOJI" || message.t === "MESSAGE_REACTION_REMOVE_ALL") {
- await eventDispatcher.onSomeReactionsRemoved(client, message.d)
+ } else if (message.t === "GUILD_EMOJIS_UPDATE") {
+ const guild = client.guilds.get(message.d.guild_id)
+ if (guild) {
+ guild.emojis = message.d.emojis
+ }
- } else if (message.t === "INTERACTION_CREATE") {
- await interactions.dispatchInteraction(message.d)
+ } else if (message.t === "GUILD_STICKERS_UPDATE") {
+ const guild = client.guilds.get(message.d.guild_id)
+ if (guild) {
+ guild.stickers = message.d.stickers
+ }
- } else if (message.t in eventDispatcher) {
- await eventDispatcher[message.t](client, message.d)
- }
- } catch (e) {
- // Let OOYE try to handle errors too
- await eventDispatcher.onError(client, e, message)
+ } else if (message.t === "GUILD_ROLE_CREATE" || message.t === "GUILD_ROLE_UPDATE" || message.t === "GUILD_ROLE_DELETE") {
+ const guild = client.guilds.get(message.d.guild_id)
+ /** Delete this in case of UPDATE or DELETE */
+ const targetID = "role_id" in message.d ? message.d.role_id : message.d.role.id
+ /** Add this in case of CREATE or UPDATE */
+ const newRoles = []
+ if ("role" in message.d) newRoles.push(message.d.role)
+ if (guild) {
+ const targetIndex = guild.roles.findIndex(r => r.id === targetID)
+ if (targetIndex !== -1) {
+ // Role already exists. Delete it and maybe replace it.
+ guild.roles.splice(targetIndex, 1, ...newRoles)
+ } else {
+ // Role doesn't already exist.
+ guild.roles.push(...newRoles)
}
}
+
+ } else if (message.t === "GUILD_MEMBER_UPDATE") {
+ const guild = client.guilds.get(message.d.guild_id)
+ const member = guild?.members.find(m => m.user.id === message.d.user.id)
+ if (member) { // only update existing members (i.e. the bot's own member) - don't want to inflate the cache with new irrelevant ones
+ Object.assign(member, message.d)
+ }
+
+ } else if (message.t === "THREAD_CREATE") {
+ client.channels.set(message.d.id, message.d)
+ if (message.d["guild_id"]) {
+ const channels = client.guildChannelMap.get(message.d["guild_id"])
+ if (channels && !channels.includes(message.d.id)) channels.push(message.d.id)
+ }
+
+ } else if (message.t === "CHANNEL_UPDATE" || message.t === "THREAD_UPDATE") {
+ client.channels.set(message.d.id, message.d)
+
+
+ } else if (message.t === "CHANNEL_PINS_UPDATE") {
+ const channel = client.channels.get(message.d.channel_id)
+ if (channel) {
+ channel["last_pin_timestamp"] = message.d.last_pin_timestamp
+ }
+
+
+ } else if (message.t === "GUILD_DELETE") {
+ client.guilds.delete(message.d.id)
+ const channels = client.guildChannelMap.get(message.d.id)
+ if (channels) {
+ for (const id of channels) client.channels.delete(id)
+ }
+ client.guildChannelMap.delete(message.d.id)
+
+
+ } else if (message.t === "CHANNEL_CREATE") {
+ client.channels.set(message.d.id, message.d)
+ if (message.d["guild_id"]) { // obj[prop] notation can be used to access a property without typescript complaining that it doesn't exist on all values something can have
+ const channels = client.guildChannelMap.get(message.d["guild_id"])
+ if (channels && !channels.includes(message.d.id)) channels.push(message.d.id)
+ }
+
+ } else if (message.t === "CHANNEL_DELETE") {
+ client.channels.delete(message.d.id)
+ if (message.d["guild_id"]) {
+ const channels = client.guildChannelMap.get(message.d["guild_id"])
+ if (channels) {
+ const previous = channels.indexOf(message.d.id)
+ if (previous !== -1) channels.splice(previous, 1)
+ }
+ }
+ }
+
+ // Event dispatcher for OOYE bridge operations
+ if (listen === "full" && message.t) {
+ const alwaysRealTimeEvents = ["PRESENCE_UPDATE"]
+ const optionalEvents = ["TYPING_START"]
+ if (alwaysRealTimeEvents.includes(message.t) || homeserverStatus.homeserverStatus.isRealTime()) {
+ // real time
+ dispatchPacketToBridge(client, message)
+ } else if (optionalEvents.includes(message.t)) {
+ // when not real time, skip optional events
+ } else {
+ // queue required events
+ homeserverStatus.homeserverStatus.queuePacket(message)
+ }
}
}
-module.exports = utils
+/**
+ * @param {import("./discord-client")} client
+ * @param {import("cloudstorm").IGatewayMessage} message
+ */
+async function dispatchPacketToBridge(client, message) {
+ // requiring this later so that the client is already constructed by the time event-dispatcher is loaded
+ /** @type {typeof import("./event-dispatcher")} */
+ const eventDispatcher = sync.require("./event-dispatcher")
+ /** @type {import("../discord/register-interactions")} */
+ const interactions = sync.require("../discord/register-interactions")
+
+ assert(message.t) // checked above
+
+ try {
+ if (message.t === "MESSAGE_REACTION_REMOVE" || message.t === "MESSAGE_REACTION_REMOVE_EMOJI" || message.t === "MESSAGE_REACTION_REMOVE_ALL") {
+ await eventDispatcher.onSomeReactionsRemoved(client, message.d)
+
+ } else if (message.t === "INTERACTION_CREATE") {
+ await interactions.dispatchInteraction(message.d)
+
+ } else if (message.t in eventDispatcher) {
+ await eventDispatcher[message.t](client, message.d)
+ }
+ } catch (e) {
+ // Let OOYE try to handle errors too
+ await eventDispatcher.onError(client, e, message)
+ }
+}
+
+module.exports.onPacket = onPacket
+module.exports.dispatchPacketToBridge = dispatchPacketToBridge
+module.exports.guildReadyStatus = guildReadyStatus
diff --git a/src/d2m/event-dispatcher.js b/src/d2m/event-dispatcher.js
index 8101a03a..02cb20fa 100644
--- a/src/d2m/event-dispatcher.js
+++ b/src/d2m/event-dispatcher.js
@@ -60,7 +60,7 @@ module.exports = {
matrixEventDispatcher.printError(gatewayMessage.t, "Discord", e, gatewayMessage)
- const channelID = gatewayMessage.d["channel_id"]
+ const channelID = gatewayMessage.d?.["channel_id"]
if (!channelID) return
const roomID = select("channel_room", "room_id", {channel_id: channelID}).pluck().get()
if (!roomID) return
@@ -107,7 +107,7 @@ module.exports = {
try {
messages = await client.snow.channel.getChannelMessages(channel.id, {limit: 100})
} catch (e) {
- if (e.message === `{"message": "Missing Access", "code": 50001}`) { // pathetic error handling from SnowTransfer
+ if (e.message === "Missing Access") {
console.log(`[check missed messages] no permissions to look back in channel ${channel.name} (${channel.id})`)
continue // Sucks.
} else {
@@ -288,7 +288,6 @@ module.exports = {
if (!guildID) return // channel must have been a DM channel or something
const roomID = select("channel_room", "room_id", {channel_id: channel.id}).pluck().get()
if (!roomID) return // channel wasn't being bridged in the first place
- // @ts-ignore
await createRoom.unbridgeChannel(channel, guildID)
},
@@ -298,6 +297,7 @@ module.exports = {
*/
async MESSAGE_CREATE(client, message) {
if (message.author.username === "Deleted User") return // Nothing we can do for deleted users.
+ if (select("opt_out", "user_id", {user_id: message.author.id}).pluck().get()) return // This user opted out.
const channel = client.channels.get(message.channel_id)
if (!channel || !("guild_id" in channel) || !channel.guild_id) return // Nothing we can do in direct messages.
@@ -313,11 +313,10 @@ module.exports = {
if (!createRoom.existsOrAutocreatable(channel, guild.id)) return // Check that the sending-to room exists or is autocreatable
- const {affected, row} = await speedbump.maybeDoSpeedbump(message.channel_id, message.id)
- if (affected) return
+ const {skip} = await speedbump.maybeDoSpeedbump(true, message)
+ if (skip) return
- // @ts-ignore
- await sendMessage.sendMessage(message, channel, guild, row)
+ await sendMessage.sendMessage(message, channel, guild)
retrigger.finishedBridging(message.id)
},
@@ -335,24 +334,27 @@ module.exports = {
if (dUtils.isEphemeralMessage(data)) return // Ephemeral messages are for the eyes of the receiver only!
// Edits need to go through the speedbump as well. If the message is delayed but the edit isn't, we don't have anything to edit from.
- const {affected, row} = await speedbump.maybeDoSpeedbump(data.channel_id, data.id)
- if (affected) return
-
- if (!row) {
- // Check that the sending-to room exists, and deal with Eventual Consistency(TM)
- if (!await retrigger.waitForMessage(data.id)) return
- }
+ const {skip, hasCreate} = await speedbump.maybeDoSpeedbump(false, data)
+ if (skip) return
/** @type {DiscordTypes.GatewayMessageCreateDispatchData} */
- // @ts-ignore
const message = data
const channel = client.channels.get(message.channel_id)
if (!channel || !("guild_id" in channel) || !channel.guild_id) return // Nothing we can do in direct messages.
const guild = client.guilds.get(channel.guild_id)
assert(guild)
- // @ts-ignore
- await retrigger.pauseChanges(message.id, editMessage.editMessage(message, guild, row))
+ if (!hasCreate) {
+ // Standard path for most message updates
+ // Check that the target message already exists, and deal with Eventual Consistency(TM)
+ if (!await retrigger.waitForMessage(data.id)) return
+ await retrigger.pauseChanges(message.id, editMessage.editMessage(message, guild))
+ }
+ else {
+ // Path for edit packets that were speedbumped into the latest copy of a message that needs to be created
+ // Just pretend to be MESSAGE_CREATE
+ await sendMessage.sendMessage(message, channel, guild)
+ }
},
/**
@@ -360,6 +362,7 @@ module.exports = {
* @param {DiscordTypes.GatewayMessageReactionAddDispatchData} data
*/
async MESSAGE_REACTION_ADD(client, data) {
+ if (select("opt_out", "user_id", {user_id: data.user_id}).pluck().get()) return // This user opted out.
if (data.user_id === client.user.id) return // m2d reactions are added by the discord bot user - do not reflect them back to matrix.
if (data.emoji.name === "โ" && select("event_message", "message_id", {message_id: data.message_id, source: 0, part: 0}).get()) { // source 0 = matrix
const guild_id = data.guild_id ?? client.channels.get(data.channel_id)?.["guild_id"]
@@ -414,6 +417,7 @@ module.exports = {
* @param {DiscordTypes.GatewayTypingStartDispatchData} data
*/
async TYPING_START(client, data) {
+ if (data.user_id === client.user.id) return
const roomID = select("channel_room", "room_id", {channel_id: data.channel_id}).pluck().get()
if (!roomID) return
const mxid = from("sim").join("sim_member", "mxid").where({user_id: data.user_id, room_id: roomID}).pluck("mxid").get()
diff --git a/src/db/migrations/0037-remove-leaked-webhooks.js b/src/db/migrations/0037-remove-leaked-webhooks.js
index 02280533..b839bd79 100644
--- a/src/db/migrations/0037-remove-leaked-webhooks.js
+++ b/src/db/migrations/0037-remove-leaked-webhooks.js
@@ -27,7 +27,7 @@ module.exports = async function(db) {
const webhook = affectedWebhooks[counter-1]
await discord.snow.webhook.deleteWebhookToken(webhook.webhook_id, webhook.webhook_token, "Webhook token possibly compromised during 8th May 2026 outage").catch(e => {
- if (e.message === `{"message": "Unknown Webhook", "code": 10015}`) {
+ if (e.message === "Unknown Webhook") {
// OK
} else {
throw e
diff --git a/src/db/migrations/0039-refactor-speedbump.sql b/src/db/migrations/0039-refactor-speedbump.sql
new file mode 100644
index 00000000..de739dc8
--- /dev/null
+++ b/src/db/migrations/0039-refactor-speedbump.sql
@@ -0,0 +1,19 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE "channel_speedbump" (
+ "channel_id" TEXT NOT NULL,
+ "speedbump_webhook_id" TEXT NOT NULL,
+ "speedbump_user_id" TEXT NOT NULL,
+ PRIMARY KEY("channel_id","speedbump_webhook_id"),
+ FOREIGN KEY("channel_id") REFERENCES "channel_room"("channel_id")
+) WITHOUT ROWID;
+
+INSERT INTO channel_speedbump (channel_id, speedbump_webhook_id, speedbump_user_id)
+ SELECT channel_id, speedbump_webhook_id, speedbump_id FROM channel_room WHERE speedbump_id IS NOT NULL AND speedbump_webhook_id IS NOT NULL;
+
+ALTER TABLE channel_room DROP COLUMN speedbump_id;
+ALTER TABLE channel_room DROP COLUMN speedbump_webhook_id;
+
+ALTER TABLE sim_proxy ADD COLUMN proxy_app INTEGER DEFAULT 0;
+
+COMMIT;
diff --git a/src/db/migrations/0040-opt-out.sql b/src/db/migrations/0040-opt-out.sql
new file mode 100644
index 00000000..094dff90
--- /dev/null
+++ b/src/db/migrations/0040-opt-out.sql
@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE "opt_out" (
+ "user_id" TEXT NOT NULL,
+ "opted_out_at" INTEGER NOT NULL,
+ PRIMARY KEY("user_id")
+) WITHOUT ROWID;
+
+COMMIT;
diff --git a/src/db/orm-defs.d.ts b/src/db/orm-defs.d.ts
index d95bfc37..ff63d324 100644
--- a/src/db/orm-defs.d.ts
+++ b/src/db/orm-defs.d.ts
@@ -18,13 +18,17 @@ export type Models = {
thread_parent: string | null
custom_avatar: string | null
last_bridged_pin_timestamp: number | null
- speedbump_id: string | null
- speedbump_webhook_id: string | null
speedbump_checked: number | null
guild_id: string | null
custom_topic: number
}
+ channel_speedbump: {
+ channel_id: string
+ speedbump_webhook_id: string
+ speedbump_user_id: string
+ }
+
direct: {
mxid: string
room_id: string
@@ -44,6 +48,7 @@ export type Models = {
event_subtype: string | null
part: number
reaction_part: number
+ /** 0 = Matrix, 1 = Discord */
source: number
}
@@ -110,6 +115,11 @@ export type Models = {
historical_room_index: number
}
+ opt_out: {
+ user_id: string
+ opted_out_at: number
+ }
+
role_default: {
guild_id: string
role_id: string
@@ -137,6 +147,8 @@ export type Models = {
user_id: string
proxy_owner_id: string
displayname: string
+ /** 0 = PluralKit, 1 = /plu/ral */
+ proxy_app: number
}
webhook: {
diff --git a/src/discord/interactions/poll.js b/src/discord/interactions/poll.js
index 6d7a0153..7190d63d 100644
--- a/src/discord/interactions/poll.js
+++ b/src/discord/interactions/poll.js
@@ -55,10 +55,10 @@ async function* _interact({data, message, member, user}, {api}) {
title: "Poll",
components: [{
type: DiscordTypes.ComponentType.TextDisplay,
- content: `-# ${pollComponents.getMultiSelectString(pollRow.max_selections, options.length)}`
+ content: `## ${pollRow.question_text}`
}, {
type: DiscordTypes.ComponentType.Label,
- label: pollRow.question_text,
+ label: pollComponents.getMultiSelectString(pollRow.max_selections, options.length),
component: {
type: DiscordTypes.ComponentType.RadioGroup,
custom_id: "POLL_MODAL_SELECTION",
diff --git a/src/discord/interactions/reactions.js b/src/discord/interactions/reactions.js
index bd2f8560..36853cc1 100644
--- a/src/discord/interactions/reactions.js
+++ b/src/discord/interactions/reactions.js
@@ -16,9 +16,9 @@ const utils = sync.require("../../matrix/utils")
* @returns {AsyncGenerator<{[k in keyof InteractionMethods]?: Parameters[2]}>}
*/
async function* _interact({data}, {api}) {
- const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index")
- .select("event_id", "room_id").where({message_id: data.target_id}).get()
- if (!row) {
+ const events = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index")
+ .select("event_id", "room_id").where({message_id: data.target_id}).and("ORDER BY reaction_part").all()
+ if (!events.length) {
return yield {createInteractionResponse: {
type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
data: {
@@ -35,17 +35,23 @@ async function* _interact({data}, {api}) {
}
}}
- const reactions = await api.getFullRelations(row.room_id, row.event_id, "m.annotation")
+ const reactions = []
+ for (const event of events) {
+ const reactionsOnEvent = await api.getFullRelations(event.room_id, event.event_id, "m.annotation")
+ reactions.push(...reactionsOnEvent)
+ }
- /** @type {Map} */
+ /** @type {Map>} reaction key (the emoji) -> displaynames */
const inverted = new Map()
for (const reaction of reactions) {
if (utils.eventSenderIsFromDiscord(reaction.sender)) continue
const key = reaction.content["m.relates_to"].key
- const displayname = select("member_cache", "displayname", {mxid: reaction.sender, room_id: row.room_id}).pluck().get() || reaction.sender
- if (!inverted.has(key)) inverted.set(key, [])
+ const displayname = select("member_cache", "displayname", {mxid: reaction.sender, room_id: events[0].room_id}).pluck().get() || reaction.sender
+ if (!inverted.has(key)) {
+ inverted.set(key, new Set())
+ }
// @ts-ignore
- inverted.get(key).push(displayname)
+ inverted.get(key).add(displayname)
}
if (inverted.size === 0) {
@@ -55,7 +61,7 @@ async function* _interact({data}, {api}) {
}
return yield {editOriginalInteractionResponse: {
- content: [...inverted.entries()].map(([key, value]) => `${key} โฎ ${value.join(" โฌฉ ")}`).join("\n"),
+ content: [...inverted.entries()].sort((a, b) => b[1].size - a[1].size).map(([key, value]) => `${key} โฎ ${[...value].join(" โฌฉ ")}`).join("\n"),
}}
}
diff --git a/src/discord/interactions/reactions.test.js b/src/discord/interactions/reactions.test.js
index 50ddeca9..8d258f43 100644
--- a/src/discord/interactions/reactions.test.js
+++ b/src/discord/interactions/reactions.test.js
@@ -43,7 +43,7 @@ test("reactions: different response if nobody reacted", async t => {
})
test("reactions: shows reactions if there are some, ignoring discord users", async t => {
- let called = 1
+ let called = 0
const msgs = await fromAsync(_interact({
data: {
target_id: "1126786462646550579"
@@ -51,6 +51,7 @@ test("reactions: shows reactions if there are some, ignoring discord users", asy
}, {
api: {
async getFullRelations(roomID, eventID) {
+ called++
t.equal(roomID, "!kLRqKKUQXcibIMtOpl:cadence.moe")
t.equal(eventID, "$X16nfVks1wsrhq4E9SSLiqrf2N8KD0erD0scZG7U5xg")
return [{
@@ -97,3 +98,57 @@ test("reactions: shows reactions if there are some, ignoring discord users", asy
)
t.equal(called, 1)
})
+
+test("reactions: combines reactions from multiple events", async t => {
+ let called = 0
+ const msgs = await fromAsync(_interact({
+ data: {
+ target_id: "1141501302736695316"
+ }
+ }, {
+ api: {
+ async getFullRelations(roomID, eventID) {
+ called++
+ t.equal(roomID, "!kLRqKKUQXcibIMtOpl:cadence.moe")
+ if (eventID === "$mtR8cJqM4fKno1bVsm8F4wUVqSntt2sq6jav1lyavuA") {
+ return [{
+ sender: "@cadence:cadence.moe",
+ content: {
+ "m.relates_to": {
+ key: "๐",
+ rel_type: "m.annotation"
+ }
+ }
+ }, {
+ sender: "@rnl:cadence.moe",
+ content: {
+ "m.relates_to": {
+ key: "๐",
+ rel_type: "m.annotation"
+ }
+ }
+ }]
+ } else if (eventID === "$51f4yqHinwnSbPEQ9dCgoyy4qiIJSX0QYYVUnvwyTCI") {
+ return [{
+ sender: "@cadence:cadence.moe",
+ content: {
+ "m.relates_to": {
+ key: "๐โโฌ",
+ rel_type: "m.annotation"
+ }
+ }
+ }]
+ } else {
+ t.fail(`tried to read reactions on wrong event ${eventID}`)
+ }
+ }
+ }
+ }))
+ t.equal(msgs.length, 2)
+ t.equal(
+ msgs[1].editOriginalInteractionResponse.content,
+ "๐ โฎ cadence [they] โฌฉ @rnl:cadence.moe"
+ + "\n๐โโฌ โฎ cadence [they]"
+ )
+ t.equal(called, 2)
+})
diff --git a/src/discord/register-interactions.js b/src/discord/register-interactions.js
index e3d58c48..dc972875 100644
--- a/src/discord/register-interactions.js
+++ b/src/discord/register-interactions.js
@@ -16,7 +16,7 @@ const ping = sync.require("./interactions/ping.js")
// User must have EVERY permission in default_member_permissions to be able to use the command
function registerInteractions() {
- discord.snow.interaction.bulkOverwriteApplicationCommands(id, [{
+ discord.snow.interaction.editApplicationCommands(id, [{
name: "Matrix info",
contexts: [DiscordTypes.InteractionContextType.Guild],
type: DiscordTypes.ApplicationCommandType.Message,
@@ -91,40 +91,32 @@ function registerInteractions() {
async function dispatchInteraction(interaction) {
const interactionId = interaction.data?.["custom_id"] || interaction.data?.["name"]
try {
- if (interaction.type === DiscordTypes.InteractionType.MessageComponent || interaction.type === DiscordTypes.InteractionType.ModalSubmit) {
- // All we get is custom_id, don't know which context the button was clicked in.
- // So we namespace these ourselves in the custom_id. Currently the only existing namespace is POLL_.
- if (interaction.data.custom_id.startsWith("POLL_")) {
- await poll.interact(interaction)
+ if (interactionId === "Matrix info") {
+ await matrixInfo.interact(interaction)
+ } else if (interactionId === "invite") {
+ await invite.interact(interaction)
+ } else if (interactionId === "invite_channel") {
+ await invite.interactButton(interaction)
+ } else if (interactionId === "Permissions") {
+ await permissions.interact(interaction)
+ } else if (interactionId === "permissions_edit") {
+ await permissions.interactEdit(interaction)
+ } else if (interactionId === "Responses") {
+ /** @type {DiscordTypes.APIMessageApplicationCommandGuildInteraction} */ // @ts-ignore
+ const messageInteraction = interaction
+ if (select("poll", "message_id", {message_id: messageInteraction.data.target_id}).get()) {
+ await pollResponses.interact(messageInteraction)
} else {
- throw new Error(`Unknown message component ${interaction.data.custom_id}`)
+ await reactions.interact(messageInteraction)
}
+ } else if (interactionId === "ping") {
+ await ping.interact(interaction)
+ } else if (interactionId === "privacy") {
+ await privacy.interact(interaction)
+ } else if (interactionId.startsWith("POLL_")) {
+ await poll.interact(interaction)
} else {
- if (interactionId === "Matrix info") {
- await matrixInfo.interact(interaction)
- } else if (interactionId === "invite") {
- await invite.interact(interaction)
- } else if (interactionId === "invite_channel") {
- await invite.interactButton(interaction)
- } else if (interactionId === "Permissions") {
- await permissions.interact(interaction)
- } else if (interactionId === "permissions_edit") {
- await permissions.interactEdit(interaction)
- } else if (interactionId === "Responses") {
- /** @type {DiscordTypes.APIMessageApplicationCommandGuildInteraction} */ // @ts-ignore
- const messageInteraction = interaction
- if (select("poll", "message_id", {message_id: messageInteraction.data.target_id}).get()) {
- await pollResponses.interact(messageInteraction)
- } else {
- await reactions.interact(messageInteraction)
- }
- } else if (interactionId === "ping") {
- await ping.interact(interaction)
- } else if (interactionId === "privacy") {
- await privacy.interact(interaction)
- } else {
- throw new Error(`Unknown interaction ${interactionId}`)
- }
+ throw new Error(`Unknown interaction ${interactionId}`)
}
} catch (e) {
let stackLines = null
diff --git a/src/discord/utils.js b/src/discord/utils.js
index 0d400f11..6fb0b433 100644
--- a/src/discord/utils.js
+++ b/src/discord/utils.js
@@ -182,6 +182,18 @@ function filterTo(xs, fn) {
return filtered
}
+/**
+ * The parameters correspond to the columns of the channel_room table.
+ * @param {string} rowChannelID thread ID, OR channel ID if there is no thread
+ * @param {string | null | undefined} rowThreadParent channel ID if there is a thread
+ */
+function swapThreadID(rowChannelID, rowThreadParent) {
+ return {
+ channelID: rowThreadParent ? rowThreadParent : rowChannelID,
+ threadID: rowThreadParent ? rowChannelID : undefined
+ }
+}
+
const supportedPlaintextPreviewExtensions = new Set([
"4d",
"abnf",
@@ -582,4 +594,5 @@ module.exports.timestampToSnowflakeInexact = timestampToSnowflakeInexact
module.exports.getPublicUrlForCdn = getPublicUrlForCdn
module.exports.howOldUnbridgedMessage = howOldUnbridgedMessage
module.exports.filterTo = filterTo
+module.exports.swapThreadID = swapThreadID
module.exports.supportedPlaintextPreviewExtensions = supportedPlaintextPreviewExtensions
diff --git a/src/m2d/actions/channel-webhook.js b/src/m2d/actions/channel-webhook.js
index 09c642bb..01b3dd4a 100644
--- a/src/m2d/actions/channel-webhook.js
+++ b/src/m2d/actions/channel-webhook.js
@@ -45,7 +45,7 @@ async function ensureWebhook(channelID, forceCreate = false) {
async function withWebhook(channelID, callback) {
const webhook = await ensureWebhook(channelID, false)
return callback(webhook).catch(async e => {
- if (e.message === `{"message": "Unknown Webhook", "code": 10015}`) { // pathetic error handling from SnowTransfer
+ if (e.message === "Unknown Webhook") {
// Our webhook is gone. Maybe somebody deleted it, or removed and re-added OOYE from the guild.
const newWebhook = await ensureWebhook(channelID, true)
return callback(newWebhook) // not caught; if the error happens again just throw it instead of looping
diff --git a/src/m2d/actions/emoji-sheet.js b/src/m2d/actions/emoji-sheet.js
index ed5ab883..077240cc 100644
--- a/src/m2d/actions/emoji-sheet.js
+++ b/src/m2d/actions/emoji-sheet.js
@@ -23,7 +23,7 @@ async function getAndConvertEmoji(mxc) {
const res = await api.getMedia(mxc, {signal: abortController.signal})
if (res.status !== 200) {
const root = await res.json()
- throw new mreq.MatrixServerError(root, {mxc})
+ throw new mreq.MatrixServerError(root, res.status, {mxc})
}
const readable = stream.Readable.fromWeb(res.body)
return emojiSheetConverter.convertImageStream(readable, () => {
diff --git a/src/m2d/actions/send-event.js b/src/m2d/actions/send-event.js
index 00557a11..2e6bf5cd 100644
--- a/src/m2d/actions/send-event.js
+++ b/src/m2d/actions/send-event.js
@@ -153,7 +153,7 @@ async function sendEvent(event) {
channel_id: messageResponse.channel_id,
guild_id: guild.id,
embeds: messageResponse.embeds
- }, guild, null)
+ }, guild)
)
}
}
diff --git a/src/m2d/actions/sticker.js b/src/m2d/actions/sticker.js
index 8eeb5d28..f5a1e160 100644
--- a/src/m2d/actions/sticker.js
+++ b/src/m2d/actions/sticker.js
@@ -22,7 +22,7 @@ async function getAndResizeSticker(mxc) {
const res = await api.getMedia(mxc)
if (res.status !== 200) {
const root = await res.json()
- throw new mreq.MatrixServerError(root, {mxc})
+ throw new mreq.MatrixServerError(root, res.status, {mxc})
}
const streamIn = Readable.fromWeb(res.body)
diff --git a/src/m2d/actions/typing.js b/src/m2d/actions/typing.js
new file mode 100644
index 00000000..c56ce4a5
--- /dev/null
+++ b/src/m2d/actions/typing.js
@@ -0,0 +1,39 @@
+// @ts-check
+
+const {discord} = require("../../passthrough")
+
+/** @type {Set} channel ids that are currently typing */
+const isTyping = new Set()
+/** @type {Map} channel id -> interval */
+const intervals = new Map()
+
+/** @param {string} channelID */
+function startTyping(channelID) {
+ isTyping.add(channelID)
+ // Start a new typing session if needed
+ if (!intervals.has(channelID)) {
+ intervals.set(channelID, setInterval(refreshTyping, 8e3, channelID))
+ discord.snow.channel.startChannelTyping(channelID).catch(() => {})
+ }
+}
+
+/** @param {string} channelID */
+function refreshTyping(channelID) {
+ if (isTyping.has(channelID)) {
+ // Continue typing session
+ discord.snow.channel.startChannelTyping(channelID).catch(() => {})
+ } else {
+ // End typing session
+ clearInterval(intervals.get(channelID))
+ intervals.delete(channelID)
+ }
+}
+
+/** @param {string} channelID */
+function stopTyping(channelID) {
+ // Schedule typing session to end
+ isTyping.delete(channelID)
+}
+
+module.exports.startTyping = startTyping
+module.exports.stopTyping = stopTyping
diff --git a/src/m2d/actions/update-pins.js b/src/m2d/actions/update-pins.js
index 1ff2bb9e..1b3f1bd9 100644
--- a/src/m2d/actions/update-pins.js
+++ b/src/m2d/actions/update-pins.js
@@ -16,9 +16,9 @@ async function updatePins(pins, prev) {
.select("reference_channel_id", "message_id").where({event_id}).and("ORDER BY part ASC").get()
if (!row) continue
if (added) {
- discord.snow.channel.addChannelPinnedMessage(row.reference_channel_id, row.message_id, "Message pinned on Matrix")
+ discord.snow.channel.createChannelPinnedMessage(row.reference_channel_id, row.message_id, "Message pinned on Matrix")
} else {
- discord.snow.channel.removeChannelPinnedMessage(row.reference_channel_id, row.message_id, "Message unpinned on Matrix")
+ discord.snow.channel.deleteChannelPinnedMessage(row.reference_channel_id, row.message_id, "Message unpinned on Matrix")
}
}
}
diff --git a/src/m2d/actions/vote.js b/src/m2d/actions/vote.js
index 926b9572..84f8cc7c 100644
--- a/src/m2d/actions/vote.js
+++ b/src/m2d/actions/vote.js
@@ -1,18 +1,12 @@
// @ts-check
const Ty = require("../../types")
-const DiscordTypes = require("discord-api-types/v10")
-const {Readable} = require("stream")
const assert = require("assert").strict
-const crypto = require("crypto")
const passthrough = require("../../passthrough")
-const {sync, discord, db, select} = passthrough
+const {sync, db, select} = passthrough
-const {reg} = require("../../matrix/read-registration")
-/** @type {import("../../matrix/api")} */
-const api = sync.require("../../matrix/api")
-/** @type {import("../../matrix/utils")} */
-const utils = sync.require("../../matrix/utils")
+/** @type {import("../../discord/utils")} */
+const dUtils = sync.require("../../discord/utils")
/** @type {import("../converters/poll-components")} */
const pollComponents = sync.require("../converters/poll-components")
/** @type {import("./channel-webhook")} */
@@ -33,10 +27,11 @@ async function updateVote(event) {
// If poll was started on Matrix, the Discord version is using components, so we can update that to the current status
if (messageRow.source === 0) {
- const channelID = select("channel_room", "channel_id", {room_id: event.room_id}).pluck().get()
- assert(channelID)
- await webhook.editMessageWithWebhook(channelID, messageID, pollComponents.getPollComponentsFromDatabase(messageID))
+ const row = select("channel_room", ["channel_id", "thread_parent"], {room_id: event.room_id}).get()
+ assert(row)
+ const {channelID, threadID} = dUtils.swapThreadID(row.channel_id, row.thread_parent)
+ await webhook.editMessageWithWebhook(channelID, messageID, pollComponents.getPollComponentsFromDatabase(messageID), threadID)
}
}
-module.exports.updateVote = updateVote
\ No newline at end of file
+module.exports.updateVote = updateVote
diff --git a/src/m2d/converters/event-to-message.js b/src/m2d/converters/event-to-message.js
index 0a18a149..a017e99c 100644
--- a/src/m2d/converters/event-to-message.js
+++ b/src/m2d/converters/event-to-message.js
@@ -10,6 +10,7 @@ const domino = require("domino")
const assert = require("assert").strict
const entities = require("entities")
const pb = require("prettier-bytes")
+const mimeTypes = require("mime-types")
const {tag} = require("@cloudrac3r/html-template-tag")
const passthrough = require("../../passthrough")
@@ -31,6 +32,8 @@ const setupEmojis = sync.require("../actions/setup-emojis")
const userToMxid = sync.require("../../d2m/converters/user-to-mxid")
/** @type {import("../../web/routes/letter-avatar")} */
const letterAvatar = sync.require("../../web/routes/letter-avatar")
+/** @type {import("../../d2m/actions/retrigger")} */
+const retrigger = sync.require("../../d2m/actions/retrigger")
/** @type {[RegExp, string][]} */
const markdownEscapes = [
@@ -97,15 +100,6 @@ turndownService.addRule("underline", {
}
})
-turndownService.addRule("blockquote", {
- filter: "blockquote",
- replacement: function (content) {
- content = content.replace(/^\n+|\n+$/g, "")
- content = content.replace(/^/gm, "> ")
- return content
- }
-})
-
turndownService.addRule("spoiler", {
filter: function (node, options) {
return node.tagName === "SPAN" && node.hasAttribute("data-mx-spoiler")
@@ -392,7 +386,7 @@ function linkEndOfMessageSpriteSheet(content) {
*/
async function handleRoomOrMessageLinks(input, di) {
let offset = 0
- for (const match of [...input.matchAll(/("?https:\/\/matrix.to\/#\/((?:#|%23|!)[^"/, ?)]+)(?:\/(\$[^"/ ?)]+))?(?:\?[^",:!? )]*?)?)(">|[,<\n )]|$)/g)]) {
+ for (const match of [...input.matchAll(/("?https:\/\/matrix.to\/#\/((?:#|%23|!|%21)[^"/, ?)]+)(?:\/((?:\$|%24)[^"/ ?)]+))?(?:\?[^",:!? )]*?)?)(">|[,<\n )]|$)/g)]) {
assert(typeof match.index === "number")
let [_, attributeValue, roomID, eventID, endMarker] = match
let result
@@ -517,7 +511,7 @@ function getFileSizeForGuild(guild) {
if (fileSizeFeature) {
return fileSizeFeature * 1024 * 1024 // discord uses big megabytes
} else {
- return 10 * 1024 * 1024 // default file size is 10 MB
+ return 20 * 1024 * 1024 // default file size is 20 MB
}
}
@@ -622,13 +616,20 @@ async function eventToMessage(event, guild, channel, di) {
captionContent.addLine(`(Spoiler: ${fileSpoilerReason})`)
}
+ // If filename is not specified, create one from mimetype
+ let filename = event.content.filename || event.content.body
+ if (!filename) {
+ const extension = mimeTypes.extension(event.content.info?.mimetype)
+ if (!extension) throw new Error("Filename and mimetype missing. Please report this bug to your client.")
+ filename = `file.${extension}`
+ }
+
// File link as alternative to uploading
if (!("file" in event.content) && event.content.info?.size > getFileSizeForGuild(guild)) {
// Upload (unencrypted) file as link, because it's too large for Discord
// Do this by constructing a sample Matrix message with the link and then use the text processor to convert that + the original caption.
const url = mxUtils.getPublicUrlForMxc(event.content.url)
assert(url)
- const filename = event.content.filename || event.content.body
const emoji = attachmentEmojis.has(event.content.msgtype) ? attachmentEmojis.get(event.content.msgtype) + " " : ""
if (fileIsSpoiler) {
captionContent.addLine(`${emoji}Uploaded SPOILER file: <${url}> (${pb(event.content.info.size)})`, tag`${emoji}Uploaded SPOILER file: ${filename} (${pb(event.content.info.size)})`) // the space is necessary to work around a bug in Discord's URL previewer. the preview still gets blurred in the client.
@@ -637,7 +638,6 @@ async function eventToMessage(event, guild, channel, di) {
}
} else {
// Upload file as file
- let filename = event.content.filename || event.content.body
if (fileIsSpoiler) filename = "SPOILER_" + filename
if ("file" in event.content) {
// Encrypted
@@ -698,6 +698,7 @@ async function eventToMessage(event, guild, channel, di) {
// Check if we have a pointer to what was edited
const originalEventId = relatesTo.event_id
if (!originalEventId) return
+ if (!await retrigger.waitForEvent(originalEventId)) return
messageIDsToEdit = select("event_message", "message_id", {event_id: originalEventId}, "ORDER BY part").pluck().all()
if (!messageIDsToEdit.length) return
@@ -775,14 +776,14 @@ async function eventToMessage(event, guild, channel, di) {
repliedToEvent.content = repliedToEvent.content["m.new_content"]
}
/** @type {string} */
- let repliedToContent = repliedToEvent.content.formatted_body || repliedToEvent.content.body
+ let originalRepliedToContent = repliedToEvent.content.formatted_body || repliedToEvent.content.body
const fileReplyContentAlternative = attachmentEmojis.get(repliedToEvent.content.msgtype)
let contentPreview
if (fileReplyContentAlternative) {
contentPreview = " " + fileReplyContentAlternative
} else if (repliedToEvent.unsigned?.redacted_because) {
contentPreview = " (in reply to a deleted message)"
- } else if (typeof repliedToContent !== "string") {
+ } else if (typeof originalRepliedToContent !== "string") {
// in reply to a weird metadata event like m.room.name, m.room.member...
// I'm not implementing text fallbacks for arbitrary room events. this should cover most cases
// this has never ever happened in the wild anyway
@@ -790,6 +791,7 @@ async function eventToMessage(event, guild, channel, di) {
contentPreview = " (channel details edited)"
} else {
// Generate a reply preview for a standard message
+ let repliedToContent = originalRepliedToContent
repliedToContent = repliedToContent.replace(/.*<\/mx-reply>/s, "") // Remove everything before replies, so just use the actual message body
repliedToContent = repliedToContent.replace(/^\s*.*?<\/blockquote>(.....)/s, "$1") // If the message starts with a blockquote, don't count it and use the message body afterwards
repliedToContent = repliedToContent.replace(/(?:\n|
)+/g, " ") // Should all be on one line
@@ -804,7 +806,18 @@ async function eventToMessage(event, guild, channel, di) {
const contentPreviewChunks = chunk(repliedToContent, 50)
if (contentPreviewChunks.length) {
contentPreview = ": " + contentPreviewChunks[0]
- contentPreview = contentPreview.replace(/\bhttps?:\/\/[^ )]*/g, "<$&>")
+ contentPreview = contentPreview.replace(/\bhttps?:\/\/[^ )]*/g, url => {
+ const originalUrlIndex = originalRepliedToContent.indexOf(url)
+ if (originalUrlIndex !== -1 && originalRepliedToContent[originalUrlIndex + url.length]?.match(/[^ )>"'`]/)) { // URL was truncated by chunking, replace it
+ try {
+ const u = new URL(url)
+ return ``
+ } catch (e) {
+ return ``
+ }
+ }
+ return `<${url}>` // Full URL is present, escape it
+ })
if (contentPreviewChunks.length > 1) contentPreview = contentPreview.replace(/[,.']$/, "") + "..."
} else {
contentPreview = ""
@@ -855,7 +868,7 @@ async function eventToMessage(event, guild, channel, di) {
input = input.replace(/("https:\/\/matrix.to.*?<\/a>):?/g, "$1")
// Element adds a bunch of
before
but doesn't render them. I can't figure out how this even works in the browser, so let's just delete those.
- input = input.replace(/(?:\n|
\s*)*<\/blockquote>/g, "
")
+ input = input.replace(/(?:\n|