@juzi/wechaty-puppet-whatsapp 1.0.71 → 1.0.73
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 +2 -2
- package/dist/cjs/src/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.js +10 -0
- package/dist/cjs/src/puppet-mixin/friendship.js.map +1 -1
- package/dist/esm/src/package-json.js +2 -2
- package/dist/esm/src/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/esm/src/puppet-mixin/friendship.js +10 -0
- package/dist/esm/src/puppet-mixin/friendship.js.map +1 -1
- package/package.json +2 -2
- package/src/package-json.ts +2 -2
- package/src/puppet-mixin/friendship.ts +10 -0
|
@@ -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.73",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -72,7 +72,7 @@ exports.packageJson = {
|
|
|
72
72
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
75
|
+
"@juzi/whatsapp-web.js": "1.30.22",
|
|
76
76
|
"ee-ts": "^1.0.2",
|
|
77
77
|
"flash-store": "^1.0.6",
|
|
78
78
|
"fs-extra": "^10.0.1",
|
|
@@ -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,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;
|
|
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,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAK1D,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjG;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE7G;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,CAqCf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAOf"}
|
|
@@ -32,6 +32,7 @@ const config_js_1 = require("../config.js");
|
|
|
32
32
|
const error_type_js_1 = require("../exception/error-type.js");
|
|
33
33
|
const whatsapp_error_js_1 = __importDefault(require("../exception/whatsapp-error.js"));
|
|
34
34
|
require("@juzi/wechaty-puppet/payloads");
|
|
35
|
+
const uuid_1 = require("uuid");
|
|
35
36
|
const PRE = 'MIXIN_FRIENDSHIP';
|
|
36
37
|
async function friendshipRawPayload(id) {
|
|
37
38
|
const cache = await this.manager.getCacheManager();
|
|
@@ -87,6 +88,15 @@ async function friendshipAdd(contactId, option) {
|
|
|
87
88
|
if (!contactPayload.isMyContact) {
|
|
88
89
|
const contactPhone = contactId.split('@')[0] || '';
|
|
89
90
|
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || contactPhone, '', true);
|
|
91
|
+
const friendshipPayload = {
|
|
92
|
+
id: (0, uuid_1.v4)(),
|
|
93
|
+
contactId: contactId,
|
|
94
|
+
type: PUPPET.types.Friendship.Confirm,
|
|
95
|
+
timestamp: Date.now(),
|
|
96
|
+
};
|
|
97
|
+
const cache = await this.manager.getCacheManager();
|
|
98
|
+
await cache.setFriendshipRawPayload(friendshipPayload.id, friendshipPayload);
|
|
99
|
+
this.emit('friendship', friendshipPayload.id);
|
|
90
100
|
}
|
|
91
101
|
if (hello) {
|
|
92
102
|
await this.messageSendText(contactId, hello);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,4CAAkC;AAClC,8DAA0D;AAC1D,uFAAoD;AAEpD,yCAA0D;
|
|
1
|
+
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export const packageJson = {
|
|
2
2
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.73",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,7 +69,7 @@ export const packageJson = {
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
72
|
+
"@juzi/whatsapp-web.js": "1.30.22",
|
|
73
73
|
"ee-ts": "^1.0.2",
|
|
74
74
|
"flash-store": "^1.0.6",
|
|
75
75
|
"fs-extra": "^10.0.1",
|
|
@@ -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,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;
|
|
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,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAK1D,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjG;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAE7G;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,CAqCf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAOf"}
|
|
@@ -3,6 +3,7 @@ import { log } from '../config.js';
|
|
|
3
3
|
import { WA_ERROR_TYPE } from '../exception/error-type.js';
|
|
4
4
|
import WAError from '../exception/whatsapp-error.js';
|
|
5
5
|
import '@juzi/wechaty-puppet/payloads';
|
|
6
|
+
import { v4 } from 'uuid';
|
|
6
7
|
const PRE = 'MIXIN_FRIENDSHIP';
|
|
7
8
|
export async function friendshipRawPayload(id) {
|
|
8
9
|
const cache = await this.manager.getCacheManager();
|
|
@@ -53,6 +54,15 @@ export async function friendshipAdd(contactId, option) {
|
|
|
53
54
|
if (!contactPayload.isMyContact) {
|
|
54
55
|
const contactPhone = contactId.split('@')[0] || '';
|
|
55
56
|
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || contactPhone, '', true);
|
|
57
|
+
const friendshipPayload = {
|
|
58
|
+
id: v4(),
|
|
59
|
+
contactId: contactId,
|
|
60
|
+
type: PUPPET.types.Friendship.Confirm,
|
|
61
|
+
timestamp: Date.now(),
|
|
62
|
+
};
|
|
63
|
+
const cache = await this.manager.getCacheManager();
|
|
64
|
+
await cache.setFriendshipRawPayload(friendshipPayload.id, friendshipPayload);
|
|
65
|
+
this.emit('friendship', friendshipPayload.id);
|
|
56
66
|
}
|
|
57
67
|
if (hello) {
|
|
58
68
|
await this.messageSendText(contactId, hello);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,OAAO,MAAM,gCAAgC,CAAA;AAEpD,OAA2B,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.73",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
72
|
+
"@juzi/whatsapp-web.js": "1.30.22",
|
|
73
73
|
"ee-ts": "^1.0.2",
|
|
74
74
|
"flash-store": "^1.0.6",
|
|
75
75
|
"fs-extra": "^10.0.1",
|
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.
|
|
7
|
+
"version": "1.0.73",
|
|
8
8
|
"description": "Wechaty Puppet for WhatsApp",
|
|
9
9
|
"type": "module",
|
|
10
10
|
"exports": {
|
|
@@ -73,7 +73,7 @@ export const packageJson: PackageJson = {
|
|
|
73
73
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
76
|
+
"@juzi/whatsapp-web.js": "1.30.22",
|
|
77
77
|
"ee-ts": "^1.0.2",
|
|
78
78
|
"flash-store": "^1.0.6",
|
|
79
79
|
"fs-extra": "^10.0.1",
|
|
@@ -4,6 +4,7 @@ import { WA_ERROR_TYPE } from '../exception/error-type.js'
|
|
|
4
4
|
import WAError from '../exception/whatsapp-error.js'
|
|
5
5
|
import type PuppetWhatsApp from '../puppet-whatsapp.js'
|
|
6
6
|
import { Friendship } from '@juzi/wechaty-puppet/payloads'
|
|
7
|
+
import { v4 } from 'uuid'
|
|
7
8
|
|
|
8
9
|
const PRE = 'MIXIN_FRIENDSHIP'
|
|
9
10
|
|
|
@@ -74,6 +75,15 @@ export async function friendshipAdd (
|
|
|
74
75
|
if (!contactPayload.isMyContact) {
|
|
75
76
|
const contactPhone = contactId.split('@')[0] || ''
|
|
76
77
|
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || contactPhone, '', true)
|
|
78
|
+
const friendshipPayload: PUPPET.payloads.Friendship = {
|
|
79
|
+
id: v4(),
|
|
80
|
+
contactId: contactId,
|
|
81
|
+
type: PUPPET.types.Friendship.Confirm,
|
|
82
|
+
timestamp: Date.now(),
|
|
83
|
+
}
|
|
84
|
+
const cache = await this.manager.getCacheManager()
|
|
85
|
+
await cache.setFriendshipRawPayload(friendshipPayload.id, friendshipPayload)
|
|
86
|
+
this.emit('friendship', friendshipPayload.id)
|
|
77
87
|
}
|
|
78
88
|
|
|
79
89
|
if (hello) {
|