@juzi/wechaty-puppet-whatsapp 1.0.16 → 1.0.18
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 +4 -4
- package/dist/cjs/src/package-json.js.map +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.d.ts +4 -0
- package/dist/cjs/src/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.js +41 -6
- package/dist/cjs/src/puppet-mixin/friendship.js.map +1 -1
- package/dist/cjs/src/puppet-whatsapp.d.ts.map +1 -1
- package/dist/cjs/src/puppet-whatsapp.js +8 -1
- package/dist/cjs/src/puppet-whatsapp.js.map +1 -1
- package/dist/esm/src/package-json.js +4 -4
- package/dist/esm/src/package-json.js.map +1 -1
- package/dist/esm/src/puppet-mixin/friendship.d.ts +4 -0
- package/dist/esm/src/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/esm/src/puppet-mixin/friendship.js +40 -6
- package/dist/esm/src/puppet-mixin/friendship.js.map +1 -1
- package/dist/esm/src/puppet-whatsapp.d.ts.map +1 -1
- package/dist/esm/src/puppet-whatsapp.js +9 -2
- package/dist/esm/src/puppet-whatsapp.js.map +1 -1
- package/package.json +4 -4
- package/src/package-json.ts +4 -4
- package/src/puppet-mixin/friendship.ts +44 -6
- package/src/puppet-whatsapp.ts +8 -2
|
@@ -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.18",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -52,9 +52,9 @@ exports.packageJson = {
|
|
|
52
52
|
},
|
|
53
53
|
"homepage": "https://github.com/juzibot/puppet-whatsapp#readme",
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@chatie/eslint-config": "
|
|
55
|
+
"@chatie/eslint-config": "1.0.4",
|
|
56
56
|
"@chatie/semver": "^0.4.7",
|
|
57
|
-
"@chatie/tsconfig": "
|
|
57
|
+
"@chatie/tsconfig": "4.6.3",
|
|
58
58
|
"@juzi/wechaty-puppet": "^1.0.30",
|
|
59
59
|
"@types/cuid": "^2.0.1",
|
|
60
60
|
"@types/fs-extra": "^9.0.13",
|
|
@@ -68,7 +68,7 @@ exports.packageJson = {
|
|
|
68
68
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
69
69
|
},
|
|
70
70
|
"dependencies": {
|
|
71
|
-
"@juzi/whatsapp-web.js": "^1.18.
|
|
71
|
+
"@juzi/whatsapp-web.js": "^1.18.8",
|
|
72
72
|
"ee-ts": "^1.0.2",
|
|
73
73
|
"flash-store": "^1.0.6",
|
|
74
74
|
"fs-extra": "^10.0.1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":";;;AAIa,QAAA,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":";;;AAIa,QAAA,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,OAAO;QAChC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,sBAAsB,EAAE,SAAS;QACjC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,QAAQ;QACvB,sBAAsB,EAAE,QAAQ;QAChC,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,SAAS;QAC5B,QAAQ,EAAE,QAAQ;KACnB;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,QAAQ;QACjB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;QACzB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,SAAS;KACvB;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;CACK,CAAA"}
|
|
@@ -9,4 +9,8 @@ export declare function friendshipSearchWeixin(weixin: string): Promise<null | s
|
|
|
9
9
|
export declare function friendshipSearchHandle(handle: string): Promise<null | string>;
|
|
10
10
|
export declare function friendshipAdd(this: PuppetWhatsApp, contactId: string, option?: PUPPET.types.FriendshipAddOptions): Promise<void>;
|
|
11
11
|
export declare function friendshipAccept(friendshipId: string): Promise<void>;
|
|
12
|
+
export declare function getFriendshipFromContactData(id: string): {
|
|
13
|
+
contactId: string;
|
|
14
|
+
timestamp: number;
|
|
15
|
+
};
|
|
12
16
|
//# sourceMappingURL=friendship.d.ts.map
|
|
@@ -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,
|
|
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,CA+Bf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,4BAA4B,CAAE,EAAE,EAAE,MAAM;;;EAWvD"}
|
|
@@ -26,13 +26,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.friendshipAccept = exports.friendshipAdd = exports.friendshipSearchHandle = exports.friendshipSearchWeixin = exports.friendshipSearchPhone = exports.friendshipRawPayloadParser = exports.friendshipRawPayload = void 0;
|
|
29
|
+
exports.getFriendshipFromContactData = exports.friendshipAccept = exports.friendshipAdd = exports.friendshipSearchHandle = exports.friendshipSearchWeixin = exports.friendshipSearchPhone = exports.friendshipRawPayloadParser = exports.friendshipRawPayload = void 0;
|
|
30
30
|
const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
|
|
31
31
|
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
|
const PRE = 'MIXIN_FRIENDSHIP';
|
|
35
35
|
async function friendshipRawPayload(id) {
|
|
36
|
+
if (id.startsWith('friendshipFromContact-')) {
|
|
37
|
+
// friendship from friendshipAdd
|
|
38
|
+
const data = getFriendshipFromContactData(id);
|
|
39
|
+
return {
|
|
40
|
+
from: data.contactId,
|
|
41
|
+
body: '',
|
|
42
|
+
id: {
|
|
43
|
+
id,
|
|
44
|
+
},
|
|
45
|
+
timestamp: data.timestamp,
|
|
46
|
+
type: PUPPET.types.Friendship.Confirm,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
36
49
|
const cache = await this.manager.getCacheManager();
|
|
37
50
|
const message = await cache.getMessageRawPayload(id);
|
|
38
51
|
if (!message) {
|
|
@@ -79,16 +92,25 @@ async function friendshipAdd(contactId, option) {
|
|
|
79
92
|
else {
|
|
80
93
|
hello = option || '';
|
|
81
94
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
95
|
+
// allow no hello for miaohui batch add
|
|
96
|
+
// if (hello.length === 0) {
|
|
97
|
+
// hello = STRINGS[LANGUAGE].DEFAULT_HELLO_MESSAGE
|
|
98
|
+
// }
|
|
85
99
|
config_js_1.log.verbose(PRE, 'friendshipAdd(%s, %s)', contactId, JSON.stringify(option));
|
|
86
100
|
const isUser = await this.manager.isWhatsappUser(contactId);
|
|
87
101
|
if (!isUser) {
|
|
88
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}`);
|
|
89
103
|
}
|
|
90
|
-
await this.contactRawPayload(contactId);
|
|
91
|
-
|
|
104
|
+
const contactPayload = await this.contactRawPayload(contactId);
|
|
105
|
+
let messageId;
|
|
106
|
+
if (hello) {
|
|
107
|
+
messageId = await this.messageSendText(contactId, hello);
|
|
108
|
+
}
|
|
109
|
+
if (!(await this.contactRawPayloadParser(contactPayload)).friend) {
|
|
110
|
+
this.emit('friendship', {
|
|
111
|
+
friendshipId: messageId || `friendshipFromContact-${contactId}-timestamp-${String(Date.now())}`,
|
|
112
|
+
});
|
|
113
|
+
}
|
|
92
114
|
}
|
|
93
115
|
exports.friendshipAdd = friendshipAdd;
|
|
94
116
|
async function friendshipAccept(friendshipId) {
|
|
@@ -96,4 +118,17 @@ async function friendshipAccept(friendshipId) {
|
|
|
96
118
|
return PUPPET.throwUnsupportedError();
|
|
97
119
|
}
|
|
98
120
|
exports.friendshipAccept = friendshipAccept;
|
|
121
|
+
function getFriendshipFromContactData(id) {
|
|
122
|
+
if (!id.startsWith('friendshipFromContact-')) {
|
|
123
|
+
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a friendshipFromContact id', `id: ${id}`);
|
|
124
|
+
}
|
|
125
|
+
const idLength = id.length;
|
|
126
|
+
const contactId = id.substring(22, idLength - 24);
|
|
127
|
+
const timestamp = Number(id.substring(idLength - 13));
|
|
128
|
+
return {
|
|
129
|
+
contactId,
|
|
130
|
+
timestamp,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
exports.getFriendshipFromContactData = getFriendshipFromContactData;
|
|
99
134
|
//# sourceMappingURL=friendship.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,4CAAkC;AAClC,8DAA0D;AAC1D,uFAAoD;AAIpD,MAAM,GAAG,GAAG,kBAAkB,CAAA;AAIvB,KAAK,UAAU,oBAAoB,CAAwB,EAAU;IAC1E,IAAI,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC3C,gCAAgC;QAChC,MAAM,IAAI,GAAG,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAC7C,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,IAAI,EAAE,EAAE;YACR,EAAE,EAAE;gBACF,EAAE;aACH;YACD,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SAC/B,CAAA;KACT;IACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;KACxF;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AApBD,oDAoBC;AAEM,KAAK,UAAU,0BAA0B,CAAE,UAAgC;IAChF,OAAO;QACL,SAAS,EAAE,UAAU,CAAC,IAAI;QAC1B,KAAK,EAAE,UAAU,CAAC,IAAI;QACtB,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE;QACpB,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;KACtC,CAAA;AACH,CAAC;AARD,gEAQC;AAEM,KAAK,UAAU,qBAAqB,CAEzC,KAAa;IAEb,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACpD,MAAM,SAAS,GAAG,GAAG,KAAK,OAAO,CAAA;IACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,qBAAqB,EAAE,oCAAoC,EAAE,cAAc,SAAS,EAAE,CAAC,CAAA;KACpH;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAXD,sDAWC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AALD,wDAKC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AALD,wDAKC;AAEM,KAAK,UAAU,aAAa,CAEjC,SAAiB,EACjB,MAA0C;IAE1C,IAAI,KAAK,GAAW,EAAE,CAAA;IACtB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;QAChC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAA;KAC3B;SAAM;QACL,KAAK,GAAG,MAAM,IAAI,EAAE,CAAA;KACrB;IAED,uCAAuC;IACvC,4BAA4B;IAC5B,oDAAoD;IACpD,IAAI;IAEJ,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,qBAAqB,EAAE,oCAAoC,EAAE,cAAc,SAAS,EAAE,CAAC,CAAA;KACpH;IAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IAE9D,IAAI,SAAS,CAAA;IACb,IAAI,KAAK,EAAE;QACT,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;KACzD;IAED,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE;QAChE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,YAAY,EAAE,SAAS,IAAI,yBAAyB,SAAS,cAAc,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE;SAChG,CAAC,CAAA;KACH;AACH,CAAC;AAnCD,sCAmCC;AAEM,KAAK,UAAU,gBAAgB,CACpC,YAAoB;IAEpB,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,sBAAsB,EAAE,YAAY,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AALD,4CAKC;AAED,SAAgB,4BAA4B,CAAE,EAAU;IACtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC5C,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,qBAAqB,EAAE,gCAAgC,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;KAClG;IACD,MAAM,QAAQ,GAAG,EAAE,CAAC,MAAM,CAAA;IAC1B,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAA;IACrD,OAAO;QACL,SAAS;QACT,SAAS;KACV,CAAA;AACH,CAAC;AAXD,oEAWC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAM7C,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAA;AAKlF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC5L,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -185,7 +185,14 @@ class PuppetWhatsapp extends PUPPET.Puppet {
|
|
|
185
185
|
this.emit('reset', { data: reason });
|
|
186
186
|
}
|
|
187
187
|
async onFriendship(payload) {
|
|
188
|
-
|
|
188
|
+
let contactId;
|
|
189
|
+
if (payload.friendshipId.startsWith('friendshipFromContact-')) {
|
|
190
|
+
// friendship from friendshipAdd
|
|
191
|
+
contactId = (0, friendship_js_1.getFriendshipFromContactData)(payload.friendshipId).contactId;
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
contactId = await this.messageContact(payload.friendshipId);
|
|
195
|
+
}
|
|
189
196
|
// NOTE: this function automatically put non-contact into cache
|
|
190
197
|
await this.contactRawPayload(contactId);
|
|
191
198
|
this.emit('friendship', payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,6DAA8C;AAC9C,yDAA0C;AAG1C,2CAEwD;AAExD,8DAAkC;AAGlC,sFAAmD;AACnD,6DAAyD;AACzD,0DAAkD;AAClD,+DAAuD;AACvD,oEAAyG;AACzG,0DAA4L;AAC5L,oEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.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.18",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -49,9 +49,9 @@ export const packageJson = {
|
|
|
49
49
|
},
|
|
50
50
|
"homepage": "https://github.com/juzibot/puppet-whatsapp#readme",
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@chatie/eslint-config": "
|
|
52
|
+
"@chatie/eslint-config": "1.0.4",
|
|
53
53
|
"@chatie/semver": "^0.4.7",
|
|
54
|
-
"@chatie/tsconfig": "
|
|
54
|
+
"@chatie/tsconfig": "4.6.3",
|
|
55
55
|
"@juzi/wechaty-puppet": "^1.0.30",
|
|
56
56
|
"@types/cuid": "^2.0.1",
|
|
57
57
|
"@types/fs-extra": "^9.0.13",
|
|
@@ -65,7 +65,7 @@ export const packageJson = {
|
|
|
65
65
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@juzi/whatsapp-web.js": "^1.18.
|
|
68
|
+
"@juzi/whatsapp-web.js": "^1.18.8",
|
|
69
69
|
"ee-ts": "^1.0.2",
|
|
70
70
|
"flash-store": "^1.0.6",
|
|
71
71
|
"fs-extra": "^10.0.1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,OAAO;QAChC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,sBAAsB,EAAE,SAAS;QACjC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,QAAQ;QACvB,sBAAsB,EAAE,QAAQ;QAChC,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,SAAS;QAC5B,QAAQ,EAAE,QAAQ;KACnB;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,QAAQ;QACjB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;QACzB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,SAAS;KACvB;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;CACK,CAAA"}
|
|
@@ -9,4 +9,8 @@ export declare function friendshipSearchWeixin(weixin: string): Promise<null | s
|
|
|
9
9
|
export declare function friendshipSearchHandle(handle: string): Promise<null | string>;
|
|
10
10
|
export declare function friendshipAdd(this: PuppetWhatsApp, contactId: string, option?: PUPPET.types.FriendshipAddOptions): Promise<void>;
|
|
11
11
|
export declare function friendshipAccept(friendshipId: string): Promise<void>;
|
|
12
|
+
export declare function getFriendshipFromContactData(id: string): {
|
|
13
|
+
contactId: string;
|
|
14
|
+
timestamp: number;
|
|
15
|
+
};
|
|
12
16
|
//# sourceMappingURL=friendship.d.ts.map
|
|
@@ -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,
|
|
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,CA+Bf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,4BAA4B,CAAE,EAAE,EAAE,MAAM;;;EAWvD"}
|
|
@@ -1,9 +1,22 @@
|
|
|
1
1
|
import * as PUPPET from '@juzi/wechaty-puppet';
|
|
2
|
-
import {
|
|
2
|
+
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
|
const PRE = 'MIXIN_FRIENDSHIP';
|
|
6
6
|
export async function friendshipRawPayload(id) {
|
|
7
|
+
if (id.startsWith('friendshipFromContact-')) {
|
|
8
|
+
// friendship from friendshipAdd
|
|
9
|
+
const data = getFriendshipFromContactData(id);
|
|
10
|
+
return {
|
|
11
|
+
from: data.contactId,
|
|
12
|
+
body: '',
|
|
13
|
+
id: {
|
|
14
|
+
id,
|
|
15
|
+
},
|
|
16
|
+
timestamp: data.timestamp,
|
|
17
|
+
type: PUPPET.types.Friendship.Confirm,
|
|
18
|
+
};
|
|
19
|
+
}
|
|
7
20
|
const cache = await this.manager.getCacheManager();
|
|
8
21
|
const message = await cache.getMessageRawPayload(id);
|
|
9
22
|
if (!message) {
|
|
@@ -45,19 +58,40 @@ export async function friendshipAdd(contactId, option) {
|
|
|
45
58
|
else {
|
|
46
59
|
hello = option || '';
|
|
47
60
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
61
|
+
// allow no hello for miaohui batch add
|
|
62
|
+
// if (hello.length === 0) {
|
|
63
|
+
// hello = STRINGS[LANGUAGE].DEFAULT_HELLO_MESSAGE
|
|
64
|
+
// }
|
|
51
65
|
log.verbose(PRE, 'friendshipAdd(%s, %s)', contactId, JSON.stringify(option));
|
|
52
66
|
const isUser = await this.manager.isWhatsappUser(contactId);
|
|
53
67
|
if (!isUser) {
|
|
54
68
|
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`);
|
|
55
69
|
}
|
|
56
|
-
await this.contactRawPayload(contactId);
|
|
57
|
-
|
|
70
|
+
const contactPayload = await this.contactRawPayload(contactId);
|
|
71
|
+
let messageId;
|
|
72
|
+
if (hello) {
|
|
73
|
+
messageId = await this.messageSendText(contactId, hello);
|
|
74
|
+
}
|
|
75
|
+
if (!(await this.contactRawPayloadParser(contactPayload)).friend) {
|
|
76
|
+
this.emit('friendship', {
|
|
77
|
+
friendshipId: messageId || `friendshipFromContact-${contactId}-timestamp-${String(Date.now())}`,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
58
80
|
}
|
|
59
81
|
export async function friendshipAccept(friendshipId) {
|
|
60
82
|
log.verbose(PRE, 'friendshipAccept(%s)', friendshipId);
|
|
61
83
|
return PUPPET.throwUnsupportedError();
|
|
62
84
|
}
|
|
85
|
+
export function getFriendshipFromContactData(id) {
|
|
86
|
+
if (!id.startsWith('friendshipFromContact-')) {
|
|
87
|
+
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a friendshipFromContact id', `id: ${id}`);
|
|
88
|
+
}
|
|
89
|
+
const idLength = id.length;
|
|
90
|
+
const contactId = id.substring(22, idLength - 24);
|
|
91
|
+
const timestamp = Number(id.substring(idLength - 13));
|
|
92
|
+
return {
|
|
93
|
+
contactId,
|
|
94
|
+
timestamp,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
63
97
|
//# sourceMappingURL=friendship.js.map
|
|
@@ -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,
|
|
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":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAM7C,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAA;AAKlF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC5L,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ import { RequestPool } from './request/request-pool.js';
|
|
|
27
27
|
import { contactSelfQRCode, contactSelfName, contactSelfSignature } from './puppet-mixin/contact-self.js';
|
|
28
28
|
import { contactAlias, contactPhone, contactCorporationRemark, contactDescription, contactList, contactAvatar, contactRawPayloadParser, contactRawPayload } from './puppet-mixin/contact.js';
|
|
29
29
|
import { conversationReadMark } from './puppet-mixin/conversation.js';
|
|
30
|
-
import { friendshipRawPayload, friendshipRawPayloadParser, friendshipSearchPhone, friendshipSearchWeixin, friendshipAdd, friendshipAccept, friendshipSearchHandle } from './puppet-mixin/friendship.js';
|
|
30
|
+
import { friendshipRawPayload, friendshipRawPayloadParser, friendshipSearchPhone, friendshipSearchWeixin, friendshipAdd, friendshipAccept, friendshipSearchHandle, getFriendshipFromContactData } from './puppet-mixin/friendship.js';
|
|
31
31
|
import { messageContact, messageImage, messageRecall, messageFile, messageUrl, messageMiniProgram, messageSendText, messageSendFile, messageSendContact, messageSendUrl, messageSendMiniProgram, messageForward, messageRawPayloadParser, messageRawPayload, messagePost, messageSendChannel, messageChannel, messageSendLocation, messageLocation } from './puppet-mixin/message.js';
|
|
32
32
|
import { roomRawPayloadParser, roomRawPayload, roomList, roomDel, roomAvatar, roomAdd, roomTopic, roomCreate, roomQuit, roomQRCode, roomMemberList, roomMemberRawPayload, roomMemberRawPayloadParser, roomAnnounce, roomInvitationAccept, roomInvitationRawPayload, roomInvitationRawPayloadParser } from './puppet-mixin/room.js';
|
|
33
33
|
import { tagContactTagAdd, tagContactTagList, tagContactTagRemove, tagGroupAdd, tagGroupDelete, tagGroupList, tagGroupTagList, tagTagAdd, tagTagContactList, tagTagDelete, tagTagList } from './puppet-mixin/tag.js';
|
|
@@ -156,7 +156,14 @@ class PuppetWhatsapp extends PUPPET.Puppet {
|
|
|
156
156
|
this.emit('reset', { data: reason });
|
|
157
157
|
}
|
|
158
158
|
async onFriendship(payload) {
|
|
159
|
-
|
|
159
|
+
let contactId;
|
|
160
|
+
if (payload.friendshipId.startsWith('friendshipFromContact-')) {
|
|
161
|
+
// friendship from friendshipAdd
|
|
162
|
+
contactId = getFriendshipFromContactData(payload.friendshipId).contactId;
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
contactId = await this.messageContact(payload.friendshipId);
|
|
166
|
+
}
|
|
160
167
|
// NOTE: this function automatically put non-contact into cache
|
|
161
168
|
await this.contactRawPayload(contactId);
|
|
162
169
|
this.emit('friendship', payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,EACL,OAAO,GACR,MAA0C,aAAa,CAAA;AAExD,OAAO,OAAO,MAAM,cAAc,CAAA;AAGlC,OAAO,OAAO,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC5L,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.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.18",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
},
|
|
50
50
|
"homepage": "https://github.com/juzibot/puppet-whatsapp#readme",
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@chatie/eslint-config": "
|
|
52
|
+
"@chatie/eslint-config": "1.0.4",
|
|
53
53
|
"@chatie/semver": "^0.4.7",
|
|
54
|
-
"@chatie/tsconfig": "
|
|
54
|
+
"@chatie/tsconfig": "4.6.3",
|
|
55
55
|
"@juzi/wechaty-puppet": "^1.0.30",
|
|
56
56
|
"@types/cuid": "^2.0.1",
|
|
57
57
|
"@types/fs-extra": "^9.0.13",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@juzi/whatsapp-web.js": "^1.18.
|
|
68
|
+
"@juzi/whatsapp-web.js": "^1.18.8",
|
|
69
69
|
"ee-ts": "^1.0.2",
|
|
70
70
|
"flash-store": "^1.0.6",
|
|
71
71
|
"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.18",
|
|
8
8
|
"description": "Wechaty Puppet for WhatsApp",
|
|
9
9
|
"type": "module",
|
|
10
10
|
"exports": {
|
|
@@ -53,9 +53,9 @@ export const packageJson: PackageJson = {
|
|
|
53
53
|
},
|
|
54
54
|
"homepage": "https://github.com/juzibot/puppet-whatsapp#readme",
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@chatie/eslint-config": "
|
|
56
|
+
"@chatie/eslint-config": "1.0.4",
|
|
57
57
|
"@chatie/semver": "^0.4.7",
|
|
58
|
-
"@chatie/tsconfig": "
|
|
58
|
+
"@chatie/tsconfig": "4.6.3",
|
|
59
59
|
"@juzi/wechaty-puppet": "^1.0.30",
|
|
60
60
|
"@types/cuid": "^2.0.1",
|
|
61
61
|
"@types/fs-extra": "^9.0.13",
|
|
@@ -69,7 +69,7 @@ export const packageJson: PackageJson = {
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@juzi/whatsapp-web.js": "^1.18.
|
|
72
|
+
"@juzi/whatsapp-web.js": "^1.18.8",
|
|
73
73
|
"ee-ts": "^1.0.2",
|
|
74
74
|
"flash-store": "^1.0.6",
|
|
75
75
|
"fs-extra": "^10.0.1",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as PUPPET from '@juzi/wechaty-puppet'
|
|
2
|
-
import {
|
|
2
|
+
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 type PuppetWhatsApp from '../puppet-whatsapp.js'
|
|
@@ -10,6 +10,19 @@ const PRE = 'MIXIN_FRIENDSHIP'
|
|
|
10
10
|
export type FriendshipRawPayload = WhatsAppMessagePayload
|
|
11
11
|
|
|
12
12
|
export async function friendshipRawPayload (this: PuppetWhatsApp, id: string): Promise<FriendshipRawPayload> {
|
|
13
|
+
if (id.startsWith('friendshipFromContact-')) {
|
|
14
|
+
// friendship from friendshipAdd
|
|
15
|
+
const data = getFriendshipFromContactData(id)
|
|
16
|
+
return {
|
|
17
|
+
from: data.contactId,
|
|
18
|
+
body: '',
|
|
19
|
+
id: {
|
|
20
|
+
id,
|
|
21
|
+
},
|
|
22
|
+
timestamp: data.timestamp,
|
|
23
|
+
type: PUPPET.types.Friendship.Confirm,
|
|
24
|
+
} as any
|
|
25
|
+
}
|
|
13
26
|
const cache = await this.manager.getCacheManager()
|
|
14
27
|
const message = await cache.getMessageRawPayload(id)
|
|
15
28
|
if (!message) {
|
|
@@ -66,18 +79,30 @@ export async function friendshipAdd (
|
|
|
66
79
|
} else {
|
|
67
80
|
hello = option || ''
|
|
68
81
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
82
|
+
|
|
83
|
+
// allow no hello for miaohui batch add
|
|
84
|
+
// if (hello.length === 0) {
|
|
85
|
+
// hello = STRINGS[LANGUAGE].DEFAULT_HELLO_MESSAGE
|
|
86
|
+
// }
|
|
87
|
+
|
|
72
88
|
log.verbose(PRE, 'friendshipAdd(%s, %s)', contactId, JSON.stringify(option))
|
|
73
89
|
const isUser = await this.manager.isWhatsappUser(contactId)
|
|
74
90
|
if (!isUser) {
|
|
75
91
|
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`)
|
|
76
92
|
}
|
|
77
93
|
|
|
78
|
-
await this.contactRawPayload(contactId)
|
|
94
|
+
const contactPayload = await this.contactRawPayload(contactId)
|
|
95
|
+
|
|
96
|
+
let messageId
|
|
97
|
+
if (hello) {
|
|
98
|
+
messageId = await this.messageSendText(contactId, hello)
|
|
99
|
+
}
|
|
79
100
|
|
|
80
|
-
await this.
|
|
101
|
+
if (!(await this.contactRawPayloadParser(contactPayload)).friend) {
|
|
102
|
+
this.emit('friendship', {
|
|
103
|
+
friendshipId: messageId || `friendshipFromContact-${contactId}-timestamp-${String(Date.now())}`,
|
|
104
|
+
})
|
|
105
|
+
}
|
|
81
106
|
}
|
|
82
107
|
|
|
83
108
|
export async function friendshipAccept (
|
|
@@ -86,3 +111,16 @@ export async function friendshipAccept (
|
|
|
86
111
|
log.verbose(PRE, 'friendshipAccept(%s)', friendshipId)
|
|
87
112
|
return PUPPET.throwUnsupportedError()
|
|
88
113
|
}
|
|
114
|
+
|
|
115
|
+
export function getFriendshipFromContactData (id: string) {
|
|
116
|
+
if (!id.startsWith('friendshipFromContact-')) {
|
|
117
|
+
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a friendshipFromContact id', `id: ${id}`)
|
|
118
|
+
}
|
|
119
|
+
const idLength = id.length
|
|
120
|
+
const contactId = id.substring(22, idLength - 24)
|
|
121
|
+
const timestamp = Number(id.substring(idLength - 13))
|
|
122
|
+
return {
|
|
123
|
+
contactId,
|
|
124
|
+
timestamp,
|
|
125
|
+
}
|
|
126
|
+
}
|
package/src/puppet-whatsapp.ts
CHANGED
|
@@ -34,7 +34,7 @@ import { RequestPool } from './request/request-pool.js'
|
|
|
34
34
|
import { contactSelfQRCode, contactSelfName, contactSelfSignature } from './puppet-mixin/contact-self.js'
|
|
35
35
|
import { contactAlias, contactPhone, contactCorporationRemark, contactDescription, contactList, contactAvatar, contactRawPayloadParser, contactRawPayload } from './puppet-mixin/contact.js'
|
|
36
36
|
import { conversationReadMark } from './puppet-mixin/conversation.js'
|
|
37
|
-
import { friendshipRawPayload, friendshipRawPayloadParser, friendshipSearchPhone, friendshipSearchWeixin, friendshipAdd, friendshipAccept, friendshipSearchHandle } from './puppet-mixin/friendship.js'
|
|
37
|
+
import { friendshipRawPayload, friendshipRawPayloadParser, friendshipSearchPhone, friendshipSearchWeixin, friendshipAdd, friendshipAccept, friendshipSearchHandle, getFriendshipFromContactData } from './puppet-mixin/friendship.js'
|
|
38
38
|
import { messageContact, messageImage, messageRecall, messageFile, messageUrl, messageMiniProgram, messageSendText, messageSendFile, messageSendContact, messageSendUrl, messageSendMiniProgram, messageForward, messageRawPayloadParser, messageRawPayload, messagePost, messageSendChannel, messageChannel, messageSendLocation, messageLocation } from './puppet-mixin/message.js'
|
|
39
39
|
import { roomRawPayloadParser, roomRawPayload, roomList, roomDel, roomAvatar, roomAdd, roomTopic, roomCreate, roomQuit, roomQRCode, roomMemberList, roomMemberRawPayload, roomMemberRawPayloadParser, roomAnnounce, roomInvitationAccept, roomInvitationRawPayload, roomInvitationRawPayloadParser } from './puppet-mixin/room.js'
|
|
40
40
|
import { tagContactTagAdd, tagContactTagList, tagContactTagRemove, tagGroupAdd, tagGroupDelete, tagGroupList, tagGroupTagList, tagTagAdd, tagTagContactList, tagTagDelete, tagTagList } from './puppet-mixin/tag.js'
|
|
@@ -197,7 +197,13 @@ class PuppetWhatsapp extends PUPPET.Puppet {
|
|
|
197
197
|
}
|
|
198
198
|
|
|
199
199
|
private async onFriendship (payload: PUPPET.payloads.EventFriendship): Promise<void> {
|
|
200
|
-
|
|
200
|
+
let contactId: string
|
|
201
|
+
if (payload.friendshipId.startsWith('friendshipFromContact-')) {
|
|
202
|
+
// friendship from friendshipAdd
|
|
203
|
+
contactId = getFriendshipFromContactData(payload.friendshipId).contactId
|
|
204
|
+
} else {
|
|
205
|
+
contactId = await this.messageContact(payload.friendshipId)
|
|
206
|
+
}
|
|
201
207
|
// NOTE: this function automatically put non-contact into cache
|
|
202
208
|
await this.contactRawPayload(contactId)
|
|
203
209
|
this.emit('friendship', payload)
|