@juzi/wechaty-puppet-whatsapp 1.0.18 → 1.0.19
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/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.js +2 -3
- package/dist/cjs/src/puppet-mixin/friendship.js.map +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 -1
- 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/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/esm/src/puppet-mixin/friendship.js +2 -3
- package/dist/esm/src/puppet-mixin/friendship.js.map +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 -1
- 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/puppet-mixin/friendship.ts +2 -3
- package/src/whatsapp/event-handler/message-event-handler.ts +8 -1
|
@@ -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.19",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -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,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAQvH;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,
|
|
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,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAQvH;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,CA8Bf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,4BAA4B,CAAE,EAAE,EAAE,MAAM;;;EAWvD"}
|
|
@@ -102,13 +102,12 @@ async function friendshipAdd(contactId, option) {
|
|
|
102
102
|
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}`);
|
|
103
103
|
}
|
|
104
104
|
const contactPayload = await this.contactRawPayload(contactId);
|
|
105
|
-
let messageId;
|
|
106
105
|
if (hello) {
|
|
107
|
-
|
|
106
|
+
await this.messageSendText(contactId, hello);
|
|
108
107
|
}
|
|
109
108
|
if (!(await this.contactRawPayloadParser(contactPayload)).friend) {
|
|
110
109
|
this.emit('friendship', {
|
|
111
|
-
friendshipId:
|
|
110
|
+
friendshipId: `friendshipFromContact-${contactId}-timestamp-${String(Date.now())}`,
|
|
112
111
|
});
|
|
113
112
|
}
|
|
114
113
|
}
|
|
@@ -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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"}
|
|
@@ -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,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,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,KAAK,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;IAmDzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA0BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IAgBzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAmB/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;IAc/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAiBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;CAItD"}
|
|
@@ -21,7 +21,15 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
const messageId = message.id.id;
|
|
24
|
-
|
|
24
|
+
let cacheManager;
|
|
25
|
+
try {
|
|
26
|
+
cacheManager = await this.manager.getCacheManager();
|
|
27
|
+
}
|
|
28
|
+
catch (e) { }
|
|
29
|
+
if (!cacheManager) {
|
|
30
|
+
// message comes before login process finished
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
25
33
|
const messageInCache = await cacheManager.getMessageRawPayload(messageId);
|
|
26
34
|
if (messageInCache) {
|
|
27
35
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":";;;;;AACA,+CAGwB;AACxB,8EAG2C;AAC3C,2EAA8C;AAM9C,oEAKsC;AACtC,mEAA2D;AAE3D,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,aAAa;QACb,IACE,OAAO,CAAC,IAAI,KAAK,aAAa;eAC3B,CAAC,OAAO,CAAC,IAAI,KAAK,kBAAkB;mBACpC,OAAO,CAAC,IAAI,KAAK,EAAE;mBACnB,CAAC,OAAO,CAAC,MAAM,CAAC,EACnB;YACA,sDAAsD;YACtD,OAAM;SACP;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;QAC/B,
|
|
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":"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,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAQvH;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,
|
|
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,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAQvH;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,CA8Bf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,4BAA4B,CAAE,EAAE,EAAE,MAAM;;;EAWvD"}
|
|
@@ -68,13 +68,12 @@ export async function friendshipAdd(contactId, option) {
|
|
|
68
68
|
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`);
|
|
69
69
|
}
|
|
70
70
|
const contactPayload = await this.contactRawPayload(contactId);
|
|
71
|
-
let messageId;
|
|
72
71
|
if (hello) {
|
|
73
|
-
|
|
72
|
+
await this.messageSendText(contactId, hello);
|
|
74
73
|
}
|
|
75
74
|
if (!(await this.contactRawPayloadParser(contactPayload)).friend) {
|
|
76
75
|
this.emit('friendship', {
|
|
77
|
-
friendshipId:
|
|
76
|
+
friendshipId: `friendshipFromContact-${contactId}-timestamp-${String(Date.now())}`,
|
|
78
77
|
});
|
|
79
78
|
}
|
|
80
79
|
}
|
|
@@ -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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"}
|
|
@@ -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,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,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,KAAK,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;IAmDzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA0BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IAgBzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAmB/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;IAc/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAiBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;CAItD"}
|
|
@@ -16,7 +16,15 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
const messageId = message.id.id;
|
|
19
|
-
|
|
19
|
+
let cacheManager;
|
|
20
|
+
try {
|
|
21
|
+
cacheManager = await this.manager.getCacheManager();
|
|
22
|
+
}
|
|
23
|
+
catch (e) { }
|
|
24
|
+
if (!cacheManager) {
|
|
25
|
+
// message comes before login process finished
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
20
28
|
const messageInCache = await cacheManager.getMessageRawPayload(messageId);
|
|
21
29
|
if (messageInCache) {
|
|
22
30
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AACA,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;AAM9C,OAAO,EACL,WAAW,EACX,YAAY,EACZ,aAAa,EACb,KAAK,GACN,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,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,aAAa;QACb,IACE,OAAO,CAAC,IAAI,KAAK,aAAa;eAC3B,CAAC,OAAO,CAAC,IAAI,KAAK,kBAAkB;mBACpC,OAAO,CAAC,IAAI,KAAK,EAAE;mBACnB,CAAC,OAAO,CAAC,MAAM,CAAC,EACnB;YACA,sDAAsD;YACtD,OAAM;SACP;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;QAC/B,
|
|
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
|
@@ -93,14 +93,13 @@ export async function friendshipAdd (
|
|
|
93
93
|
|
|
94
94
|
const contactPayload = await this.contactRawPayload(contactId)
|
|
95
95
|
|
|
96
|
-
let messageId
|
|
97
96
|
if (hello) {
|
|
98
|
-
|
|
97
|
+
await this.messageSendText(contactId, hello)
|
|
99
98
|
}
|
|
100
99
|
|
|
101
100
|
if (!(await this.contactRawPayloadParser(contactPayload)).friend) {
|
|
102
101
|
this.emit('friendship', {
|
|
103
|
-
friendshipId:
|
|
102
|
+
friendshipId: `friendshipFromContact-${contactId}-timestamp-${String(Date.now())}`,
|
|
104
103
|
})
|
|
105
104
|
}
|
|
106
105
|
}
|
|
@@ -38,7 +38,14 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
38
38
|
return
|
|
39
39
|
}
|
|
40
40
|
const messageId = message.id.id
|
|
41
|
-
|
|
41
|
+
let cacheManager
|
|
42
|
+
try {
|
|
43
|
+
cacheManager = await this.manager.getCacheManager()
|
|
44
|
+
} catch (e) {}
|
|
45
|
+
if (!cacheManager) {
|
|
46
|
+
// message comes before login process finished
|
|
47
|
+
return
|
|
48
|
+
}
|
|
42
49
|
const messageInCache = await cacheManager.getMessageRawPayload(messageId)
|
|
43
50
|
if (messageInCache) {
|
|
44
51
|
return
|