@juzi/wechaty-puppet-whatsapp 1.0.86 → 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/helper/pure-function/message-raw-payload-parser.d.ts +1 -1
- package/dist/cjs/src/helper/pure-function/message-raw-payload-parser.d.ts.map +1 -1
- package/dist/cjs/src/helper/pure-function/message-raw-payload-parser.js +3 -0
- package/dist/cjs/src/helper/pure-function/message-raw-payload-parser.js.map +1 -1
- package/dist/cjs/src/package-json.js +1 -1
- package/dist/cjs/src/schema/whatsapp-type.d.ts +1 -0
- package/dist/cjs/src/schema/whatsapp-type.d.ts.map +1 -1
- package/dist/cjs/src/schema/whatsapp-type.js +2 -0
- package/dist/cjs/src/schema/whatsapp-type.js.map +1 -1
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.d.ts +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 +9 -2
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/dist/esm/src/helper/pure-function/message-raw-payload-parser.d.ts +1 -1
- package/dist/esm/src/helper/pure-function/message-raw-payload-parser.d.ts.map +1 -1
- package/dist/esm/src/helper/pure-function/message-raw-payload-parser.js +3 -0
- package/dist/esm/src/helper/pure-function/message-raw-payload-parser.js.map +1 -1
- package/dist/esm/src/package-json.js +1 -1
- package/dist/esm/src/schema/whatsapp-type.d.ts +1 -0
- package/dist/esm/src/schema/whatsapp-type.d.ts.map +1 -1
- package/dist/esm/src/schema/whatsapp-type.js +1 -1
- package/dist/esm/src/schema/whatsapp-type.js.map +1 -1
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.d.ts +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 +9 -2
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/package.json +1 -1
- package/src/helper/pure-function/message-raw-payload-parser.ts +5 -2
- package/src/package-json.ts +1 -1
- package/src/schema/whatsapp-type.ts +1 -0
- package/src/whatsapp/event-handler/message-event-handler.ts +12 -5
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import * as PUPPET from '@juzi/wechaty-puppet';
|
|
2
|
-
import type
|
|
2
|
+
import { type WhatsAppMessagePayload } from '../../schema/whatsapp-type.js';
|
|
3
3
|
export declare function parserMessageRawPayload(messagePayload: WhatsAppMessagePayload): PUPPET.payloads.Message;
|
|
4
4
|
//# sourceMappingURL=message-raw-payload-parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAU9C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"message-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAU9C,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAEtC,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAoDxG"}
|
|
@@ -32,6 +32,7 @@ const error_type_js_1 = require("../../exception/error-type.js");
|
|
|
32
32
|
const whatsapp_error_js_1 = __importDefault(require("../../exception/whatsapp-error.js"));
|
|
33
33
|
const miscellaneous_js_1 = require("../miscellaneous.js");
|
|
34
34
|
const whatsapp_interface_js_1 = require("../../schema/whatsapp-interface.js");
|
|
35
|
+
const whatsapp_type_js_1 = require("../../schema/whatsapp-type.js");
|
|
35
36
|
function parserMessageRawPayload(messagePayload) {
|
|
36
37
|
const talkerId = messagePayload.author || messagePayload.from;
|
|
37
38
|
let listenerId;
|
|
@@ -133,6 +134,8 @@ function getMessageType(messagePayload) {
|
|
|
133
134
|
case whatsapp_interface_js_1.MessageTypes.PRODUCT:
|
|
134
135
|
type = PUPPET.types.Message.MiniProgram;
|
|
135
136
|
break;
|
|
137
|
+
case whatsapp_type_js_1.SpecialSystemType:
|
|
138
|
+
type = PUPPET.types.Message.System;
|
|
136
139
|
}
|
|
137
140
|
return type;
|
|
138
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,iEAA6D;AAC7D,0FAAuD;AACvD,0DAA8C;AAE9C,8EAG2C;
|
|
1
|
+
{"version":3,"file":"message-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"whatsapp-type.d.ts","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"whatsapp-type.d.ts","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whatsapp-type.js","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"whatsapp-type.js","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":";;;AA6Ea,QAAA,iBAAiB,GAAG,eAAwC,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import WhatsAppBase from '../whatsapp-base.js';
|
|
2
|
-
import type
|
|
2
|
+
import { type WhatsAppMessage, type WhatsAppMessagePayload } from '../../schema/whatsapp-type.js';
|
|
3
3
|
export default class MessageEventHandler extends WhatsAppBase {
|
|
4
4
|
onMessage(message: WhatsAppMessage | WhatsAppMessagePayload): Promise<void>;
|
|
5
5
|
/**
|
|
@@ -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,KAAK,
|
|
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"}
|
|
@@ -30,6 +30,7 @@ const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
|
|
|
30
30
|
const config_js_1 = require("../../config.js");
|
|
31
31
|
const whatsapp_interface_js_1 = require("../../schema/whatsapp-interface.js");
|
|
32
32
|
const whatsapp_base_js_1 = __importDefault(require("../whatsapp-base.js"));
|
|
33
|
+
const whatsapp_type_js_1 = require("../../schema/whatsapp-type.js");
|
|
33
34
|
const miscellaneous_js_1 = require("../../helper/miscellaneous.js");
|
|
34
35
|
const request_pool_js_1 = require("../../request/request-pool.js");
|
|
35
36
|
const uuid_1 = require("uuid");
|
|
@@ -41,11 +42,13 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
41
42
|
config_js_1.log.warn('message ignored because login process is not finished');
|
|
42
43
|
return;
|
|
43
44
|
}
|
|
45
|
+
const _data = message._data;
|
|
44
46
|
// @ts-ignore
|
|
45
47
|
if (message.type === 'multi_vcard'
|
|
46
48
|
|| (message.type === 'e2e_notification'
|
|
47
49
|
&& message.body === ''
|
|
48
|
-
&& !message.author
|
|
50
|
+
&& !message.author
|
|
51
|
+
&& _data.subtype !== 'encrypt')) {
|
|
49
52
|
// skip room join notification and multi_vcard message
|
|
50
53
|
return;
|
|
51
54
|
}
|
|
@@ -55,10 +58,14 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
55
58
|
if (messageInCache) {
|
|
56
59
|
return;
|
|
57
60
|
}
|
|
58
|
-
if (
|
|
61
|
+
if (_data.type === 'notification_template' && _data.subtype === 'contact_info_card') {
|
|
59
62
|
message.type = whatsapp_interface_js_1.MessageTypes.TEXT;
|
|
60
63
|
message.body = '[客户通过广告或其他渠道发起对话]';
|
|
61
64
|
}
|
|
65
|
+
if (_data.type === 'e2e_notification' && _data.subtype === 'encrypt') {
|
|
66
|
+
message.type = whatsapp_type_js_1.SpecialSystemType;
|
|
67
|
+
message.body = '消息和通话已进行端到端加密。只有此聊天中的成员可以查看、收听或分享。';
|
|
68
|
+
}
|
|
62
69
|
await cacheManager.setMessageRawPayload(messageId, message);
|
|
63
70
|
if (message._data?.caption && message._data?.type === 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
|
|
64
71
|
// file message also have captions, but no text message should be generated
|
|
@@ -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;
|
|
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,4 +1,4 @@
|
|
|
1
1
|
import * as PUPPET from '@juzi/wechaty-puppet';
|
|
2
|
-
import type
|
|
2
|
+
import { type WhatsAppMessagePayload } from '../../schema/whatsapp-type.js';
|
|
3
3
|
export declare function parserMessageRawPayload(messagePayload: WhatsAppMessagePayload): PUPPET.payloads.Message;
|
|
4
4
|
//# sourceMappingURL=message-raw-payload-parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAU9C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"message-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAU9C,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAEtC,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAoDxG"}
|
|
@@ -3,6 +3,7 @@ import { WA_ERROR_TYPE } from '../../exception/error-type.js';
|
|
|
3
3
|
import WAError from '../../exception/whatsapp-error.js';
|
|
4
4
|
import { isRoomId } from '../miscellaneous.js';
|
|
5
5
|
import { MessageAck, MessageTypes as WhatsAppMessageType, } from '../../schema/whatsapp-interface.js';
|
|
6
|
+
import { SpecialSystemType, } from '../../schema/whatsapp-type.js';
|
|
6
7
|
export function parserMessageRawPayload(messagePayload) {
|
|
7
8
|
const talkerId = messagePayload.author || messagePayload.from;
|
|
8
9
|
let listenerId;
|
|
@@ -103,6 +104,8 @@ function getMessageType(messagePayload) {
|
|
|
103
104
|
case WhatsAppMessageType.PRODUCT:
|
|
104
105
|
type = PUPPET.types.Message.MiniProgram;
|
|
105
106
|
break;
|
|
107
|
+
case SpecialSystemType:
|
|
108
|
+
type = PUPPET.types.Message.System;
|
|
106
109
|
}
|
|
107
110
|
return type;
|
|
108
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,OAAO,MAAM,mCAAmC,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EACL,UAAU,EACV,YAAY,IAAI,mBAAmB,GACpC,MAAM,oCAAoC,CAAA;
|
|
1
|
+
{"version":3,"file":"message-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/message-raw-payload-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whatsapp-type.d.ts","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"whatsapp-type.d.ts","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export const SpecialSystemType = 'SpecialSystem';
|
|
2
2
|
//# sourceMappingURL=whatsapp-type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whatsapp-type.js","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"whatsapp-type.js","sourceRoot":"","sources":["../../../../src/schema/whatsapp-type.ts"],"names":[],"mappings":"AA6EA,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAwC,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import WhatsAppBase from '../whatsapp-base.js';
|
|
2
|
-
import type
|
|
2
|
+
import { type WhatsAppMessage, type WhatsAppMessagePayload } from '../../schema/whatsapp-type.js';
|
|
3
3
|
export default class MessageEventHandler extends WhatsAppBase {
|
|
4
4
|
onMessage(message: WhatsAppMessage | WhatsAppMessagePayload): Promise<void>;
|
|
5
5
|
/**
|
|
@@ -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,KAAK,
|
|
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"}
|
|
@@ -2,6 +2,7 @@ import * as PUPPET from '@juzi/wechaty-puppet';
|
|
|
2
2
|
import { MessageMediaTypeList, log, } from '../../config.js';
|
|
3
3
|
import { MessageTypes as WhatsAppMessageType, MessageAck, } from '../../schema/whatsapp-interface.js';
|
|
4
4
|
import WhatsAppBase from '../whatsapp-base.js';
|
|
5
|
+
import { SpecialSystemType, } from '../../schema/whatsapp-type.js';
|
|
5
6
|
import { isContactId, isInviteLink, getInviteCode, sleep, } from '../../helper/miscellaneous.js';
|
|
6
7
|
import { RequestPool } from '../../request/request-pool.js';
|
|
7
8
|
import { v4 } from 'uuid';
|
|
@@ -13,11 +14,13 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
13
14
|
log.warn('message ignored because login process is not finished');
|
|
14
15
|
return;
|
|
15
16
|
}
|
|
17
|
+
const _data = message._data;
|
|
16
18
|
// @ts-ignore
|
|
17
19
|
if (message.type === 'multi_vcard'
|
|
18
20
|
|| (message.type === 'e2e_notification'
|
|
19
21
|
&& message.body === ''
|
|
20
|
-
&& !message.author
|
|
22
|
+
&& !message.author
|
|
23
|
+
&& _data.subtype !== 'encrypt')) {
|
|
21
24
|
// skip room join notification and multi_vcard message
|
|
22
25
|
return;
|
|
23
26
|
}
|
|
@@ -27,10 +30,14 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
27
30
|
if (messageInCache) {
|
|
28
31
|
return;
|
|
29
32
|
}
|
|
30
|
-
if (
|
|
33
|
+
if (_data.type === 'notification_template' && _data.subtype === 'contact_info_card') {
|
|
31
34
|
message.type = WhatsAppMessageType.TEXT;
|
|
32
35
|
message.body = '[客户通过广告或其他渠道发起对话]';
|
|
33
36
|
}
|
|
37
|
+
if (_data.type === 'e2e_notification' && _data.subtype === 'encrypt') {
|
|
38
|
+
message.type = SpecialSystemType;
|
|
39
|
+
message.body = '消息和通话已进行端到端加密。只有此聊天中的成员可以查看、收听或分享。';
|
|
40
|
+
}
|
|
34
41
|
await cacheManager.setMessageRawPayload(messageId, message);
|
|
35
42
|
if (message._data?.caption && message._data?.type === 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
|
|
36
43
|
// file message also have captions, but no text message should be generated
|
|
@@ -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;
|
|
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
|
@@ -8,8 +8,9 @@ import {
|
|
|
8
8
|
MessageTypes as WhatsAppMessageType,
|
|
9
9
|
} from '../../schema/whatsapp-interface.js'
|
|
10
10
|
|
|
11
|
-
import
|
|
12
|
-
|
|
11
|
+
import {
|
|
12
|
+
SpecialSystemType,
|
|
13
|
+
type WhatsAppMessagePayload,
|
|
13
14
|
} from '../../schema/whatsapp-type.js'
|
|
14
15
|
|
|
15
16
|
export function parserMessageRawPayload (messagePayload: WhatsAppMessagePayload): PUPPET.payloads.Message {
|
|
@@ -120,6 +121,8 @@ function getMessageType (messagePayload: WhatsAppMessagePayload): PUPPET.types.M
|
|
|
120
121
|
case WhatsAppMessageType.PRODUCT:
|
|
121
122
|
type = PUPPET.types.Message.MiniProgram
|
|
122
123
|
break
|
|
124
|
+
case SpecialSystemType:
|
|
125
|
+
type = PUPPET.types.Message.System
|
|
123
126
|
}
|
|
124
127
|
return type
|
|
125
128
|
}
|
package/src/package-json.ts
CHANGED
|
@@ -9,9 +9,10 @@ import {
|
|
|
9
9
|
} from '../../schema/whatsapp-interface.js'
|
|
10
10
|
import WhatsAppBase from '../whatsapp-base.js'
|
|
11
11
|
|
|
12
|
-
import
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
import {
|
|
13
|
+
SpecialSystemType,
|
|
14
|
+
type WhatsAppMessage,
|
|
15
|
+
type WhatsAppMessagePayload,
|
|
15
16
|
} from '../../schema/whatsapp-type.js'
|
|
16
17
|
import {
|
|
17
18
|
isContactId,
|
|
@@ -32,13 +33,15 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
32
33
|
log.warn('message ignored because login process is not finished')
|
|
33
34
|
return
|
|
34
35
|
}
|
|
36
|
+
const _data = (message as any)._data
|
|
35
37
|
|
|
36
38
|
// @ts-ignore
|
|
37
39
|
if (
|
|
38
40
|
message.type === 'multi_vcard'
|
|
39
41
|
|| (message.type === 'e2e_notification'
|
|
40
42
|
&& message.body === ''
|
|
41
|
-
&& !message.author
|
|
43
|
+
&& !message.author
|
|
44
|
+
&& _data.subtype !== 'encrypt')
|
|
42
45
|
) {
|
|
43
46
|
// skip room join notification and multi_vcard message
|
|
44
47
|
return
|
|
@@ -49,10 +52,14 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
49
52
|
if (messageInCache) {
|
|
50
53
|
return
|
|
51
54
|
}
|
|
52
|
-
if (
|
|
55
|
+
if (_data.type === 'notification_template' && _data.subtype === 'contact_info_card') {
|
|
53
56
|
message.type = WhatsAppMessageType.TEXT
|
|
54
57
|
message.body = '[客户通过广告或其他渠道发起对话]'
|
|
55
58
|
}
|
|
59
|
+
if (_data.type === 'e2e_notification' && _data.subtype === 'encrypt') {
|
|
60
|
+
message.type = SpecialSystemType
|
|
61
|
+
message.body = '消息和通话已进行端到端加密。只有此聊天中的成员可以查看、收听或分享。'
|
|
62
|
+
}
|
|
56
63
|
await cacheManager.setMessageRawPayload(messageId, message)
|
|
57
64
|
if ((message as WhatsAppMessagePayload)._data?.caption && (message as WhatsAppMessagePayload)._data?.type === 'image') { // see issue: https://github.com/wechaty/puppet-whatsapp/issues/390
|
|
58
65
|
// file message also have captions, but no text message should be generated
|