From 69922c4a14e4a4dbcd0c603962e87dc1b9850531 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Thu, 1 Feb 2024 22:23:08 +1300 Subject: [PATCH] PK d->m replies are now native Matrix replies --- d2m/converters/message-to-event.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/d2m/converters/message-to-event.js b/d2m/converters/message-to-event.js index a620beb..411404c 100644 --- a/d2m/converters/message-to-event.js +++ b/d2m/converters/message-to-event.js @@ -252,6 +252,15 @@ async function messageToEvent(message, guild, options = {}, di) { if (row) { repliedToEventRow = row } + } else if (dUtils.isWebhookMessage(message) && message.embeds[0]?.author?.name?.endsWith("↩️") && message.embeds[0].description?.startsWith("**[Reply to:]")) { + const match = message.embeds[0].description.match(/\/channels\/[0-9]*\/[0-9]*\/([0-9]{2,})/) + if (match) { + const row = from("event_message").join("message_channel", "message_id").join("channel_room", "channel_id").select("event_id", "room_id", "source").and("WHERE message_id = ? AND part = 0").get(match[1]) + if (row) { + message.embeds.shift() + repliedToEventRow = row + } + } } if (repliedToEventRow && repliedToEventRow.source === 0) { // reply was originally from Matrix // Need to figure out who sent that event...