Condensed isUserMsgAncestor() in chatgpt.getChatData()

Author: adamlui

chatgpt.js

@@ -934,30 +934,12 @@ const chatgpt = {
                             return reject(`🤖 chatgpt.js >> Message/response with index ${ msgToGet +1 }`
                                 + ` is out of bounds. Only ${userMessages.length} messages/responses exist!`)
 
-                        const isUserMessageAncestor = (messageId, targetUserId) => {
-                            let currentId = messageId;
-                            const maxDepth = 10; // Protection against infinite loops
-                            let depth = 0;
-                            while (currentId && depth < maxDepth) {
-                                const currentMessage = data[currentId];
-                                if (!currentMessage?.message) {
-                                    return false;
-                                }
-                                if (currentMessage.id === targetUserId) {
-                                    return true;
-                                }
-                                currentId = currentMessage.parent;
-                                depth++;
-                            }
-                            return false;
-                        };
-
                         // Fill [chatGPTMessages]
                         for (const userMessage of userMessages) {
                             let sub = []
                             for (const key in data) {
                                 if (data[key].message != null && data[key].message.author.role == 'assistant'
-                                    && isUserMessageAncestor(key, userMessage.id)) {
+                                    && isUserMsgAncestor(key, userMessage.id)) {
                                         sub.push(data[key].message)
                                 }
                             }
@@ -992,6 +974,17 @@ const chatgpt = {
                         return resolve(msgToGet == 'all' ? msgsToReturn // if 'all' passed, return array
                                      : msgToGet == 'latest' ? msgsToReturn[msgsToReturn.length - 1] // else if 'latest' passed, return latest
                                      : msgsToReturn[msgToGet] ) // else return element of array
+
+                        function isUserMsgAncestor(messageId, targetUserId) {
+                            let currentId = messageId ; const maxDepth = 10 ; let depth = 0
+                            while (currentId && depth < maxDepth) {
+                                const currentMsg = data[currentId]
+                                if (!currentMsg?.message) return false
+                                if (currentMsg.id == targetUserId) return true
+                                currentId = currentMsg.parent ; depth++
+                            }
+                            return false
+                        }
                     }
                     xhr.send()
         })})}