N0VA/out-of-your-element
0
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix Discord replies to multipart Matrix messages

Browse Source 
The second part of the message is part=1 but the reply database lookup
wanted part=0. To fix this, now it finds the first available part.
This commit is contained in:
Cadence Ember
2026-01-09 01:48:59 +13:00
parent 8e0fe29bec
commit 29d08df094
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d2m/converters/message-to-event.js
+2 -2
View File
@@ -281,7 +281,7 @@ async function messageToEvent(message, guild, options = {}, di) {
// Mentions scenarios 1 and 2, part A. i.e. translate relevant message.mentions to m.mentions // Mentions scenarios 1 and 2, part A. i.e. translate relevant message.mentions to m.mentions
// (Still need to do scenarios 1 and 2 part B, and scenario 3.) // (Still need to do scenarios 1 and 2 part B, and scenario 3.)
if (message.type === DiscordTypes.MessageType.Reply && message.message_reference?.message_id) { if (message.type === DiscordTypes.MessageType.Reply && message.message_reference?.message_id) {
const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index").select("event_id", "room_id", "reference_channel_id", "source").and("WHERE message_id = ? AND part = 0").get(message.message_reference.message_id) const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index").select("event_id", "room_id", "reference_channel_id", "source").and("WHERE message_id = ? ORDER BY part ASC").get(message.message_reference.message_id)
if (row) { if (row) {
repliedToEventRow = Object.assign(row, {channel_id: row.reference_channel_id}) repliedToEventRow = Object.assign(row, {channel_id: row.reference_channel_id})
} else if (message.referenced_message) { } else if (message.referenced_message) {
@@ -295,7 +295,7 @@ async function messageToEvent(message, guild, options = {}, di) {
assert(message.embeds[0].description) assert(message.embeds[0].description)
const match = message.embeds[0].description.match(/\/channels\/[0-9]*\/[0-9]*\/([0-9]{2,})/) const match = message.embeds[0].description.match(/\/channels\/[0-9]*\/[0-9]*\/([0-9]{2,})/)
if (match) { if (match) {
const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index").select("event_id", "room_id", "reference_channel_id", "source").and("WHERE message_id = ? AND part = 0").get(match[1]) const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index").select("event_id", "room_id", "reference_channel_id", "source").and("WHERE message_id = ? ORDER BY part ASC").get(match[1])
if (row) { if (row) {
/* /*
we generate a partial referenced_message based on what PK provided. we don't need everything, since this will only be used for further message-to-event converting. we generate a partial referenced_message based on what PK provided. we don't need everything, since this will only be used for further message-to-event converting.