@xuda.io/account_module 1.2.882 → 1.2.883

package/index.mjs

@@ -1623,21 +1623,6 @@ export const get_contacts = async function (req) {
   let requests_from = { docs: [] };
   let shared_from = { docs: [] };
   let my_contact = { docs: [] };
-  if (!_id && with_requests) {
-    if (filter_type === 'pending') {
-      ////// TO - OUT
-      requests_to.docs = await get_pending_contact_out(uid);
-
-      ////// FROM - IN
-      requests_from.docs = await get_pending_contact_in(uid);
-      shared_from.docs = await get_pending_share_contact_in(uid);
-    }
-    // my contact
-    if (filter_type === 'all' && !search && contact_docs.docs.length) {
-      const my_contact_doc = await get_user_contact(uid, uid);
-      my_contact.docs = [my_contact_doc];
-    }
-  }
   let contact_docs = { docs: [] };
   for await (let doc of contacts.docs) {
     const ret_to = requests_to.docs.find((e) => {
@@ -1645,14 +1630,6 @@ export const get_contacts = async function (req) {
     });
     if (ret_to) continue;
 
-    // let reference_doc;
-    // if (doc.shared_from_uid) {
-    //   reference_doc = _.cloneDeep(doc);
-    //   doc = await db_module.get_couch_doc_native('xuda_contacts', reference_doc.share_item_id);
-    //   doc.reference_doc = reference_doc;
-    //   doc._id = reference_doc._id;
-    // }
-
     const ret_from = requests_from.docs.find((e) => {
       return e.contact_uid === doc.contact_uid;
     });
@@ -1662,6 +1639,22 @@ export const get_contacts = async function (req) {
     contact_docs.docs.push(doc);
   }
 
+  if (!_id && with_requests) {
+    if (filter_type === 'pending') {
+      ////// TO - OUT
+      requests_to.docs = await get_pending_contact_out(uid);
+
+      ////// FROM - IN
+      requests_from.docs = await get_pending_contact_in(uid);
+      shared_from.docs = await get_pending_share_contact_in(uid);
+    }
+    // my contact
+    if (filter_type === 'all' && !search && contact_docs.docs.length) {
+      const my_contact_doc = await get_user_contact(uid, uid);
+      my_contact.docs = [my_contact_doc];
+    }
+  }
+
   return {
     code: 1,
     data: {

package/package.json

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