cheveguerra/whatsapp-web.js
1
0
Fork 0
mirror of https://github.com/cheveguerra/whatsapp-web.js.git synced 2026-04-18 03:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ESLINT + Clean

Browse Source
This commit is contained in:
Rajeh Taher
2023-02-19 15:16:29 +02:00
committed by GitHub
parent f655453ca4
commit 7e3b2f6bde
2 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/structures/Buttons.js
View File

@@ -17,6 +17,7 @@ const MessageMedia = require('./MessageMedia');
* @property {{displayText: string, url: string}=} urlButton
* @property {{displayText: string, phoneNumber: string}=} callButton
* @property {{displayText: string, id: string}=} quickReplyButton
* @property {{regularButtons: {text: string, id: string}}=} regularButtons
*/
/**
@@ -28,8 +29,9 @@ class Buttons {
* @param {ButtonSpec[]} buttons - See {@link ButtonSpec}
* @param {string?} title
* @param {string?} footer
* @param {boolean?} templateOverride
*/
constructor(body, buttons, title, footer) {
constructor(body, buttons, title, footer, templateOverride) {
/**
* Message body
* @type {string|MessageMedia}
@@ -59,7 +61,7 @@ class Buttons {
* buttons of message
* @type {FormattedButtonSpec[]}
*/
this.buttons = this._format(buttons);
this.buttons = this._format(buttons, templateOverride);
if(!this.buttons.length){ throw '[BT01] No buttons';}
}
@@ -69,7 +71,7 @@ class Buttons {
* @param {ButtonSpec[]} buttons
* @returns {FormattedButtonSpec[]}
*/
_format(buttons){
_format(buttons, templateOverride){
// Limit the buttons (max 3 of regular and 3 of special buttons) 5 buttons total at the same time
const templateButtons = buttons.filter(button => button.url || button.number);
const regularButtons = buttons.filter(button => !button.url && !button.number);
@@ -78,7 +80,7 @@ class Buttons {
return buttons.map((button, index) => {
if (button.url && button.number && button.id) throw 'Only pick one of the following (url/number/id)';
if (button.number) {
console.log("[WARNING] THIS FEATURE (CALL BUTTONS) IS UNSTABLE AND IS NOT TESTED OR EXPECTED TO WORK ON ALL PLATFORMS. Help test this feature with us on https://github.com/wwebjs/buttons-test")
console.log('[WARNING] THIS FEATURE (CALL BUTTONS) IS UNSTABLE AND IS NOT TESTED OR EXPECTED TO WORK ON ALL PLATFORMS. Help test this feature with us on https://github.com/wwebjs/buttons-test');
return {
index,
callButton: {
@@ -87,7 +89,7 @@ class Buttons {
}
};
} else if (button.url) {
console.log("[WARNING] THIS FEATURE (URL BUTTONS) IS UNSTABLE AND IS NOT TESTED OR EXPECTED TO WORK ON ALL PLATFORMS. Help test this feature with us on https://github.com/wwebjs/buttons-test")
console.log('[WARNING] THIS FEATURE (URL BUTTONS) IS UNSTABLE AND IS NOT TESTED OR EXPECTED TO WORK ON ALL PLATFORMS. Help test this feature with us on https://github.com/wwebjs/buttons-test');
return {
index,
urlButton: {
@@ -96,13 +98,21 @@ class Buttons {
}
};
} else {
return {
if (templateOverride) return {
index,
quickReplyButton: {
displayText: button.body,
id: button.id || `${index}`
}
};
return {
index,
regularButtons: {
id: button.id,
text: button.body
}
}
}
});

71
src/util/Injected.js
View File

@@ -251,6 +251,20 @@ exports.ExposeStore = (moduleRaidStr) => {
property: 'typeAttributeFromProtobuf'
}, (func, args) => {
const [proto] = args;
if (proto.ephemeralMessage) {
const { message } = proto.ephemeralMessage;
return message ? func(message) : 'text';
}
if (proto.deviceSentMessage) {
const { message } = proto.deviceSentMessage;
return message ? func(message) : 'text';
}
if (proto.viewOnceMessage) {
const { message } = proto.viewOnceMessage;
return message ? func(message) : 'text';
}
if (proto.templateMessage?.hydratedTemplate) {
const keys = Object.keys(proto.templateMessage?.hydratedTemplate);
const messagePart = [
@@ -271,29 +285,6 @@ exports.ExposeStore = (moduleRaidStr) => {
) {
return 'text';
}
return func(...args);
});
window.injectToFunction({
index: 0,
name: 'typeAttributeFromProtobuf',
property: 'typeAttributeFromProtobuf'
}, (func, args) => {
const [proto] = args;
if (proto.ephemeralMessage) {
const { message } = proto.ephemeralMessage;
return message ? func(message) : 'text';
}
if (proto.deviceSentMessage) {
const { message } = proto.deviceSentMessage;
return message ? func(message) : 'text';
}
if (proto.viewOnceMessage) {
const { message } = proto.viewOnceMessage;
return message ? func(message) : 'text';
}
return func(...args);
});
@@ -304,30 +295,22 @@ exports.ExposeStore = (moduleRaidStr) => {
property: 'mediaTypeFromProtobuf'
}, (func, args) => {
const [proto] = args;
if (proto.deviceSentMessage) {
const { message } = proto.deviceSentMessage;
return message ? func(message) : null;
}
if (proto.ephemeralMessage) {
const { message } = proto.ephemeralMessage;
return message ? func(message) : null;
}
if (proto.viewOnceMessage) {
const { message } = proto.viewOnceMessage;
return message ? func(message) : null;
}
if (proto.templateMessage?.hydratedTemplate) {
return func(proto.templateMessage.hydratedTemplate);
}
return func(...args);
});
window.injectToFunction({
index: 0,
name: 'mediaTypeFromProtobuf',
property: 'mediaTypeFromProtobuf'
}, (func, args) => {
const [proto] = args;
if (proto.deviceSentMessage) {
const { message } = proto.deviceSentMessage;
return message ? func(message) : null;
}
if (proto.ephemeralMessage) {
const { message } = proto.ephemeralMessage;
return message ? func(message) : null;
}
if (proto.viewOnceMessage) {
const { message } = proto.viewOnceMessage;
return message ? func(message) : null;
}
return func(...args);
});