Drift/delete-your-element
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix duplicated data appearing on Matrix

Browse Source
This commit is contained in:
Cadence Ember
2025-11-18 14:48:59 +13:00
parent a2787f7b0b
commit d0f7d79d78
5 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/d2m/converters/edit-to-changes.js
View File

@@ -118,14 +118,20 @@ async function editToChanges(message, guild, api) {
eventsToRedact = oldEventRows.map(e => ({old: e}))
// If this is a generated embed update, only allow the embeds to be updated, since the system only sends data about events. Ignore changes to other things.
// This also prevents Matrix events that were re-subtyped during conversion (e.g. large image -> text link) from being mistakenly included.
if (isGeneratedEmbed) {
unchangedEvents.push(...eventsToRedact.filter(e => e.old.event_subtype !== "m.notice")) // Move them from eventsToRedact to unchangedEvents.
eventsToRedact = eventsToRedact.filter(e => e.old.event_subtype === "m.notice")
unchangedEvents.push(...eventsToReplace.filter(e => e.old.event_subtype !== "m.notice")) // Move them from eventsToReplace to unchangedEvents.
eventsToReplace = eventsToReplace.filter(e => e.old.event_subtype === "m.notice")
unchangedEvents.push(...eventsToSend.filter(e => e.msgtype !== "m.notice")) // Move them from eventsToSend to unchangedEvents.
eventsToSend = eventsToSend.filter(e => e.msgtype === "m.notice")
// Don't post new generated embeds for messages if it's been a while since the message was sent. Detached embeds look weird.
if (message.timestamp && new Date(message.timestamp).getTime() < Date.now() - 120 * 1000) { // older than 2 minutes ago
const messageTooOld = message.timestamp && new Date(message.timestamp).getTime() < Date.now() - 120 * 1000 // older than 2 minutes ago
// Don't post new generated embeds for messages if the setting was disabled.
const embedsEnabled = select("guild_space", "url_preview", {guild_id: guild?.id}).pluck().get() ?? 1
if (messageTooOld || !embedsEnabled) {
eventsToSend = eventsToSend.filter(e => e.msgtype !== "m.notice")
}
}

9
src/d2m/converters/edit-to-changes.test.js
View File

@@ -369,3 +369,12 @@ test("edit2changes: don't generate embed if it's been too long since the message
t.deepEqual(promotions, [])
t.equal(senderMxid, null)
})
test("edit2changes: don't generate new data in situations where m->d(->m) subtypes don't match, like large files", async t => {
const {senderMxid, eventsToRedact, eventsToReplace, eventsToSend, promotions} = await editToChanges(data.message.large_file_from_matrix)
t.deepEqual(eventsToRedact, [])
t.deepEqual(eventsToReplace, [])
t.deepEqual(eventsToSend, [])
t.deepEqual(promotions, [])
t.equal(senderMxid, null)
})