@juzi/wechaty-puppet-whatsapp 1.0.54 → 1.0.55

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.
Files changed (25) hide show
  1. package/dist/cjs/src/package-json.js +1 -1
  2. package/dist/cjs/src/puppet-mixin/contact.d.ts +1 -1
  3. package/dist/cjs/src/puppet-mixin/contact.d.ts.map +1 -1
  4. package/dist/cjs/src/puppet-mixin/contact.js +2 -13
  5. package/dist/cjs/src/puppet-mixin/contact.js.map +1 -1
  6. package/dist/cjs/src/puppet-mixin/friendship.d.ts.map +1 -1
  7. package/dist/cjs/src/puppet-mixin/friendship.js +9 -5
  8. package/dist/cjs/src/puppet-mixin/friendship.js.map +1 -1
  9. package/dist/cjs/src/puppet-mixin/message.js +1 -1
  10. package/dist/cjs/src/puppet-mixin/message.js.map +1 -1
  11. package/dist/esm/src/package-json.js +1 -1
  12. package/dist/esm/src/puppet-mixin/contact.d.ts +1 -1
  13. package/dist/esm/src/puppet-mixin/contact.d.ts.map +1 -1
  14. package/dist/esm/src/puppet-mixin/contact.js +2 -13
  15. package/dist/esm/src/puppet-mixin/contact.js.map +1 -1
  16. package/dist/esm/src/puppet-mixin/friendship.d.ts.map +1 -1
  17. package/dist/esm/src/puppet-mixin/friendship.js +9 -5
  18. package/dist/esm/src/puppet-mixin/friendship.js.map +1 -1
  19. package/dist/esm/src/puppet-mixin/message.js +1 -1
  20. package/dist/esm/src/puppet-mixin/message.js.map +1 -1
  21. package/package.json +1 -1
  22. package/src/package-json.ts +1 -1
  23. package/src/puppet-mixin/contact.ts +2 -12
  24. package/src/puppet-mixin/friendship.ts +9 -6
  25. package/src/puppet-mixin/message.ts +1 -1
package/dist/cjs/src/package-json.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.packageJson = void 0;
4
4
  exports.packageJson = {
5
5
  "name": "@juzi/wechaty-puppet-whatsapp",
6
- "version": "1.0.54",
6
+ "version": "1.0.55",
7
7
  "description": "Wechaty Puppet for WhatsApp",
8
8
  "type": "module",
9
9
  "exports": {
package/dist/cjs/src/puppet-mixin/contact.d.ts CHANGED
@@ -11,6 +11,6 @@ export declare function contactDescription(this: PuppetWhatsApp, contactId: stri
11
11
  export declare function contactList(this: PuppetWhatsApp): Promise<string[]>;
12
12
  export declare function contactAvatar(this: PuppetWhatsApp, contactId: string): Promise<FileBox>;
13
13
  export declare function contactAvatar(this: PuppetWhatsApp, contactId: string, file: FileBox): Promise<void>;
14
- export declare function contactRawPayload(this: PuppetWhatsApp, id: string, saveTempContact?: boolean): Promise<WhatsAppContactPayload>;
14
+ export declare function contactRawPayload(this: PuppetWhatsApp, id: string, forceSync?: boolean): Promise<WhatsAppContactPayload>;
15
15
  export declare function contactRawPayloadParser(this: PuppetWhatsApp, contactPayload: WhatsAppContactPayload): Promise<PUPPET.payloads.Contact>;
16
16
  //# sourceMappingURL=contact.d.ts.map
package/dist/cjs/src/puppet-mixin/contact.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EACL,OAAO,EAER,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAOxE,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAMjH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;AAC9F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAe/G,wBAAsB,wBAAwB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAGjH;AAED,wBAAsB,kBAAkB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAGrG;AAED,wBAAsB,WAAW,CAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAK1E;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAC9F,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAoB1G,wBAAsB,iBAAiB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAwBnI;AAED,wBAAsB,uBAAuB,CAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAU7I"}
1
+ {"version":3,"file":"contact.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EACL,OAAO,EAER,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAOxE,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAMjH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;AAC9F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAe/G,wBAAsB,wBAAwB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAGjH;AAED,wBAAsB,kBAAkB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAGrG;AAED,wBAAsB,WAAW,CAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAK1E;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAC9F,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAoB1G,wBAAsB,iBAAiB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAc7H;AAED,wBAAsB,uBAAuB,CAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAU7I"}
package/dist/cjs/src/puppet-mixin/contact.js CHANGED
@@ -89,28 +89,17 @@ async function contactAvatar(contactId, file) {
89
89
  }
90
90
  }
91
91
  exports.contactAvatar = contactAvatar;
92
- async function contactRawPayload(id, saveTempContact = false) {
92
+ async function contactRawPayload(id, forceSync = false) {
93
93
  config_js_1.log.verbose(PRE, 'contactRawPayload(%s)', id);
94
94
  if (!(0, miscellaneous_js_1.isContactId)(id)) {
95
95
  throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id} again.`);
96
96
  }
97
97
  const cacheManager = await this.manager.getCacheManager();
98
98
  let contact = await cacheManager.getContactOrRoomRawPayload(id);
99
- if (contact) {
100
- if (saveTempContact) {
101
- contact.isMyContact = true;
102
- contact.isUser = true;
103
- await cacheManager.setContactOrRoomRawPayload(id, contact);
104
- }
105
- }
106
- else {
99
+ if (!contact || forceSync) {
107
100
  const rawContact = await this.manager.getContactById(id);
108
101
  const avatar = await rawContact.getProfilePicUrl() || '';
109
102
  contact = Object.assign(rawContact, { avatar });
110
- if (saveTempContact) {
111
- contact.isMyContact = true;
112
- contact.isUser = true;
113
- }
114
103
  await cacheManager.setContactOrRoomRawPayload(id, contact);
115
104
  }
116
105
  return contact;
package/dist/cjs/src/puppet-mixin/contact.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,6DAA8C;AAE9C,4CAGqB;AACrB,8DAA0D;AAC1D,uFAAoD;AAGpD,iEAAwD;AAExD,yGAA+F;AAE/F,MAAM,GAAG,GAAG,eAAe,CAAA;AAIpB,KAAK,UAAU,YAAY,CAAwB,SAAiB,EAAE,KAAqB;IAChG,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,sBAAsB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAC1D,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAHD,oCAGC;AAKM,KAAK,UAAU,YAAY,CAAwB,SAAiB,EAAE,SAAoB;IAC/F,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;IAC9D,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE;QACpC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAA;QACxE,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,OAAQ,CAAC,MAAM,CAAC,CAAA;SACzB;aAAM;YACL,OAAO,EAAE,CAAA;SACV;KACF;AACH,CAAC;AAXD,oCAWC;AAEM,KAAK,UAAU,wBAAwB,CAAwB,SAAiB,EAAE,iBAAyB;IAChH,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,kCAAkC,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAClF,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAHD,4DAGC;AAEM,KAAK,UAAU,kBAAkB,CAAwB,SAAiB,EAAE,WAAmB;IACpG,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;IACtE,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAHD,gDAGC;AAEM,KAAK,UAAU,WAAW;IAC/B,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;IACjC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IACzD,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAA;IAC3D,OAAO,aAAa,CAAA;AACtB,CAAC;AALD,kCAKC;AAKM,KAAK,UAAU,aAAa,CAAwB,SAAiB,EAAE,IAAc;IAC1F,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAA;IAEhD,IAAI,IAAI,EAAE;QACR,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;KACtC;IACD,IAAI,MAAM,GAAW,EAAE,CAAA;IACvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IACxD,IAAI;QACF,MAAM,GAAG,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAA;KACtC;IAAC,OAAO,GAAG,EAAE;QACZ,eAAG,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,EAAE,SAAS,EAAG,GAAa,CAAC,OAAO,CAAC,CAAA;KAChF;IACD,IAAI,MAAM,EAAE;QACV,OAAO,mBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;KAC/B;AACH,CAAC;AAhBD,sCAgBC;AAEM,KAAK,UAAU,iBAAiB,CAAwB,EAAU,EAAE,eAAe,GAAG,KAAK;IAChG,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAA;IAC7C,IAAI,CAAC,IAAA,8BAAW,EAAC,EAAE,CAAC,EAAE;QACpB,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,SAAS,CAAC,CAAA;KAC5F;IACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IACzD,IAAI,OAAO,GAAG,MAAM,YAAY,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAA;IAC/D,IAAI,OAAO,EAAE;QACX,IAAI,eAAe,EAAE;YACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAA;YAC1B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAA;YACrB,MAAM,YAAY,CAAC,0BAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;SAC3D;KACF;SAAM;QACL,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;QACxD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAA;QACxD,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC/C,IAAI,eAAe,EAAE;YACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAA;YAC1B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAA;SACtB;QACD,MAAM,YAAY,CAAC,0BAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;KAC3D;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAxBD,8CAwBC;AAEM,KAAK,UAAU,uBAAuB,CAAwB,cAAsC;IACzG,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAA;QAC/D,MAAM,MAAM,GAAG,IAAA,uDAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QAChE,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,wDAAwD,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAClI,OAAO,MAAM,CAAA;KACd;IAAC,OAAO,KAAK,EAAE;QACd,eAAG,CAAC,KAAK,CAAC,GAAG,EAAE,2BAA2B,cAAc,CAAC,EAAE,CAAC,WAAW,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;QAC9H,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,qBAAqB,EAAE,2BAA2B,cAAc,CAAC,EAAE,CAAC,WAAW,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;KACnK;AACH,CAAC;AAVD,0DAUC"}
1
+ {"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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"}
package/dist/cjs/src/puppet-mixin/friendship.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAI1D,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjG;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE7G;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAQxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GACzC,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAKf"}
1
+ {"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAI1D,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjG;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE7G;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAQxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GACzC,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAOf"}
package/dist/cjs/src/puppet-mixin/friendship.js CHANGED
@@ -83,9 +83,11 @@ async function friendshipAdd(contactId, option) {
83
83
  if (!isUser) {
84
84
  throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`);
85
85
  }
86
- const contactPayload = await this.contactRawPayload(contactId);
87
- const contactPhone = contactId.split('@')[0] || '';
88
- await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
86
+ const contactPayload = await this.contactRawPayload(contactId, true);
87
+ if (!contactPayload.isMyContact) {
88
+ const contactPhone = contactId.split('@')[0] || '';
89
+ await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
90
+ }
89
91
  if (hello) {
90
92
  await this.messageSendText(contactId, hello);
91
93
  }
@@ -94,8 +96,10 @@ exports.friendshipAdd = friendshipAdd;
94
96
  async function friendshipAccept(friendshipId) {
95
97
  const friendshipPayload = await this.friendshipRawPayload(friendshipId);
96
98
  const contactPhone = friendshipPayload.contactId.split('@')[0] || '';
97
- const contactPayload = await this.contactRawPayload(friendshipPayload.contactId);
98
- await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
99
+ const contactPayload = await this.contactRawPayload(friendshipPayload.contactId, true);
100
+ if (!contactPayload.isMyContact) {
101
+ await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
102
+ }
99
103
  }
100
104
  exports.friendshipAccept = friendshipAccept;
101
105
  //# sourceMappingURL=friendship.js.map
package/dist/cjs/src/puppet-mixin/friendship.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
package/dist/cjs/src/puppet-mixin/message.js CHANGED
@@ -266,7 +266,7 @@ async function messageChannel(messageId) {
266
266
  }
267
267
  exports.messageChannel = messageChannel;
268
268
  async function messageSend(conversationId, content, options, timeout = config_js_1.DEFAULT_TIMEOUT.MESSAGE_SEND) {
269
- config_js_1.log.verbose(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
269
+ config_js_1.log.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
270
270
  void timeout;
271
271
  void request_pool_js_1.RequestPool;
272
272
  const msg = await this.manager.sendMessage(conversationId, content, options);
package/dist/cjs/src/puppet-mixin/message.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/package-json.js CHANGED
@@ -1,6 +1,6 @@
1
1
  export const packageJson = {
2
2
  "name": "@juzi/wechaty-puppet-whatsapp",
3
- "version": "1.0.54",
3
+ "version": "1.0.55",
4
4
  "description": "Wechaty Puppet for WhatsApp",
5
5
  "type": "module",
6
6
  "exports": {
package/dist/esm/src/puppet-mixin/contact.d.ts CHANGED
@@ -11,6 +11,6 @@ export declare function contactDescription(this: PuppetWhatsApp, contactId: stri
11
11
  export declare function contactList(this: PuppetWhatsApp): Promise<string[]>;
12
12
  export declare function contactAvatar(this: PuppetWhatsApp, contactId: string): Promise<FileBox>;
13
13
  export declare function contactAvatar(this: PuppetWhatsApp, contactId: string, file: FileBox): Promise<void>;
14
- export declare function contactRawPayload(this: PuppetWhatsApp, id: string, saveTempContact?: boolean): Promise<WhatsAppContactPayload>;
14
+ export declare function contactRawPayload(this: PuppetWhatsApp, id: string, forceSync?: boolean): Promise<WhatsAppContactPayload>;
15
15
  export declare function contactRawPayloadParser(this: PuppetWhatsApp, contactPayload: WhatsAppContactPayload): Promise<PUPPET.payloads.Contact>;
16
16
  //# sourceMappingURL=contact.d.ts.map
package/dist/esm/src/puppet-mixin/contact.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EACL,OAAO,EAER,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAOxE,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAMjH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;AAC9F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAe/G,wBAAsB,wBAAwB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAGjH;AAED,wBAAsB,kBAAkB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAGrG;AAED,wBAAsB,WAAW,CAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAK1E;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAC9F,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAoB1G,wBAAsB,iBAAiB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAwBnI;AAED,wBAAsB,uBAAuB,CAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAU7I"}
1
+ {"version":3,"file":"contact.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EACL,OAAO,EAER,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAOxE,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAMjH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;AAC9F,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAe/G,wBAAsB,wBAAwB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAGjH;AAED,wBAAsB,kBAAkB,CAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAGrG;AAED,wBAAsB,WAAW,CAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAK1E;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAC9F,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAoB1G,wBAAsB,iBAAiB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAc7H;AAED,wBAAsB,uBAAuB,CAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAU7I"}
package/dist/esm/src/puppet-mixin/contact.js CHANGED
@@ -54,28 +54,17 @@ export async function contactAvatar(contactId, file) {
54
54
  return FileBox.fromUrl(avatar);
55
55
  }
56
56
  }
57
- export async function contactRawPayload(id, saveTempContact = false) {
57
+ export async function contactRawPayload(id, forceSync = false) {
58
58
  log.verbose(PRE, 'contactRawPayload(%s)', id);
59
59
  if (!isContactId(id)) {
60
60
  throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id} again.`);
61
61
  }
62
62
  const cacheManager = await this.manager.getCacheManager();
63
63
  let contact = await cacheManager.getContactOrRoomRawPayload(id);
64
- if (contact) {
65
- if (saveTempContact) {
66
- contact.isMyContact = true;
67
- contact.isUser = true;
68
- await cacheManager.setContactOrRoomRawPayload(id, contact);
69
- }
70
- }
71
- else {
64
+ if (!contact || forceSync) {
72
65
  const rawContact = await this.manager.getContactById(id);
73
66
  const avatar = await rawContact.getProfilePicUrl() || '';
74
67
  contact = Object.assign(rawContact, { avatar });
75
- if (saveTempContact) {
76
- contact.isMyContact = true;
77
- contact.isUser = true;
78
- }
79
68
  await cacheManager.setContactOrRoomRawPayload(id, contact);
80
69
  }
81
70
  return contact;
package/dist/esm/src/puppet-mixin/contact.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/puppet-mixin/friendship.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAI1D,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjG;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE7G;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAQxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GACzC,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAKf"}
1
+ {"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAI1D,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjG;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE7G;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAQxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GACzC,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAOf"}
package/dist/esm/src/puppet-mixin/friendship.js CHANGED
@@ -49,9 +49,11 @@ export async function friendshipAdd(contactId, option) {
49
49
  if (!isUser) {
50
50
  throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`);
51
51
  }
52
- const contactPayload = await this.contactRawPayload(contactId);
53
- const contactPhone = contactId.split('@')[0] || '';
54
- await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
52
+ const contactPayload = await this.contactRawPayload(contactId, true);
53
+ if (!contactPayload.isMyContact) {
54
+ const contactPhone = contactId.split('@')[0] || '';
55
+ await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
56
+ }
55
57
  if (hello) {
56
58
  await this.messageSendText(contactId, hello);
57
59
  }
@@ -59,7 +61,9 @@ export async function friendshipAdd(contactId, option) {
59
61
  export async function friendshipAccept(friendshipId) {
60
62
  const friendshipPayload = await this.friendshipRawPayload(friendshipId);
61
63
  const contactPhone = friendshipPayload.contactId.split('@')[0] || '';
62
- const contactPayload = await this.contactRawPayload(friendshipPayload.contactId);
63
- await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
64
+ const contactPayload = await this.contactRawPayload(friendshipPayload.contactId, true);
65
+ if (!contactPayload.isMyContact) {
66
+ await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true);
67
+ }
64
68
  }
65
69
  //# sourceMappingURL=friendship.js.map
package/dist/esm/src/puppet-mixin/friendship.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,OAAO,MAAM,gCAAgC,CAAA;AAEpD,OAA2B,+BAA+B,CAAA;AAE1D,MAAM,GAAG,GAAG,kBAAkB,CAAA;AAE9B,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAwB,EAAU;IAC1E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IAClD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAA;IAC1D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,OAAO,CAAC,aAAa,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;KAC9F;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAE,UAAsB;IACtE,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAEzC,KAAa;IAEb,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACpD,MAAM,SAAS,GAAG,GAAG,KAAK,OAAO,CAAA;IACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,OAAO,CAAC,aAAa,CAAC,qBAAqB,EAAE,oCAAoC,EAAE,cAAc,SAAS,EAAE,CAAC,CAAA;KACpH;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAEjC,SAAiB,EACjB,MAA0C;IAE1C,IAAI,KAAK,GAAW,EAAE,CAAA;IACtB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;QAChC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAA;KAC3B;SAAM;QACL,KAAK,GAAG,MAAM,IAAI,EAAE,CAAA;KACrB;IAED,uCAAuC;IACvC,4BAA4B;IAC5B,oDAAoD;IACpD,IAAI;IAEJ,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,OAAO,CAAC,aAAa,CAAC,qBAAqB,EAAE,oCAAoC,EAAE,cAAc,SAAS,EAAE,CAAC,CAAA;KACpH;IAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IAE9D,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAClD,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,4BAA4B,CAAC,YAAY,EAAE,cAAc,CAAC,QAAQ,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAE1H,IAAI,KAAK,EAAE;QACT,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;KAC7C;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAEpC,YAAoB;IAEpB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IAChF,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,4BAA4B,CAAC,YAAY,EAAE,cAAc,CAAC,QAAQ,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;AAC5H,CAAC"}
1
+ {"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/puppet-mixin/message.js CHANGED
@@ -229,7 +229,7 @@ export async function messageChannel(messageId) {
229
229
  return PUPPET.throwUnsupportedError();
230
230
  }
231
231
  export async function messageSend(conversationId, content, options, timeout = DEFAULT_TIMEOUT.MESSAGE_SEND) {
232
- log.verbose(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
232
+ log.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
233
233
  void timeout;
234
234
  void RequestPool;
235
235
  const msg = await this.manager.sendMessage(conversationId, content, options);
package/dist/esm/src/puppet-mixin/message.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juzi/wechaty-puppet-whatsapp",
3
- "version": "1.0.54",
3
+ "version": "1.0.55",
4
4
  "description": "Wechaty Puppet for WhatsApp",
5
5
  "type": "module",
6
6
  "exports": {
package/src/package-json.ts CHANGED
@@ -4,7 +4,7 @@
4
4
  import type { PackageJson } from 'type-fest'
5
5
  export const packageJson: PackageJson = {
6
6
  "name": "@juzi/wechaty-puppet-whatsapp",
7
- "version": "1.0.54",
7
+ "version": "1.0.55",
8
8
  "description": "Wechaty Puppet for WhatsApp",
9
9
  "type": "module",
10
10
  "exports": {
package/src/puppet-mixin/contact.ts CHANGED
@@ -76,27 +76,17 @@ export async function contactAvatar (this: PuppetWhatsApp, contactId: string, fi
76
76
  }
77
77
  }
78
78
 
79
- export async function contactRawPayload (this: PuppetWhatsApp, id: string, saveTempContact = false): Promise<WhatsAppContactPayload> {
79
+ export async function contactRawPayload (this: PuppetWhatsApp, id: string, forceSync = false): Promise<WhatsAppContactPayload> {
80
80
  log.verbose(PRE, 'contactRawPayload(%s)', id)
81
81
  if (!isContactId(id)) {
82
82
  throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id} again.`)
83
83
  }
84
84
  const cacheManager = await this.manager.getCacheManager()
85
85
  let contact = await cacheManager.getContactOrRoomRawPayload(id)
86
- if (contact) {
87
- if (saveTempContact) {
88
- contact.isMyContact = true
89
- contact.isUser = true
90
- await cacheManager.setContactOrRoomRawPayload(id, contact)
91
- }
92
- } else {
86
+ if (!contact || forceSync) {
93
87
  const rawContact = await this.manager.getContactById(id)
94
88
  const avatar = await rawContact.getProfilePicUrl() || ''
95
89
  contact = Object.assign(rawContact, { avatar })
96
- if (saveTempContact) {
97
- contact.isMyContact = true
98
- contact.isUser = true
99
- }
100
90
  await cacheManager.setContactOrRoomRawPayload(id, contact)
101
91
  }
102
92
  return contact
package/src/puppet-mixin/friendship.ts CHANGED
@@ -70,10 +70,11 @@ export async function friendshipAdd (
70
70
  throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`)
71
71
  }
72
72
 
73
- const contactPayload = await this.contactRawPayload(contactId)
74
-
75
- const contactPhone = contactId.split('@')[0] || ''
76
- await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true)
73
+ const contactPayload = await this.contactRawPayload(contactId, true)
74
+ if (!contactPayload.isMyContact) {
75
+ const contactPhone = contactId.split('@')[0] || ''
76
+ await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true)
77
+ }
77
78
 
78
79
  if (hello) {
79
80
  await this.messageSendText(contactId, hello)
@@ -86,6 +87,8 @@ export async function friendshipAccept (
86
87
  ): Promise<void> {
87
88
  const friendshipPayload = await this.friendshipRawPayload(friendshipId)
88
89
  const contactPhone = friendshipPayload.contactId.split('@')[0] || ''
89
- const contactPayload = await this.contactRawPayload(friendshipPayload.contactId)
90
- await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true)
90
+ const contactPayload = await this.contactRawPayload(friendshipPayload.contactId, true)
91
+ if (!contactPayload.isMyContact) {
92
+ await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || '', '', true)
93
+ }
91
94
  }
package/src/puppet-mixin/message.ts CHANGED
@@ -252,7 +252,7 @@ export async function messageChannel (this: PuppetWhatsApp, messageId: string):
252
252
  }
253
253
 
254
254
  export async function messageSend (this: PuppetWhatsApp, conversationId: string, content: MessageContent, options?: MessageSendOptions, timeout = DEFAULT_TIMEOUT.MESSAGE_SEND): Promise<string> {
255
- log.verbose(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options))
255
+ log.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options))
256
256
  void timeout
257
257
  void RequestPool
258
258