@xuda.io/account_module 1.2.1514 → 1.2.1516

package/index.mjs

@@ -2198,6 +2198,7 @@ const set_contact_profile_picture = async function (uid, contact_id, metadata, j
     if (!contact_obj.profile_avatar) {
       const cache = await get_picture_cache(uid, 'profile_avatar', contact_obj.email, contact_obj.name);
       let file_ret = { code: 1, data: cache };
+
       if (!cache) {
         file_ret = await ai_module.get_profile_avatar(
           contact_obj.profile_picture,
@@ -2214,6 +2215,8 @@ const set_contact_profile_picture = async function (uid, contact_id, metadata, j
           job_id,
           headers,
         );
+        save_picture_cache(uid, 'profile_avatar', contact_obj.name, file_ret.data, { account_type: contact_obj.account_type, type: 'contact' });
+        save_picture_cache(uid, 'profile_avatar', contact_obj.email, file_ret.data, { account_type: contact_obj.account_type, type: 'contact' });
       }
       if (file_ret.code < 0) {
         throw new Error(file_ret.data);
@@ -2223,8 +2226,7 @@ const set_contact_profile_picture = async function (uid, contact_id, metadata, j
       contact_obj = contact_obj3;
       contact_obj.profile_avatar_obj = file_ret.data;
       contact_obj.profile_avatar = contact_obj.profile_avatar_obj.file_url;
-      save_picture_cache(uid, 'profile_avatar', contact_obj.name, contact_obj.profile_avatar_obj, { account_type: contact_obj.account_type, type: 'contact' });
-      save_picture_cache(uid, 'profile_avatar', contact_obj.email, contact_obj.profile_avatar_obj, { account_type: contact_obj.account_type, type: 'contact' });
+
       const contact_save_ret = await db_module.save_app_couch_doc(account_profile_info.app_id, contact_obj);
       await update_contact_profile_picture_status(uid, contact_id, 3);
     }
@@ -3060,100 +3062,20 @@ export const save_picture_cache = async function (uid, docType, name, file, meta
   return save_ret;
 };
 
-// export const get_picture_cache = async function (uid, docType, name) {
-//   let opt = { selector: { docType, name }, limit: 1 };
-
-//   const ret = await db_module.find_couch_query('xuda_cache', opt);
-
-//   if (ret.docs.length) {
-//     return ret.docs[0].file;
-//   }
-
-//   function findAnyThreeWords(str) {
-//     // 1. Extract all words (letters + digits + underscore)
-//     const words = str.match(/\b\w+\b/g) || [];
-
-//     // 2. If less than 3 words → no match
-//     if (words.length < 3) return [];
-
-//     // 3. Generate all possible combinations of 3 different words
-//     const result = [];
-
-//     for (let i = 0; i < words.length - 2; i++) {
-//       for (let j = i + 1; j < words.length - 1; j++) {
-//         for (let k = j + 1; k < words.length; k++) {
-//           result.push([words[i], words[j], words[k]]);
-//         }
-//       }
-//     }
-
-//     // Optional: format as strings in any order you like
-//     return result.map((arr) => arr.join(' '));
-//   }
-//   if (name.split(' ').length < 3) return;
-//   let file;
-//   const words_combinations_arr = findAnyThreeWords(name);
-
-//   for await (const phrase of words_combinations_arr) {
-//     const words_arr = phrase.split(' ');
-//     opt.selector = { docType, $and: [{ name: { $regex: `(?i)\\b${words_arr[0]}\\b` } }, { name: { $regex: `(?i)\\b${words_arr[1]}\\b` } }, { name: { $regex: `(?i)\\b${words_arr[2]}\\b` } }] };
-//     const ret = await db_module.find_couch_query('xuda_cache', opt);
-//     if (ret.docs.length) {
-//       file = ret.docs[0].file;
-//       break;
-//     }
-//   }
-//   return file;
-// };
-
-export const get_picture_cache = async function (uid, docType, name) {
-  if (!name || typeof name !== 'string') return null;
-
-  const words = name
-    .trim()
-    .toLowerCase()
-    .split(/\s+/)
-    .filter((w) => w.length > 1); // ignore very short words
-
-  if (words.length < 3) {
-    // Direct exact match for short names
-    const ret = await db_module.find_couch_query('xuda_cache', {
-      selector: { docType, name: name.trim() },
-      limit: 1,
-    });
-
+export const get_picture_cache = async function (uid, docType, name, email) {
+  let ret = await db_module.find_couch_query('xuda_cache', {
+    selector: { docType, name: email.trim() },
+    limit: 1,
+  });
+  if (ret.docs.length) {
     return ret.docs[0]?.file ?? null;
   }
 
-  // Try combinations of 3 words — but **limit** the number of attempts
-  const MAX_ATTEMPTS = 15; // prevent explosion on long names
-  const combinations = [];
-
-  for (let i = 0; i < words.length - 2 && combinations.length < MAX_ATTEMPTS; i++) {
-    for (let j = i + 1; j < words.length - 1 && combinations.length < MAX_ATTEMPTS; j++) {
-      for (let k = j + 1; k < words.length && combinations.length < MAX_ATTEMPTS; k++) {
-        combinations.push([words[i], words[j], words[k]]);
-      }
-    }
-  }
-
-  for (const threeWords of combinations) {
-    const query = {
-      selector: {
-        docType,
-        $and: threeWords.map((word) => ({
-          name: { $regex: `(?i)\\b${word}\\b` },
-        })),
-      },
-      limit: 1,
-    };
-
-    const ret = await db_module.find_couch_query('xuda_cache', query);
-
-    if (ret.docs.length > 0) {
-      return ret.docs[0].file;
-    }
+  ret = await db_module.find_couch_query('xuda_cache', {
+    selector: { docType, name: name.trim() },
+    limit: 1,
+  });
+  if (ret.docs.length) {
+    return ret.docs[0]?.file ?? null;
   }
-
-  return null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.1514",
+  "version": "1.2.1516",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {