Fix message corrections

snikket-im · Jul 2, 2024 · 38c3208 · 38c3208
1 parent 5500f87
commit 38c3208
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/snikket/Chat.hx b/snikket/Chat.hx
@@ -514,8 +514,9 @@ class DirectChat extends Chat {
 
 	@HaxeCBridge.noemit // on superclass as abstract
 	public function correctMessage(localId:String, message:ChatMessage) {
-		final toSend = message.clone();
+		final toSend = prepareOutgoingMessage(message.clone());
 		message = prepareOutgoingMessage(message);
+		message.resetLocalId();
 		message.versions = [toSend]; // This is a correction
 		message.localId = localId;
 		persistence.storeMessage(client.accountId(), message, (corrected) -> {
@@ -869,8 +870,9 @@ class Channel extends Chat {
 
 	@HaxeCBridge.noemit // on superclass as abstract
 	public function correctMessage(localId:String, message:ChatMessage) {
-		final toSend = message.clone();
+		final toSend = prepareOutgoingMessage(message.clone());
 		message = prepareOutgoingMessage(message);
+		message.resetLocalId();
 		message.versions = [toSend]; // This is a correction
 		message.localId = localId;
 		persistence.storeMessage(client.accountId(), message, (corrected) -> {

diff --git a/snikket/ChatMessage.hx b/snikket/ChatMessage.hx
@@ -194,6 +194,11 @@ class ChatMessage {
 		return this.timestamp = timestamp;
 	}
 
+	@:allow(snikket)
+	private function resetLocalId() {
+		Reflect.setField(this, "localId", null);
+	}
+
 	/**
 		Get HTML version of the message body
 	**/

diff --git a/snikket/persistence/browser.js b/snikket/persistence/browser.js
@@ -317,7 +317,7 @@ const browser = (dbname) => {
 				const tx = db.transaction(["messages", "reactions"], "readwrite");
 				const store = tx.objectStore("messages");
 				return promisifyRequest(store.index("localId").openCursor(IDBKeyRange.only([account, message.localId || [], message.chatId()]))).then((result) => {
-					if (result?.value && !message.isIncoming() && result?.value.direction === enums.MessageDirection.MessageSent) {
+					if (result?.value && !message.isIncoming() && result?.value.direction === enums.MessageDirection.MessageSent && message.versions.length < 1) {
 						// Duplicate, we trust our own sent ids
 						return promisifyRequest(result.delete());
 					} else if (result?.value && result.value.sender == message.senderId() && (message.versions.length > 0 || (result.value.versions || []).length > 0)) {