@xuda.io/account_module 1.2.1271 → 1.2.1273
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.mjs +11 -25
- package/package.json +1 -1
package/index.mjs
CHANGED
|
@@ -1198,11 +1198,8 @@ export const merge_contact = async function (req) {
|
|
|
1198
1198
|
}
|
|
1199
1199
|
|
|
1200
1200
|
// get the primary account
|
|
1201
|
-
|
|
1202
|
-
|
|
1203
|
-
return primary_contact_ret;
|
|
1204
|
-
}
|
|
1205
|
-
var primary_contact_doc = primary_contact_ret.data;
|
|
1201
|
+
|
|
1202
|
+
var primary_contact_doc = await get_contact(uid, contact_to_merge);
|
|
1206
1203
|
|
|
1207
1204
|
primary_contact_doc.stat_ts = Date.now();
|
|
1208
1205
|
primary_contact_doc.stat_reason = 'merge';
|
|
@@ -1216,16 +1213,13 @@ export const merge_contact = async function (req) {
|
|
|
1216
1213
|
const primary_contact_save_ret = await db_module.save_couch_doc('xuda_contacts', primary_contact_doc);
|
|
1217
1214
|
|
|
1218
1215
|
for (let contact_id of contact_to_delete) {
|
|
1219
|
-
|
|
1220
|
-
|
|
1221
|
-
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
|
|
1225
|
-
|
|
1226
|
-
contact_doc.stat_ts = Date.now();
|
|
1227
|
-
contact_doc.stat_reason = 'merge';
|
|
1228
|
-
await db_module.save_couch_doc('xuda_contacts', contact_doc);
|
|
1216
|
+
try {
|
|
1217
|
+
var contact_doc = await get_contact(uid, contact_id);
|
|
1218
|
+
contact_doc.stat = 4;
|
|
1219
|
+
contact_doc.stat_ts = Date.now();
|
|
1220
|
+
contact_doc.stat_reason = 'merge';
|
|
1221
|
+
await db_module.save_couch_doc('xuda_contacts', contact_doc);
|
|
1222
|
+
} catch (error) {}
|
|
1229
1223
|
}
|
|
1230
1224
|
|
|
1231
1225
|
return primary_contact_save_ret; //{ code: 1, data: duplicate_arr };
|
|
@@ -2435,11 +2429,7 @@ export const unfriend_contact = async function (req) {
|
|
|
2435
2429
|
export const pin_contact = async function (req) {
|
|
2436
2430
|
const { uid, contact_id } = req;
|
|
2437
2431
|
try {
|
|
2438
|
-
|
|
2439
|
-
if (contact_ret.code < 0) {
|
|
2440
|
-
return contact_ret;
|
|
2441
|
-
}
|
|
2442
|
-
var contact_doc = contact_ret.data;
|
|
2432
|
+
var contact_doc = await get_contact(uid, contact_id);
|
|
2443
2433
|
contact_doc.pinned = true;
|
|
2444
2434
|
|
|
2445
2435
|
const contact_save_ret = await db_module.save_couch_doc('xuda_contacts', contact_doc);
|
|
@@ -2470,11 +2460,7 @@ export const pin_contact = async function (req) {
|
|
|
2470
2460
|
export const unpin_contact = async function (req) {
|
|
2471
2461
|
const { contact_id, uid } = req;
|
|
2472
2462
|
try {
|
|
2473
|
-
|
|
2474
|
-
if (contact_ret.code < 0) {
|
|
2475
|
-
return contact_ret;
|
|
2476
|
-
}
|
|
2477
|
-
var contact_doc = contact_ret.data;
|
|
2463
|
+
var contact_doc = await get_contact(uid, contact_id);
|
|
2478
2464
|
contact_doc.pinned = false;
|
|
2479
2465
|
|
|
2480
2466
|
const contact_save_ret = await db_module.save_couch_doc('xuda_contacts', contact_doc);
|