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

Fix pointer being included for cross-room replies

Browse Source
This commit is contained in:
Cadence Ember
2025-12-16 00:36:43 +13:00
parent 4bc7e794ab
commit a6bb248c0a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d2m/converters/message-to-event.js
+3 -1
View File
@@ -267,6 +267,7 @@ async function messageToEvent(message, guild, options = {}, di) {
const mentions = {} const mentions = {}
/** @type {{event_id: string, room_id: string, source: number, channel_id: string}?} */ /** @type {{event_id: string, room_id: string, source: number, channel_id: string}?} */
let repliedToEventRow = null let repliedToEventRow = null
let repliedToEventInDifferentRoom = false
let repliedToUnknownEvent = false let repliedToUnknownEvent = false
let repliedToEventSenderMxid = null let repliedToEventSenderMxid = null
@@ -491,6 +492,7 @@ async function messageToEvent(message, guild, options = {}, di) {
if (repliedToEventRow) { if (repliedToEventRow) {
// Generate a reply pointing to the Matrix event we found // Generate a reply pointing to the Matrix event we found
const latestRoomID = select("channel_room", "room_id", {channel_id: repliedToEventRow.channel_id}).pluck().get() // native replies don't work across room upgrades, so make sure the old and new message are in the same room const latestRoomID = select("channel_room", "room_id", {channel_id: repliedToEventRow.channel_id}).pluck().get() // native replies don't work across room upgrades, so make sure the old and new message are in the same room
if (latestRoomID !== repliedToEventRow.room_id) repliedToEventInDifferentRoom = true
html = html =
(latestRoomID === repliedToEventRow.room_id ? "<mx-reply>" : "") (latestRoomID === repliedToEventRow.room_id ? "<mx-reply>" : "")
+ `<blockquote><a href="https://matrix.to/#/${repliedToEventRow.room_id}/${repliedToEventRow.event_id}">In reply to</a> ${repliedToUserHtml}` + `<blockquote><a href="https://matrix.to/#/${repliedToEventRow.room_id}/${repliedToEventRow.event_id}">In reply to</a> ${repliedToUserHtml}`
@@ -789,7 +791,7 @@ async function messageToEvent(message, guild, options = {}, di) {
} }
// Rich replies // Rich replies
if (repliedToEventRow) { if (repliedToEventRow && !repliedToEventInDifferentRoom) {
Object.assign(events[0], { Object.assign(events[0], {
"m.relates_to": { "m.relates_to": {
"m.in_reply_to": { "m.in_reply_to": {