@juzi/wechaty-puppet-whatsapp 1.0.10 → 1.0.12

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.
@@ -1 +1 @@
1
- {"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAE3E,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CA8B3H"}
1
+ {"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAE3E,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAiC3H"}
@@ -47,15 +47,17 @@ function parserContactRawPayload(contactPayload, userName) {
47
47
  else {
48
48
  name = contactPayload.pushname || contactPayload.name;
49
49
  }
50
+ const number = contactPayload.number || contactPayload.id.user;
50
51
  return {
51
52
  avatar: contactPayload.avatar,
52
53
  friend: contactPayload.isMyContact && contactPayload.isUser,
53
54
  gender: PUPPET.types.ContactGender.Unknown,
54
55
  id: contactPayload.id._serialized,
55
56
  name: name || contactPayload.id._serialized,
56
- phone: [contactPayload.number],
57
+ phone: [number],
57
58
  type: type,
58
- weixin: contactPayload.number,
59
+ handle: number,
60
+ weixin: number,
59
61
  };
60
62
  }
61
63
  exports.parserContactRawPayload = parserContactRawPayload;
@@ -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;AAItD,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,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;KACF;SAAM;QACL,IAAI,GAAG,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAA;KACtD;IAED,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM;QAC3D,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,cAAc,CAAC,MAAM,CAAC;QAC9B,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,cAAc,CAAC,MAAM;KAC9B,CAAA;AACH,CAAC;AA9BD,0DA8BC"}
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;AAItD,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,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;KACF;SAAM;QACL,IAAI,GAAG,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,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,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM;QAC3D,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;KACf,CAAA;AACH,CAAC;AAjCD,0DAiCC"}
@@ -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.10",
6
+ "version": "1.0.12",
7
7
  "description": "Wechaty Puppet for WhatsApp",
8
8
  "type": "module",
9
9
  "exports": {
@@ -27,7 +27,7 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
27
27
  return;
28
28
  }
29
29
  await cacheManager.setMessageRawPayload(messageId, message);
30
- if (message._data?.caption && message._data?.type !== 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
30
+ if (message._data?.caption && message._data?.type === 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
31
31
  // file message also have captions, but no text message should be generated
32
32
  const genTextMessageFromImageMessage = message;
33
33
  genTextMessageFromImageMessage.type = whatsapp_interface_js_1.MessageTypes.TEXT;
@@ -1 +1 @@
1
- {"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAE3E,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CA8B3H"}
1
+ {"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAE3E,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAiC3H"}
@@ -21,15 +21,17 @@ export function parserContactRawPayload(contactPayload, userName) {
21
21
  else {
22
22
  name = contactPayload.pushname || contactPayload.name;
23
23
  }
24
+ const number = contactPayload.number || contactPayload.id.user;
24
25
  return {
25
26
  avatar: contactPayload.avatar,
26
27
  friend: contactPayload.isMyContact && contactPayload.isUser,
27
28
  gender: PUPPET.types.ContactGender.Unknown,
28
29
  id: contactPayload.id._serialized,
29
30
  name: name || contactPayload.id._serialized,
30
- phone: [contactPayload.number],
31
+ phone: [number],
31
32
  type: type,
32
- weixin: contactPayload.number,
33
+ handle: number,
34
+ weixin: number,
33
35
  };
34
36
  }
35
37
  //# sourceMappingURL=contact-raw-payload-parser.js.map
@@ -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;AAItD,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,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;KACF;SAAM;QACL,IAAI,GAAG,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAA;KACtD;IAED,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM;QAC3D,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,cAAc,CAAC,MAAM,CAAC;QAC9B,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,cAAc,CAAC,MAAM;KAC9B,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;AAItD,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,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;KACF;SAAM;QACL,IAAI,GAAG,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,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,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM;QAC3D,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;KACf,CAAA;AACH,CAAC"}
@@ -1,6 +1,6 @@
1
1
  export const packageJson = {
2
2
  "name": "@juzi/wechaty-puppet-whatsapp",
3
- "version": "1.0.10",
3
+ "version": "1.0.12",
4
4
  "description": "Wechaty Puppet for WhatsApp",
5
5
  "type": "module",
6
6
  "exports": {
@@ -22,7 +22,7 @@ export default class MessageEventHandler extends WhatsAppBase {
22
22
  return;
23
23
  }
24
24
  await cacheManager.setMessageRawPayload(messageId, message);
25
- if (message._data?.caption && message._data?.type !== 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
25
+ if (message._data?.caption && message._data?.type === 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
26
26
  // file message also have captions, but no text message should be generated
27
27
  const genTextMessageFromImageMessage = message;
28
28
  genTextMessageFromImageMessage.type = WhatsAppMessageType.TEXT;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juzi/wechaty-puppet-whatsapp",
3
- "version": "1.0.10",
3
+ "version": "1.0.12",
4
4
  "description": "Wechaty Puppet for WhatsApp",
5
5
  "type": "module",
6
6
  "exports": {
@@ -23,14 +23,17 @@ export function parserContactRawPayload (contactPayload: WhatsAppContactPayload,
23
23
  name = contactPayload.pushname || contactPayload.name
24
24
  }
25
25
 
26
+ const number = contactPayload.number || contactPayload.id.user
27
+
26
28
  return {
27
29
  avatar: contactPayload.avatar,
28
30
  friend: contactPayload.isMyContact && contactPayload.isUser,
29
31
  gender: PUPPET.types.ContactGender.Unknown,
30
32
  id: contactPayload.id._serialized,
31
33
  name: name || contactPayload.id._serialized,
32
- phone: [contactPayload.number],
34
+ phone: [number],
33
35
  type: type,
34
- weixin: contactPayload.number,
36
+ handle: number,
37
+ weixin: number,
35
38
  }
36
39
  }
@@ -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.10",
7
+ "version": "1.0.12",
8
8
  "description": "Wechaty Puppet for WhatsApp",
9
9
  "type": "module",
10
10
  "exports": {
@@ -44,7 +44,7 @@ export default class MessageEventHandler extends WhatsAppBase {
44
44
  return
45
45
  }
46
46
  await cacheManager.setMessageRawPayload(messageId, message)
47
- if ((message as WhatsAppMessagePayload)._data?.caption && (message as WhatsAppMessagePayload)._data?.type !== 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
47
+ if ((message as WhatsAppMessagePayload)._data?.caption && (message as WhatsAppMessagePayload)._data?.type === 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
48
48
  // file message also have captions, but no text message should be generated
49
49
  const genTextMessageFromImageMessage = message as WhatsAppMessagePayload
50
50
  genTextMessageFromImageMessage.type = WhatsAppMessageType.TEXT