@xuda.io/account_module 1.2.408 → 1.2.410

package/index.mjs

@@ -1211,7 +1211,7 @@ export const get_contacts = async function (req) {
     });
 
     for await (let e of requests_to_res.docs) {
-      let doc = { docType: 'contact', date_created: e.team_req_date, email: [e.team_req_to_email], name: '', pending: true, contact_uid: e.team_req_to_uid, team_req_id: e._id };
+      let doc = { docType: 'contact', date_created: e.team_req_date, email: [e.team_req_to_email], name: '', pending: true, contact_uid: e.team_req_to_uid, team_req_id: e._id, team_req_from_uid };
 
       if (e.team_req_to_uid) {
         const account_ret = await get_account_name({ uid_query: e.team_req_to_uid });
@@ -1232,35 +1232,22 @@ export const get_contacts = async function (req) {
     for await (let e of requests_from_res.docs) {
       let doc = { docType: 'contact', date_created: e.team_req_date, email: [e.sender_account_info.email], name: '', pending: true, contact_uid: e.team_req_from_uid, team_req_id: e._id };
 
-      if (e.team_req_to_uid) {
-        const account_ret = await get_account_name({ uid_query: e.team_req_to_uid });
+      if (e.team_req_from_uid) {
+        const account_ret = await get_account_name({ uid_query: e.team_req_from_uid });
         if (account_ret.code < 0) {
           continue; // throw new Error(`account ${contact_uid} not found`);
         }
         doc.profile_avatar = account_ret.data.profile_avatar;
         doc.name = `${account_ret.data.first_name} ${account_ret.data.last_name}`;
       }
-      requests_to.docs.push(doc);
+      requests_from.docs.push(doc);
     }
   }
 
   return {
     code: 1,
     data: {
-      docs: [
-        ...requests_to.docs,
-        ...requests_from.docs.map((e) => ({
-          docType: 'contact',
-          date_created: e.team_req_date,
-          email: [e.sender_account_info.email],
-          name: `${e.sender_account_info.first_name} ${e.sender_account_info.last_name}`,
-          profile_avatar: e.sender_account_info.profile_avatar || _conf.anonymous_image_url,
-          pending: true,
-          team_req_from_uid: e.team_req_from_uid,
-          team_req_id: e._id,
-        })),
-        ...contacts.docs,
-      ],
+      docs: [...requests_to.docs, ...requests_from, ...contacts.docs],
     },
   };
 

package/package.json

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