From 228766cec00e40f976907c3e231bdfff2d401a30 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Thu, 12 Feb 2026 01:27:49 +1300
Subject: [PATCH] Change how edit timestamps are treated again

---
 src/d2m/converters/edit-to-changes.js | 8 ++++++--
 test/data.js                          | 7 +------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/d2m/converters/edit-to-changes.js b/src/d2m/converters/edit-to-changes.js
index b73d6e0..cfbd1e2 100644
--- a/src/d2m/converters/edit-to-changes.js
+++ b/src/d2m/converters/edit-to-changes.js
@@ -146,10 +146,14 @@ async function editToChanges(message, guild, api) {
 	}
 
 	// Don't post new generated embeds for messages if it's been a while since the message was sent. Detached embeds look weird.
-	const messageTooOld = message.timestamp && new Date(message.timestamp).getTime() < Date.now() - 30 * 1000 // older than 30 seconds ago
+	const messageQuiteOld = message.timestamp && new Date(message.timestamp).getTime() < Date.now() - 30 * 1000 // older than 30 seconds ago
+	// Don't send anything new at all if it's been longer since the message was sent. Detached messages are just inappropriate.
+	const messageReallyOld = message.timestamp && new Date(message.timestamp).getTime() < Date.now() - 2 * 60 * 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) && !message.author.bot) {
+	if (messageReallyOld) {
+		eventsToSend = [] // Only allow edits to change and delete, but not send new.
+	} else if ((messageQuiteOld || !embedsEnabled) && !message.author.bot) {
 		eventsToSend = eventsToSend.filter(e => e.msgtype !== "m.notice") // Only send events that aren't embeds.
 	}
 
diff --git a/test/data.js b/test/data.js
index 4854f6a..eef3a50 100644
--- a/test/data.js
+++ b/test/data.js
@@ -239,7 +239,7 @@ module.exports = {
 					unicode_emoji: null,
 					tags: {},
 					position: 0,
-					permissions: '559623605575360',
+					permissions: '1122573558996672',
 					name: '@everyone',
 					mentionable: false,
 					managed: false,
@@ -5474,7 +5474,6 @@ module.exports = {
 			mention_roles: [],
 			mentions: [],
 			pinned: false,
-			timestamp: "2023-08-16T22:38:38.641000+00:00",
 			tts: false,
 			type: 0
 		},
@@ -5548,7 +5547,6 @@ module.exports = {
 			mention_roles: [],
 			mentions: [],
 			pinned: false,
-			timestamp: "2023-08-16T22:38:38.641000+00:00",
 			tts: false,
 			type: 0
 		},
@@ -5583,7 +5581,6 @@ module.exports = {
 			pinned: false,
 			mention_everyone: false,
 			tts: false,
-			timestamp: "2023-05-11T23:44:09.690000+00:00",
 			edited_timestamp: "2023-05-11T23:44:19.690000+00:00",
 			flags: 0,
 			components: [],
@@ -5624,7 +5621,6 @@ module.exports = {
 			pinned: false,
 			mention_everyone: false,
 			tts: false,
-			timestamp: "2023-05-11T23:44:09.690000+00:00",
 			edited_timestamp: "2023-05-11T23:44:19.690000+00:00",
 			flags: 0,
 			components: [],
@@ -5665,7 +5661,6 @@ module.exports = {
 			pinned: false,
 			mention_everyone: false,
 			tts: false,
-			timestamp: "2023-05-11T23:44:09.690000+00:00",
 			edited_timestamp: "2023-05-11T23:44:19.690000+00:00",
 			flags: 0,
 			components: [],