@juzi/wechaty-puppet-whatsapp 1.0.87 → 1.0.88
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/dist/cjs/src/package-json.js +1 -1
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.d.ts.map +1 -1
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js +5 -3
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/dist/esm/src/package-json.js +1 -1
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.d.ts.map +1 -1
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js +5 -3
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/package.json +1 -1
- package/src/package-json.ts +1 -1
- package/src/whatsapp/event-handler/message-event-handler.ts +5 -3
|
@@ -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.
|
|
6
|
+
"version": "1.0.88",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAYtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;
|
|
1
|
+
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAYtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;IAoEzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA6BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IAwBzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAoC/C,+BAA+B,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BrG,cAAc,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAI9B,eAAe,CAAE,OAAO,EAAE,eAAe;IAQzC,0BAA0B,CAAE,OAAO,EAAE,eAAe;IAcjE;;;;;OAKG;IACU,uBAAuB,CAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS;IAkB/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAqBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;YAIvC,iBAAiB;CAYhC"}
|
|
@@ -42,11 +42,13 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
42
42
|
config_js_1.log.warn('message ignored because login process is not finished');
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
|
+
const _data = message._data;
|
|
45
46
|
// @ts-ignore
|
|
46
47
|
if (message.type === 'multi_vcard'
|
|
47
48
|
|| (message.type === 'e2e_notification'
|
|
48
49
|
&& message.body === ''
|
|
49
|
-
&& !message.author
|
|
50
|
+
&& !message.author
|
|
51
|
+
&& _data.subtype !== 'encrypt')) {
|
|
50
52
|
// skip room join notification and multi_vcard message
|
|
51
53
|
return;
|
|
52
54
|
}
|
|
@@ -56,11 +58,11 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
56
58
|
if (messageInCache) {
|
|
57
59
|
return;
|
|
58
60
|
}
|
|
59
|
-
if (
|
|
61
|
+
if (_data.type === 'notification_template' && _data.subtype === 'contact_info_card') {
|
|
60
62
|
message.type = whatsapp_interface_js_1.MessageTypes.TEXT;
|
|
61
63
|
message.body = '[客户通过广告或其他渠道发起对话]';
|
|
62
64
|
}
|
|
63
|
-
if (
|
|
65
|
+
if (_data.type === 'e2e_notification' && _data.subtype === 'encrypt') {
|
|
64
66
|
message.type = whatsapp_type_js_1.SpecialSystemType;
|
|
65
67
|
message.body = '消息和通话已进行端到端加密。只有此聊天中的成员可以查看、收听或分享。';
|
|
66
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,+CAGwB;AACxB,8EAG2C;AAC3C,2EAA8C;AAE9C,oEAIsC;AACtC,oEAKsC;AACtC,mEAA2D;AAC3D,+BAAyB;AAEzB,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAqB,mBAAoB,SAAQ,0BAAY;IAEpD,KAAK,CAAC,SAAS,CAAE,OAAiD;QACvE,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE;YACrC,eAAG,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAA;YACjE,OAAM;SACP;
|
|
1
|
+
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAYtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;
|
|
1
|
+
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAYtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;IAoEzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA6BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IAwBzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAoC/C,+BAA+B,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BrG,cAAc,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAI9B,eAAe,CAAE,OAAO,EAAE,eAAe;IAQzC,0BAA0B,CAAE,OAAO,EAAE,eAAe;IAcjE;;;;;OAKG;IACU,uBAAuB,CAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS;IAkB/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAqBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;YAIvC,iBAAiB;CAYhC"}
|
|
@@ -14,11 +14,13 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
14
14
|
log.warn('message ignored because login process is not finished');
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
|
+
const _data = message._data;
|
|
17
18
|
// @ts-ignore
|
|
18
19
|
if (message.type === 'multi_vcard'
|
|
19
20
|
|| (message.type === 'e2e_notification'
|
|
20
21
|
&& message.body === ''
|
|
21
|
-
&& !message.author
|
|
22
|
+
&& !message.author
|
|
23
|
+
&& _data.subtype !== 'encrypt')) {
|
|
22
24
|
// skip room join notification and multi_vcard message
|
|
23
25
|
return;
|
|
24
26
|
}
|
|
@@ -28,11 +30,11 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
28
30
|
if (messageInCache) {
|
|
29
31
|
return;
|
|
30
32
|
}
|
|
31
|
-
if (
|
|
33
|
+
if (_data.type === 'notification_template' && _data.subtype === 'contact_info_card') {
|
|
32
34
|
message.type = WhatsAppMessageType.TEXT;
|
|
33
35
|
message.body = '[客户通过广告或其他渠道发起对话]';
|
|
34
36
|
}
|
|
35
|
-
if (
|
|
37
|
+
if (_data.type === 'e2e_notification' && _data.subtype === 'encrypt') {
|
|
36
38
|
message.type = SpecialSystemType;
|
|
37
39
|
message.body = '消息和通话已进行端到端加密。只有此聊天中的成员可以查看、收听或分享。';
|
|
38
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EACL,oBAAoB,EACpB,GAAG,GACJ,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,YAAY,IAAI,mBAAmB,EACnC,UAAU,GACX,MAAM,oCAAoC,CAAA;AAC3C,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EACL,iBAAiB,GAGlB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EACL,WAAW,EACX,YAAY,EACZ,aAAa,EACb,KAAK,GACN,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAA;AAEzB,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAEpD,KAAK,CAAC,SAAS,CAAE,OAAiD;QACvE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE;YACrC,GAAG,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAA;YACjE,OAAM;SACP;
|
|
1
|
+
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/package-json.ts
CHANGED
|
@@ -33,13 +33,15 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
33
33
|
log.warn('message ignored because login process is not finished')
|
|
34
34
|
return
|
|
35
35
|
}
|
|
36
|
+
const _data = (message as any)._data
|
|
36
37
|
|
|
37
38
|
// @ts-ignore
|
|
38
39
|
if (
|
|
39
40
|
message.type === 'multi_vcard'
|
|
40
41
|
|| (message.type === 'e2e_notification'
|
|
41
42
|
&& message.body === ''
|
|
42
|
-
&& !message.author
|
|
43
|
+
&& !message.author
|
|
44
|
+
&& _data.subtype !== 'encrypt')
|
|
43
45
|
) {
|
|
44
46
|
// skip room join notification and multi_vcard message
|
|
45
47
|
return
|
|
@@ -50,11 +52,11 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
50
52
|
if (messageInCache) {
|
|
51
53
|
return
|
|
52
54
|
}
|
|
53
|
-
if (
|
|
55
|
+
if (_data.type === 'notification_template' && _data.subtype === 'contact_info_card') {
|
|
54
56
|
message.type = WhatsAppMessageType.TEXT
|
|
55
57
|
message.body = '[客户通过广告或其他渠道发起对话]'
|
|
56
58
|
}
|
|
57
|
-
if (
|
|
59
|
+
if (_data.type === 'e2e_notification' && _data.subtype === 'encrypt') {
|
|
58
60
|
message.type = SpecialSystemType
|
|
59
61
|
message.body = '消息和通话已进行端到端加密。只有此聊天中的成员可以查看、收听或分享。'
|
|
60
62
|
}
|