@juzi/wechaty-puppet-whatsapp 1.0.51 → 1.0.53

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 (21) hide show
  1. package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.js +3 -3
  2. package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.js.map +1 -1
  3. package/dist/cjs/src/package-json.js +1 -1
  4. package/dist/cjs/src/puppet-mixin/message.d.ts.map +1 -1
  5. package/dist/cjs/src/puppet-mixin/message.js +7 -5
  6. package/dist/cjs/src/puppet-mixin/message.js.map +1 -1
  7. package/dist/cjs/src/whatsapp/event-handler/contact-event-handler.js +11 -11
  8. package/dist/cjs/src/whatsapp/event-handler/contact-event-handler.js.map +1 -1
  9. package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.js +3 -3
  10. package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.js.map +1 -1
  11. package/dist/esm/src/package-json.js +1 -1
  12. package/dist/esm/src/puppet-mixin/message.d.ts.map +1 -1
  13. package/dist/esm/src/puppet-mixin/message.js +7 -5
  14. package/dist/esm/src/puppet-mixin/message.js.map +1 -1
  15. package/dist/esm/src/whatsapp/event-handler/contact-event-handler.js +11 -11
  16. package/dist/esm/src/whatsapp/event-handler/contact-event-handler.js.map +1 -1
  17. package/package.json +1 -1
  18. package/src/helper/pure-function/contact-raw-payload-parser.ts +3 -3
  19. package/src/package-json.ts +1 -1
  20. package/src/puppet-mixin/message.ts +8 -5
  21. package/src/whatsapp/event-handler/contact-event-handler.ts +11 -11
package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.js CHANGED
@@ -39,9 +39,9 @@ function parserContactRawPayload(contactPayload, userName) {
39
39
  type = PUPPET.types.Contact.Unknown;
40
40
  }
41
41
  let name;
42
- const isFriend = contactPayload.isMyContact || contactPayload.isMe;
42
+ // const isFriend = contactPayload.isMyContact || contactPayload.isMe
43
43
  const additionalInfo = {
44
- status: isFriend ? contact_js_1.ContactStatus.FRIEND : contact_js_1.ContactStatus.NOT_FRIEND,
44
+ status: contact_js_1.ContactStatus.FRIEND,
45
45
  };
46
46
  if (contactPayload.isMe) {
47
47
  name = userName || contactPayload.pushname;
@@ -63,7 +63,7 @@ function parserContactRawPayload(contactPayload, userName) {
63
63
  const number = contactPayload.number || contactPayload.id.user;
64
64
  return {
65
65
  avatar: contactPayload.avatar,
66
- friend: isFriend,
66
+ friend: true,
67
67
  gender: PUPPET.types.ContactGender.Unknown,
68
68
  id: contactPayload.id._serialized,
69
69
  name: name || contactPayload.id._serialized,
package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,+CAAsD;AAGtD,wDAAuD;AAEvD,SAAgB,uBAAuB,CAAE,cAAsC,EAAE,QAAiB;IAChG,IAAI,IAAI,CAAA;IACR,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAA;KACvC;SAAM,IAAI,cAAc,CAAC,YAAY,EAAE;QACtC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAA;KACxC;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,IAAI,CAAA;IAER,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,IAAI,CAAA;IAElE,MAAM,cAAc,GAAQ;QAC1B,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,0BAAa,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAa,CAAC,UAAU;KACnE,CAAA;IAED,IAAI,cAAc,CAAC,IAAI,EAAE;QACvB,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAA;QAC1C,IAAI,IAAI,KAAK,gCAAoB,EAAE;YACjC,IAAI,GAAG,cAAc,CAAC,SAAS,CAAA;SAChC;QAED,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACrD,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACtD,cAAc,CAAC,QAAQ,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,CAAA;KAE7H;SAAM;QACL;;;;WAIG;QACH,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAA;KACtD;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,CAAA;IAE9D,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO;QAC1C,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW;QACjC,IAAI,EAAE,IAAI,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;QAC9C,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE;KAChH,CAAA;AACH,CAAC;AAnDD,0DAmDC"}
1
+ {"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,+CAAsD;AAGtD,wDAAuD;AAEvD,SAAgB,uBAAuB,CAAE,cAAsC,EAAE,QAAiB;IAChG,IAAI,IAAI,CAAA;IACR,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAA;KACvC;SAAM,IAAI,cAAc,CAAC,YAAY,EAAE;QACtC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAA;KACxC;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,IAAI,CAAA;IAER,qEAAqE;IAErE,MAAM,cAAc,GAAQ;QAC1B,MAAM,EAAE,0BAAa,CAAC,MAAM;KAC7B,CAAA;IAED,IAAI,cAAc,CAAC,IAAI,EAAE;QACvB,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAA;QAC1C,IAAI,IAAI,KAAK,gCAAoB,EAAE;YACjC,IAAI,GAAG,cAAc,CAAC,SAAS,CAAA;SAChC;QAED,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACrD,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACtD,cAAc,CAAC,QAAQ,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,CAAA;KAE7H;SAAM;QACL;;;;WAIG;QACH,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAA;KACtD;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,CAAA;IAE9D,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO;QAC1C,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW;QACjC,IAAI,EAAE,IAAI,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;QAC9C,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE;KAChH,CAAA;AACH,CAAC;AAnDD,0DAmDC"}
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.51",
6
+ "version": "1.0.53",
7
7
  "description": "Wechaty Puppet for WhatsApp",
8
8
  "type": "module",
9
9
  "exports": {
package/dist/cjs/src/puppet-mixin/message.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.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.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
269
+ config_js_1.log.verbose(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);
@@ -286,7 +286,7 @@ async function messageSend(conversationId, content, options, timeout = config_js
286
286
  }
287
287
  exports.messageSend = messageSend;
288
288
  async function messageSendText(conversationId, text, options = {}) {
289
- config_js_1.log.verbose(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options));
289
+ config_js_1.log.info(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options));
290
290
  let mentions = [];
291
291
  let quoteId;
292
292
  if (Array.isArray(options)) {
@@ -307,13 +307,12 @@ async function messageSendText(conversationId, text, options = {}) {
307
307
  return messageSend.call(this, conversationId, text, waMessageSendOptions, config_js_1.DEFAULT_TIMEOUT.MESSAGE_SEND_TEXT);
308
308
  }
309
309
  exports.messageSendText = messageSendText;
310
- async function messageSendFile(conversationId, file, options) {
311
- config_js_1.log.verbose(PRE, 'messageSendFile(%s, %s)', conversationId, file.name);
310
+ async function messageSendFile(conversationId, file, options = {}) {
312
311
  await file.ready();
313
312
  const type = (file.mediaType && file.mediaType !== 'application/octet-stream')
314
313
  ? file.mediaType.replace(/;.*$/, '')
315
314
  : path.extname(file.name);
316
- config_js_1.log.silly(PRE, `message type: ${type}, filename: ${file.name}`);
315
+ config_js_1.log.info(PRE, 'messageSendFile(%s, %s)', conversationId, JSON.stringify(file.toJSON()), `type: ${type}, filename: ${file.name}`);
317
316
  const fileBoxJsonObject = file.toJSON(); // FIXME: need import FileBoxJsonObject from file-box
318
317
  const remoteUrl = fileBoxJsonObject.url;
319
318
  let msgContent;
@@ -324,6 +323,9 @@ async function messageSendFile(conversationId, file, options) {
324
323
  const fileData = await file.toBase64();
325
324
  msgContent = new whatsapp_interface_js_1.MessageMedia(file.mediaType, fileData, file.name);
326
325
  }
326
+ if (/^mp3\//.test(type) || /^wav\//.test(type)) {
327
+ options.sendAudioAsVoice = true;
328
+ }
327
329
  return messageSend.call(this, conversationId, msgContent, options, config_js_1.DEFAULT_TIMEOUT.MESSAGE_SEND_FILE);
328
330
  }
329
331
  exports.messageSendFile = messageSendFile;
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/cjs/src/whatsapp/event-handler/contact-event-handler.js CHANGED
@@ -58,17 +58,17 @@ class ContactEventHandler extends whatsapp_base_js_1.default {
58
58
  }
59
59
  async onContactRemove(contact) {
60
60
  config_js_1.log.info(PRE, `onContactRemove(${contact.id._serialized})`);
61
- const friendship = {
62
- contactId: contact.id._serialized,
63
- hello: '',
64
- id: (0, uuid_1.v4)(),
65
- timestamp: Date.now(),
66
- type: PUPPET.types.Friendship.Delete,
67
- };
68
- const cacheManager = await this.manager.getCacheManager();
69
- await cacheManager.setFriendshipRawPayload(friendship.id, friendship);
70
- await cacheManager.deleteContactOrRoom(contact.id._serialized);
71
- this.emit('friendship', { friendshipId: friendship.id });
61
+ // const friendship: PUPPET.payloads.Friendship = {
62
+ // contactId: contact.id._serialized,
63
+ // hello: '',
64
+ // id: v4(),
65
+ // timestamp: Date.now(),
66
+ // type: PUPPET.types.Friendship.Delete,
67
+ // }
68
+ // const cacheManager = await this.manager.getCacheManager()
69
+ // await cacheManager.setFriendshipRawPayload(friendship.id, friendship)
70
+ // await cacheManager.deleteContactOrRoom(contact.id._serialized)
71
+ // this.emit('friendship', { friendshipId: friendship.id })
72
72
  }
73
73
  }
74
74
  exports.default = ContactEventHandler;
package/dist/cjs/src/whatsapp/event-handler/contact-event-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/contact-event-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,2EAA8C;AAE9C,6DAA8C;AAC9C,+CAAqC;AAErC,+BAAyB;AAEzB,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAqB,mBAAoB,SAAQ,0BAAY;IAEpD,KAAK,CAAC,mBAAmB,CAAE,OAAgB,EAAE,OAAe,EAAE,OAAe;QAClF,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,OAAO,CAAC,EAAE,CAAC,WAAW,KAAK,OAAO,KAAK,OAAO,GAAG,CAAC,CAAA;QACvF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAA;QACnF,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QACxF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;SAClC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CAAE,OAAgB;QACzC,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QACxD,MAAM,UAAU,GAA+B;YAC7C,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;YACjC,KAAK,EAAE,EAAE;YACT,EAAE,EAAE,IAAA,SAAE,GAAE;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SACtC,CAAA;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACrE,MAAM,YAAY,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,eAAe,CAAE,OAAgB;QAC5C,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QAC3D,MAAM,UAAU,GAA+B;YAC7C,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;YACjC,KAAK,EAAE,EAAE;YACT,EAAE,EAAE,IAAA,SAAE,GAAE;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM;SACrC,CAAA;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACrE,MAAM,YAAY,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;CAEF;AA1CD,sCA0CC"}
1
+ {"version":3,"file":"contact-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/contact-event-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,2EAA8C;AAE9C,6DAA8C;AAC9C,+CAAqC;AAErC,+BAAyB;AAEzB,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAqB,mBAAoB,SAAQ,0BAAY;IAEpD,KAAK,CAAC,mBAAmB,CAAE,OAAgB,EAAE,OAAe,EAAE,OAAe;QAClF,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,OAAO,CAAC,EAAE,CAAC,WAAW,KAAK,OAAO,KAAK,OAAO,GAAG,CAAC,CAAA;QACvF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAA;QACnF,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QACxF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;SAClC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CAAE,OAAgB;QACzC,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QACxD,MAAM,UAAU,GAA+B;YAC7C,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;YACjC,KAAK,EAAE,EAAE;YACT,EAAE,EAAE,IAAA,SAAE,GAAE;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SACtC,CAAA;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACrE,MAAM,YAAY,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,eAAe,CAAE,OAAgB;QAC5C,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QAC3D,mDAAmD;QACnD,uCAAuC;QACvC,eAAe;QACf,cAAc;QACd,2BAA2B;QAC3B,0CAA0C;QAC1C,IAAI;QACJ,4DAA4D;QAC5D,wEAAwE;QACxE,iEAAiE;QACjE,2DAA2D;IAC7D,CAAC;CAEF;AA1CD,sCA0CC"}
package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.js CHANGED
@@ -13,9 +13,9 @@ export function parserContactRawPayload(contactPayload, userName) {
13
13
  type = PUPPET.types.Contact.Unknown;
14
14
  }
15
15
  let name;
16
- const isFriend = contactPayload.isMyContact || contactPayload.isMe;
16
+ // const isFriend = contactPayload.isMyContact || contactPayload.isMe
17
17
  const additionalInfo = {
18
- status: isFriend ? ContactStatus.FRIEND : ContactStatus.NOT_FRIEND,
18
+ status: ContactStatus.FRIEND,
19
19
  };
20
20
  if (contactPayload.isMe) {
21
21
  name = userName || contactPayload.pushname;
@@ -37,7 +37,7 @@ export function parserContactRawPayload(contactPayload, userName) {
37
37
  const number = contactPayload.number || contactPayload.id.user;
38
38
  return {
39
39
  avatar: contactPayload.avatar,
40
- friend: isFriend,
40
+ friend: true,
41
41
  gender: PUPPET.types.ContactGender.Unknown,
42
42
  id: contactPayload.id._serialized,
43
43
  name: name || contactPayload.id._serialized,
package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAEvD,MAAM,UAAU,uBAAuB,CAAE,cAAsC,EAAE,QAAiB;IAChG,IAAI,IAAI,CAAA;IACR,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAA;KACvC;SAAM,IAAI,cAAc,CAAC,YAAY,EAAE;QACtC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAA;KACxC;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,IAAI,CAAA;IAER,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,IAAI,CAAA;IAElE,MAAM,cAAc,GAAQ;QAC1B,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU;KACnE,CAAA;IAED,IAAI,cAAc,CAAC,IAAI,EAAE;QACvB,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAA;QAC1C,IAAI,IAAI,KAAK,oBAAoB,EAAE;YACjC,IAAI,GAAG,cAAc,CAAC,SAAS,CAAA;SAChC;QAED,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACrD,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACtD,cAAc,CAAC,QAAQ,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,CAAA;KAE7H;SAAM;QACL;;;;WAIG;QACH,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAA;KACtD;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,CAAA;IAE9D,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO;QAC1C,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW;QACjC,IAAI,EAAE,IAAI,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;QAC9C,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE;KAChH,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAEvD,MAAM,UAAU,uBAAuB,CAAE,cAAsC,EAAE,QAAiB;IAChG,IAAI,IAAI,CAAA;IACR,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAA;KACvC;SAAM,IAAI,cAAc,CAAC,YAAY,EAAE;QACtC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAA;KACxC;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,IAAI,CAAA;IAER,qEAAqE;IAErE,MAAM,cAAc,GAAQ;QAC1B,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAA;IAED,IAAI,cAAc,CAAC,IAAI,EAAE;QACvB,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAA;QAC1C,IAAI,IAAI,KAAK,oBAAoB,EAAE;YACjC,IAAI,GAAG,cAAc,CAAC,SAAS,CAAA;SAChC;QAED,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACrD,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,EAAE,CAAC,WAAW,CAAA;QACtD,cAAc,CAAC,QAAQ,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,CAAA;KAE7H;SAAM;QACL;;;;WAIG;QACH,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAA;KACtD;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,CAAA;IAE9D,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO;QAC1C,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW;QACjC,IAAI,EAAE,IAAI,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;QAC9C,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE;KAChH,CAAA;AACH,CAAC"}
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.51",
3
+ "version": "1.0.53",
4
4
  "description": "Wechaty Puppet for WhatsApp",
5
5
  "type": "module",
6
6
  "exports": {
package/dist/esm/src/puppet-mixin/message.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.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.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
232
+ log.verbose(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);
@@ -248,7 +248,7 @@ export async function messageSend(conversationId, content, options, timeout = DE
248
248
  // return messageId
249
249
  }
250
250
  export async function messageSendText(conversationId, text, options = {}) {
251
- log.verbose(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options));
251
+ log.info(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options));
252
252
  let mentions = [];
253
253
  let quoteId;
254
254
  if (Array.isArray(options)) {
@@ -268,13 +268,12 @@ export async function messageSendText(conversationId, text, options = {}) {
268
268
  }
269
269
  return messageSend.call(this, conversationId, text, waMessageSendOptions, DEFAULT_TIMEOUT.MESSAGE_SEND_TEXT);
270
270
  }
271
- export async function messageSendFile(conversationId, file, options) {
272
- log.verbose(PRE, 'messageSendFile(%s, %s)', conversationId, file.name);
271
+ export async function messageSendFile(conversationId, file, options = {}) {
273
272
  await file.ready();
274
273
  const type = (file.mediaType && file.mediaType !== 'application/octet-stream')
275
274
  ? file.mediaType.replace(/;.*$/, '')
276
275
  : path.extname(file.name);
277
- log.silly(PRE, `message type: ${type}, filename: ${file.name}`);
276
+ log.info(PRE, 'messageSendFile(%s, %s)', conversationId, JSON.stringify(file.toJSON()), `type: ${type}, filename: ${file.name}`);
278
277
  const fileBoxJsonObject = file.toJSON(); // FIXME: need import FileBoxJsonObject from file-box
279
278
  const remoteUrl = fileBoxJsonObject.url;
280
279
  let msgContent;
@@ -285,6 +284,9 @@ export async function messageSendFile(conversationId, file, options) {
285
284
  const fileData = await file.toBase64();
286
285
  msgContent = new MessageMedia(file.mediaType, fileData, file.name);
287
286
  }
287
+ if (/^mp3\//.test(type) || /^wav\//.test(type)) {
288
+ options.sendAudioAsVoice = true;
289
+ }
288
290
  return messageSend.call(this, conversationId, msgContent, options, DEFAULT_TIMEOUT.MESSAGE_SEND_FILE);
289
291
  }
290
292
  export async function messageSendContact(conversationId, contactId, 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/dist/esm/src/whatsapp/event-handler/contact-event-handler.js CHANGED
@@ -30,17 +30,17 @@ export default class ContactEventHandler extends WhatsAppBase {
30
30
  }
31
31
  async onContactRemove(contact) {
32
32
  log.info(PRE, `onContactRemove(${contact.id._serialized})`);
33
- const friendship = {
34
- contactId: contact.id._serialized,
35
- hello: '',
36
- id: v4(),
37
- timestamp: Date.now(),
38
- type: PUPPET.types.Friendship.Delete,
39
- };
40
- const cacheManager = await this.manager.getCacheManager();
41
- await cacheManager.setFriendshipRawPayload(friendship.id, friendship);
42
- await cacheManager.deleteContactOrRoom(contact.id._serialized);
43
- this.emit('friendship', { friendshipId: friendship.id });
33
+ // const friendship: PUPPET.payloads.Friendship = {
34
+ // contactId: contact.id._serialized,
35
+ // hello: '',
36
+ // id: v4(),
37
+ // timestamp: Date.now(),
38
+ // type: PUPPET.types.Friendship.Delete,
39
+ // }
40
+ // const cacheManager = await this.manager.getCacheManager()
41
+ // await cacheManager.setFriendshipRawPayload(friendship.id, friendship)
42
+ // await cacheManager.deleteContactOrRoom(contact.id._serialized)
43
+ // this.emit('friendship', { friendshipId: friendship.id })
44
44
  }
45
45
  }
46
46
  //# sourceMappingURL=contact-event-handler.js.map
package/dist/esm/src/whatsapp/event-handler/contact-event-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"contact-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/contact-event-handler.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAErC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAA;AAEzB,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAEpD,KAAK,CAAC,mBAAmB,CAAE,OAAgB,EAAE,OAAe,EAAE,OAAe;QAClF,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,OAAO,CAAC,EAAE,CAAC,WAAW,KAAK,OAAO,KAAK,OAAO,GAAG,CAAC,CAAA;QACvF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAA;QACnF,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QACxF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;SAClC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CAAE,OAAgB;QACzC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QACxD,MAAM,UAAU,GAA+B;YAC7C,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;YACjC,KAAK,EAAE,EAAE;YACT,EAAE,EAAE,EAAE,EAAE;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SACtC,CAAA;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACrE,MAAM,YAAY,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,eAAe,CAAE,OAAgB;QAC5C,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QAC3D,MAAM,UAAU,GAA+B;YAC7C,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;YACjC,KAAK,EAAE,EAAE;YACT,EAAE,EAAE,EAAE,EAAE;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM;SACrC,CAAA;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACrE,MAAM,YAAY,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;CAEF"}
1
+ {"version":3,"file":"contact-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/contact-event-handler.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAErC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAA;AAEzB,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAEpD,KAAK,CAAC,mBAAmB,CAAE,OAAgB,EAAE,OAAe,EAAE,OAAe;QAClF,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,OAAO,CAAC,EAAE,CAAC,WAAW,KAAK,OAAO,KAAK,OAAO,GAAG,CAAC,CAAA;QACvF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAA;QACnF,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QACxF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;SAClC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CAAE,OAAgB;QACzC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QACxD,MAAM,UAAU,GAA+B;YAC7C,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,WAAW;YACjC,KAAK,EAAE,EAAE;YACT,EAAE,EAAE,EAAE,EAAE;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SACtC,CAAA;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACrE,MAAM,YAAY,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,eAAe,CAAE,OAAgB;QAC5C,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,OAAO,CAAC,EAAE,CAAC,WAAW,GAAG,CAAC,CAAA;QAC3D,mDAAmD;QACnD,uCAAuC;QACvC,eAAe;QACf,cAAc;QACd,2BAA2B;QAC3B,0CAA0C;QAC1C,IAAI;QACJ,4DAA4D;QAC5D,wEAAwE;QACxE,iEAAiE;QACjE,2DAA2D;IAC7D,CAAC;CAEF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juzi/wechaty-puppet-whatsapp",
3
- "version": "1.0.51",
3
+ "version": "1.0.53",
4
4
  "description": "Wechaty Puppet for WhatsApp",
5
5
  "type": "module",
6
6
  "exports": {
package/src/helper/pure-function/contact-raw-payload-parser.ts CHANGED
@@ -15,10 +15,10 @@ export function parserContactRawPayload (contactPayload: WhatsAppContactPayload,
15
15
  }
16
16
  let name
17
17
 
18
- const isFriend = contactPayload.isMyContact || contactPayload.isMe
18
+ // const isFriend = contactPayload.isMyContact || contactPayload.isMe
19
19
 
20
20
  const additionalInfo: any = {
21
- status: isFriend ? ContactStatus.FRIEND : ContactStatus.NOT_FRIEND,
21
+ status: ContactStatus.FRIEND,
22
22
  }
23
23
 
24
24
  if (contactPayload.isMe) {
@@ -44,7 +44,7 @@ export function parserContactRawPayload (contactPayload: WhatsAppContactPayload,
44
44
 
45
45
  return {
46
46
  avatar: contactPayload.avatar,
47
- friend: isFriend,
47
+ friend: true,
48
48
  gender: PUPPET.types.ContactGender.Unknown,
49
49
  id: contactPayload.id._serialized,
50
50
  name: name || contactPayload.id._serialized,
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.51",
7
+ "version": "1.0.53",
8
8
  "description": "Wechaty Puppet for WhatsApp",
9
9
  "type": "module",
10
10
  "exports": {
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.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options))
255
+ log.verbose(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options))
256
256
  void timeout
257
257
  void RequestPool
258
258
 
@@ -272,7 +272,7 @@ export async function messageSend (this: PuppetWhatsApp, conversationId: string,
272
272
  }
273
273
 
274
274
  export async function messageSendText (this: PuppetWhatsApp, conversationId: string, text: string, options: PUPPET.types.MessageSendTextOptions = {}): Promise<void | string> {
275
- log.verbose(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options))
275
+ log.info(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options))
276
276
  let mentions: string[] = []
277
277
  let quoteId: string | undefined
278
278
  if (Array.isArray(options)) {
@@ -293,13 +293,13 @@ export async function messageSendText (this: PuppetWhatsApp, conversationId: str
293
293
  return messageSend.call(this, conversationId, text, waMessageSendOptions, DEFAULT_TIMEOUT.MESSAGE_SEND_TEXT)
294
294
  }
295
295
 
296
- export async function messageSendFile (this: PuppetWhatsApp, conversationId: string, file: FileBox, options?: MessageSendOptions): Promise<void | string> {
297
- log.verbose(PRE, 'messageSendFile(%s, %s)', conversationId, file.name)
296
+ export async function messageSendFile (this: PuppetWhatsApp, conversationId: string, file: FileBox, options: MessageSendOptions = {}): Promise<void | string> {
298
297
  await file.ready()
299
298
  const type = (file.mediaType && file.mediaType !== 'application/octet-stream')
300
299
  ? file.mediaType.replace(/;.*$/, '')
301
300
  : path.extname(file.name)
302
- log.silly(PRE, `message type: ${type}, filename: ${file.name}`)
301
+ log.info(PRE, 'messageSendFile(%s, %s)', conversationId, JSON.stringify(file.toJSON()), `type: ${type}, filename: ${file.name}`)
302
+
303
303
  const fileBoxJsonObject: any = file.toJSON() // FIXME: need import FileBoxJsonObject from file-box
304
304
  const remoteUrl = fileBoxJsonObject.url
305
305
  let msgContent
@@ -309,6 +309,9 @@ export async function messageSendFile (this: PuppetWhatsApp, conversationId: str
309
309
  const fileData = await file.toBase64()
310
310
  msgContent = new MessageMedia(file.mediaType!, fileData, file.name)
311
311
  }
312
+ if (/^mp3\//.test(type) || /^wav\//.test(type)) {
313
+ options.sendAudioAsVoice = true
314
+ }
312
315
  return messageSend.call(this, conversationId, msgContent, options, DEFAULT_TIMEOUT.MESSAGE_SEND_FILE)
313
316
  }
314
317
 
package/src/whatsapp/event-handler/contact-event-handler.ts CHANGED
@@ -37,17 +37,17 @@ export default class ContactEventHandler extends WhatsAppBase {
37
37
 
38
38
  public async onContactRemove (contact: Contact) {
39
39
  log.info(PRE, `onContactRemove(${contact.id._serialized})`)
40
- const friendship: PUPPET.payloads.Friendship = {
41
- contactId: contact.id._serialized,
42
- hello: '',
43
- id: v4(),
44
- timestamp: Date.now(),
45
- type: PUPPET.types.Friendship.Delete,
46
- }
47
- const cacheManager = await this.manager.getCacheManager()
48
- await cacheManager.setFriendshipRawPayload(friendship.id, friendship)
49
- await cacheManager.deleteContactOrRoom(contact.id._serialized)
50
- this.emit('friendship', { friendshipId: friendship.id })
40
+ // const friendship: PUPPET.payloads.Friendship = {
41
+ // contactId: contact.id._serialized,
42
+ // hello: '',
43
+ // id: v4(),
44
+ // timestamp: Date.now(),
45
+ // type: PUPPET.types.Friendship.Delete,
46
+ // }
47
+ // const cacheManager = await this.manager.getCacheManager()
48
+ // await cacheManager.setFriendshipRawPayload(friendship.id, friendship)
49
+ // await cacheManager.deleteContactOrRoom(contact.id._serialized)
50
+ // this.emit('friendship', { friendshipId: friendship.id })
51
51
  }
52
52
 
53
53
  }