n8n-nodes-genisys-whatsapp 0.1.4 → 0.1.6
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/nodes/WhatsAppTrigger/WhatsAppTrigger.node.js +19 -15
- package/dist/nodes/WhatsAppTrigger/WhatsAppTrigger.node.js.map +1 -1
- package/dist/nodes/WhatsAppTypeRouter/WhatsAppTypeRouter.node.js +3 -2
- package/dist/nodes/WhatsAppTypeRouter/WhatsAppTypeRouter.node.js.map +1 -1
- package/package.json +1 -1
|
@@ -112,32 +112,36 @@ class WhatsAppTrigger {
|
|
|
112
112
|
}
|
|
113
113
|
async webhook() {
|
|
114
114
|
const bodyData = this.getBodyData();
|
|
115
|
-
const filterByType = this.getNodeParameter('filterByType');
|
|
116
|
-
const filterBySource = this.getNodeParameter('filterBySource');
|
|
117
|
-
const ignoreOwnMessages = this.getNodeParameter('ignoreOwnMessages');
|
|
115
|
+
const filterByType = this.getNodeParameter('filterByType', []);
|
|
116
|
+
const filterBySource = this.getNodeParameter('filterBySource', 'all');
|
|
117
|
+
const ignoreOwnMessages = this.getNodeParameter('ignoreOwnMessages', true);
|
|
118
118
|
const message = bodyData.message;
|
|
119
|
-
const chat = bodyData.chat;
|
|
119
|
+
const chat = bodyData.chat || {};
|
|
120
120
|
if (!message) {
|
|
121
121
|
return {};
|
|
122
122
|
}
|
|
123
|
-
if (
|
|
124
|
-
|
|
125
|
-
let checkType = type;
|
|
126
|
-
if (checkType === 'ptt')
|
|
127
|
-
checkType = 'audio';
|
|
128
|
-
if (!filterByType.includes(checkType) && !filterByType.includes(type)) {
|
|
129
|
-
return {};
|
|
130
|
-
}
|
|
123
|
+
if (ignoreOwnMessages && message.fromMe === true) {
|
|
124
|
+
return {};
|
|
131
125
|
}
|
|
132
|
-
const isGroup = chat
|
|
126
|
+
const isGroup = chat.isGroup === true || (typeof message.author === 'string' && message.author.includes('@g.us'));
|
|
133
127
|
if (filterBySource === 'private' && isGroup) {
|
|
134
128
|
return {};
|
|
135
129
|
}
|
|
136
130
|
if (filterBySource === 'group' && !isGroup) {
|
|
137
131
|
return {};
|
|
138
132
|
}
|
|
139
|
-
if (
|
|
140
|
-
|
|
133
|
+
if (filterByType.length > 0) {
|
|
134
|
+
let type = (message.type || '').toLowerCase();
|
|
135
|
+
if (type === 'ptt')
|
|
136
|
+
type = 'audio';
|
|
137
|
+
const passes = filterByType.some(filter => {
|
|
138
|
+
if (filter === 'audio' && (type === 'audio' || type === 'ptt'))
|
|
139
|
+
return true;
|
|
140
|
+
return filter === type;
|
|
141
|
+
});
|
|
142
|
+
if (!passes) {
|
|
143
|
+
return {};
|
|
144
|
+
}
|
|
141
145
|
}
|
|
142
146
|
return {
|
|
143
147
|
workflowData: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhatsAppTrigger.node.js","sourceRoot":"","sources":["../../../nodes/WhatsAppTrigger/WhatsAppTrigger.node.ts"],"names":[],"mappings":";;;AASA,MAAa,eAAe;IAA5B;QACI,gBAAW,GAAyB;YAChC,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,CAAC,SAAS,CAAC;YAClB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,yDAAyD;YACtE,QAAQ,EAAE;gBACN,IAAI,EAAE,kBAAkB;aAC3B;YACD,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE;gBACN;oBACI,IAAI,EAAE,SAAS;oBACf,UAAU,EAAE,MAAM;oBAClB,YAAY,EAAE,YAAY;oBAC1B,IAAI,EAAE,kBAAkB;iBAC3B;aACJ;YACD,UAAU,EAAE;gBACR;oBACI,WAAW,EAAE,QAAQ;oBACrB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,qBAAqB;4BAC3B,KAAK,EAAE,mBAAmB;yBAC7B;qBACJ;oBACD,OAAO,EAAE,mBAAmB;oBAC5B,WAAW,EAAE,yBAAyB;iBACzC;gBACD;oBACI,WAAW,EAAE,gBAAgB;oBAC7B,IAAI,EAAE,cAAc;oBACpB,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,KAAK,EAAE,MAAM;yBAChB;wBACD;4BACI,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,OAAO;yBACjB;wBACD;4BACI,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,OAAO;yBACjB;wBACD;4BACI,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,OAAO;yBACjB;wBACD;4BACI,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,UAAU;yBACpB;wBACD;4BACI,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,UAAU;yBACpB;wBACD;4BACI,IAAI,EAAE,SAAS;4BACf,KAAK,EAAE,SAAS;yBACnB;wBACD;4BACI,IAAI,EAAE,MAAM;4BACZ,KAAK,EAAE,MAAM;yBAChB;qBACJ;oBACD,OAAO,EAAE,EAAE;oBACX,WAAW,EAAE,2EAA2E;iBAC3F;gBACD;oBACI,WAAW,EAAE,kBAAkB;oBAC/B,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,KAAK;4BACX,KAAK,EAAE,KAAK;yBACf;wBACD;4BACI,IAAI,EAAE,oBAAoB;4BAC1B,KAAK,EAAE,SAAS;yBACnB;wBACD;4BACI,IAAI,EAAE,aAAa;4BACnB,KAAK,EAAE,OAAO;yBACjB;qBACJ;oBACD,OAAO,EAAE,KAAK;oBACd,WAAW,EAAE,+CAA+C;iBAC/D;gBACD;oBACI,WAAW,EAAE,wBAAwB;oBACrC,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,IAAI;oBACb,WAAW,EAAE,yCAAyC;iBACzD;aACJ;SACJ,CAAC;IA4DN,CAAC;IA1DG,KAAK,CAAC,OAAO;QACT,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAiB,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"WhatsAppTrigger.node.js","sourceRoot":"","sources":["../../../nodes/WhatsAppTrigger/WhatsAppTrigger.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,9 @@ class WhatsAppTypeRouter {
|
|
|
24
24
|
const returnData = [[], [], [], [], [], [], [], []];
|
|
25
25
|
for (let i = 0; i < items.length; i++) {
|
|
26
26
|
const item = items[i];
|
|
27
|
-
const
|
|
28
|
-
const
|
|
27
|
+
const root = item.json;
|
|
28
|
+
const message = (root.message || (root.body && root.body.message));
|
|
29
|
+
const type = ((message === null || message === void 0 ? void 0 : message.type) || '').toLowerCase();
|
|
29
30
|
if (type === 'text') {
|
|
30
31
|
returnData[0].push(item);
|
|
31
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhatsAppTypeRouter.node.js","sourceRoot":"","sources":["../../../nodes/WhatsAppTypeRouter/WhatsAppTypeRouter.node.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"WhatsAppTypeRouter.node.js","sourceRoot":"","sources":["../../../nodes/WhatsAppTypeRouter/WhatsAppTypeRouter.node.ts"],"names":[],"mappings":";;;AAQA,MAAa,kBAAkB;IAA/B;QACI,gBAAW,GAAyB;YAChC,WAAW,EAAE,sBAAsB;YACnC,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,oCAAoC;YACjD,QAAQ,EAAE;gBACN,IAAI,EAAE,sBAAsB;aAC/B;YACD,MAAM,EAAE,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YACzE,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC;YAC5F,UAAU,EAAE,EAAE;SACjB,CAAC;IAkCN,CAAC;IAhCG,KAAK,CAAC,OAAO;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAClC,MAAM,UAAU,GAA2B,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAE5E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YAEvB,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,IAAK,IAAI,CAAC,IAAoB,CAAC,OAAO,CAAC,CAAkC,CAAC;YACrH,MAAM,IAAI,GAAG,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,KAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YAEjD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBAClB,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC5C,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC1B,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC1B,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC5B,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACJ,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;QACL,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AAjDD,gDAiDC"}
|