additional fix for antied, for alpha build 296

Self edit still had someissue, and generally added more safeguard and more robust props finding

Author: Angelix1

angel/antied/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name":"Antied v1.4.2",
+    "name":"Antied v1.4.2a",
     "description":"Keeps deleted messages and logs edited messages, until you restart/reloads the app",
     "main": "index.jsx",
     "authors": [

angel/antied/patches/actionsheet.jsx

@@ -12,6 +12,7 @@ import { plugin } from "@vendetta";
 const ActionSheet = findByProps("openLazy", "hideActionSheet")
 const MessageStore = findByProps("getMessage", "getMessages");
 const ChannelStore = findByProps("getChannel", "getDMFromUserId");
+const ChannelMessages = findByProps("_channelMessages");
 const { ActionSheetRow } = findByProps("ActionSheetRow");
 
 export default (deletedMessageArray) => before("openLazy", ActionSheet, ([component, args, actionMessage]) => {
@@ -41,7 +42,18 @@ export default (deletedMessageArray) => before("openLazy", ActionSheet, ([compon
 				buttons.length - 1
 			);
 
-			const originalMessage = MessageStore.getMessage(message.channel_id, message?.id)		
+			let originalMessage = null;
+
+			if (message?.channel_id && message?.id) {
+			    originalMessage = MessageStore.getMessage(message?.channel_id, message?.id);
+
+				if(!originalMessage) {
+					const channel = ChannelMessages.get(message?.channel_id);
+					originalMessage = channel?.get(message?.id);
+				}
+			}
+
+			if(!originalMessage) return comp;
 
 			const escapedBuffer = regexEscaper(storage?.inputs?.editedMessageBuffer || "`[ EDITED ]`")
 

angel/antied/patches/flux_dispatch.js

@@ -1,7 +1,7 @@
 import { instead, before, after } from "@vendetta/patcher"
 import { getAssetIDByName } from "@vendetta/ui/assets"
 import { findInReactTree } from "@vendetta/utils"
-import { findByProps } from "@vendetta/metro"
+import { findByProps, findByStoreName } from "@vendetta/metro"
 import { React, FluxDispatcher } from "@vendetta/metro/common"
 import { Forms } from "@vendetta/ui/components"
 import { storage } from "@vendetta/plugin";
@@ -11,12 +11,28 @@ const ChannelStore = findByProps("getChannel", "getDMFromUserId");
 const ChannelMessages = findByProps("_channelMessages");
 const MessageStore = findByProps('getMessage', 'getMessages');
 
+/* THIS Function Janky
+const altMessageStore = findByStoreName("MessageStore")
+const logs = altMessageStore._dispatcher.actionLogger.logs;
+
+function messageGetter(authorId) {
+    const allOcc = logs.filter(x => 
+        x?.action?.type === "MESSAGE_UPDATE" && 
+        x?.action?.message?.author?.id === authorId
+    );
+    
+    // Use .at(-1) for cleaner syntax, with a fallback to the old way
+    const lastEntry = allOcc.at(-1);
+    return lastEntry?.action?.message ?? null;
+}
+
+*/
 
 /*
-This forsaken File, ohhh maa gaaawd
+i kinda hated discord constant nugging the flux
 
 
-- Angelica
+- Angelw0lf
 */
 
 export default (deletedMessageArray) => before("dispatch", FluxDispatcher, (args) => {
@@ -94,26 +110,40 @@ export default (deletedMessageArray) => before("dispatch", FluxDispatcher, (args
 
 	// Message Update Patch
 	if( type == "MESSAGE_UPDATE" ) {
+		// console.log(event)
 		if(storage.switches.enableMU == false) return args;
 
 		if(event?.otherPluginBypass) return args;
 
 		if(event?.message?.author?.bot) return args;
 
-		const originalMessage = MessageStore.getMessage(
-          (event?.message?.channel_id || event?.channelId), 
-          (event?.message?.id || event?.id)
-        );
+		const channelId = event?.message?.channel_id ?? event?.channelId;
+		const messageId = event?.message?.id ?? event?.id;
+
+		let originalMessage = null;
+
+		// first use existing getter;
+		if (channelId && messageId) {
+		    originalMessage = MessageStore.getMessage(channelId, messageId);
+		    
+			if(!originalMessage) {			
+				const channel = ChannelMessages.get(channelId);
+				originalMessage = channel?.get(messageId);	
+			}
+		}
+
+		// console.log(event?.message?.content)
+		// console.log(originalMessage?.content)
+
+		// if still doesnt exist then just bypass
+        if(!originalMessage) return	args;
 
-		const OMCheck1 = originalMessage?.author?.id;
-		const OMCheck2 = originalMessage?.author?.username;
-		const OMCheck3 = (!originalMessage?.content && originalMessage?.attachments?.length == 0 && originalMessage?.embeds?.length == 0);
-		
-		if(!originalMessage || !OMCheck1 || !OMCheck2 || OMCheck3) return args;
+		if (!originalMessage.author?.id || !originalMessage.author?.username) return args;
+		if (!originalMessage.content && originalMessage.attachments?.length === 0 && originalMessage.embeds?.length === 0) return args;
 
-		if(!event?.message?.content || !originalMessage?.content) return args;
+		if(!event?.message?.content) return args;
 
-		if(event?.message?.content == originalMessage?.content) return args;		
+		if(event?.message?.content == originalMessage?.content) return args;
 
 		if(
 			(storage?.inputs?.ignoredUserList?.length > 0) &&

angel/antied/patches/update_rows.js

@@ -3,33 +3,49 @@ import { before } from "@vendetta/patcher";
 import { storage } from "@vendetta/plugin";
 import { findByProps } from '@vendetta/metro';
 
-// const { DCDChatManager } = ReactNative.NativeModules;
-const rowsController = findByProps("updateRows", "getConstants")
-
+const rowsController = findByProps("updateRows", "getConstants") || findByProps("updateRows");
 
 /*
-	Time wasted: 3 hours 10 minutes
+	Time wasted: 3 hours 25 minutes
 */
 
-// export default (deletedMessagesArray) => before("updateRows", DCDChatManager, (r) => {
-// Should Support newer versions
 // Function consist of (num_1, args, bool_1, num_2, num_3)
 export default (deletedMessagesArray) => before("updateRows", rowsController, (r) => {
-	
-	// added this in 1.4.2 basically for safe guard against "cannot convert undefined value to object"
-    if (!r || r.length <= 1 || typeof r[1] !== "string") {
+
+	// safe guard if r returns undefined, but then again rowsController might be undefined
+	// if it happens then "Cannot convert undefined value to object" error would occour and should be in updateRowsPatch function
+    if (!r || r.length < 1) {
         return r;
     }
 
+    let isDirect = false;
     let rows;
 
-    try {
-        rows = JSON.parse(r[1]);
-    } catch (e) {
-		// another safeguard for if said r[1] is empty string or invalid stringified JSON
-        console.error("JSON Parse failed in updateRows patch. Aborting.", e);
-        return r;
-    }
+	if (typeof r[1] == 'string') {
+		// handle stringified object, happens in Stable Build
+	    try {
+	        rows = JSON.parse(r[1]);
+	    } catch (e) {
+	        console.log("[ANTIED:updateRowsPatch] JSON Parse failed in updateRows patch. Aborting.", e, "Input:", r[1]);
+	        return r;
+	    }
+	}
+    else if (typeof r[1] == 'object' && r[1]) {
+    	// handle Direct Object, happens in Alpha Build
+	    rows = r[1]; 
+	    isDirect = true;
+	}
+	else {
+		// fallback if not object nor stringified object
+	    console.log("[ANTIED:updateRowsPatch] Unexpected type for r[1] in updateRows. Expected object or string, got:", typeof r[1]);
+	    return r;
+	}
+
+	if(storage?.debugUpdateRows) {
+		console.log("BEFORE")
+		console.log(isDirect)
+	  	console.log(rows)
+	}
 
 	const { textColor, backgroundColor, backgroundColorAlpha, gutterColor, gutterColorAlpha } = storage.colors;
 	const { 
@@ -160,12 +176,23 @@ export default (deletedMessagesArray) => before("updateRows", rowsController, (r
 		}
 	})
 
+	if(storage?.debugUpdateRows) {
+		console.log("AFTER")
+		console.log(isDirect)
+	  	console.log(rows)
+	}
+
 
 	// simple safeguard if modification is faulty, we didnt push the modified rows
 	try {
-        r[1] = JSON.stringify(rows);
+		if(isDirect) {
+			r[1] = rows;
+		}
+		else {
+        	r[1] = JSON.stringify(rows);
+		}
     } catch (e) {
-        console.error("Failed to stringify modified rows. Aborting.", e);
+        console.log("[ANTIED:updateRowsPatch] Failed to stringify modified rows. Aborting.", e);
         return r; // we return as is
     }