fix: restore cross-message text search

5c62cf4a6ef7d3b73d9ac746c2b08e1ab026e8a9

Cohee <18619528+Cohee1207@users.noreply.github.com>

src/endpoints/chats.js+11 -7 Viewed

  * @param {ChatMatchFunction|null} matcher - Optional function to match messages
  * @returns {Promise<ChatInfo>}
+ *
- * @typedef {(text: string) => boolean} ChatMatchFunction
+ * @typedef {(textArray: string[]) => boolean} ChatMatchFunction
  */
 export async function getChatInfo(pathToFile, additionalData = {}, withMetadata = false, matcher = null) {
     return new Promise(async (res) => {

         let lastLine;
         let itemCounter = 0;
         let hasAnyMatch = false;
+        let matchBuffer = [];
         rl.on('line', (line) => {
             if (withMetadata && itemCounter === 0) {
                 const jsonData = tryParse(line);

             // Skip matching if any match was already found
             if (hasMatcher && !hasAnyMatch && itemCounter > 0) {
                 const jsonData = tryParse(line);
-                if (jsonData && matcher(jsonData.mes || '')) {
+                if (jsonData) {
-                    hasAnyMatch = true;
+                    matchBuffer.push(jsonData.mes || '');
+                    if (matcher(matchBuffer)) {
+                        hasAnyMatch = true;
+                        matchBuffer = [];
+                    }
+                }
+            }
             itemCounter++;

         const fragments = query ? query.trim().toLowerCase().split(/\s+/).filter(x => x) : [];
         /** @type {ChatMatchFunction} */
-        const hasTextMatch = (text) => {
+        const hasTextMatch = (textArray) => {
             if (fragments.length === 0) {
                 return true;
+            }
-            const loweredText = String(text).toLowerCase();
+            return fragments.every(fragment => textArray.some(text => String(text ?? '').toLowerCase().includes(fragment)));
-            return fragments.every(fragment => loweredText.includes(fragment));
         };
         for (const chatFile of chatFiles) {
             const matcher = query ? hasTextMatch : null;
             const chatInfo = await getChatInfo(chatFile, {}, false, matcher);
-            const hasMatch = hasTextMatch(chatInfo.file_id ?? '') || chatInfo.match;
+            const hasMatch = chatInfo.match || hasTextMatch([chatInfo.file_id ?? '']);
             // Skip corrupted or invalid chat files
             if (!chatInfo.file_name) {