Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1571,8 +1571,8 @@ declare namespace WAWebJS {
caption?: string;
/** Id of the message that is being quoted (or replied to) */
quotedMessageId?: string;
/** User IDs to mention in the message */
mentions?: string[];
/** User IDs to mention in the message or string @all to mention everybody */
mentions?: string[] | string;
/** An array of object that handle group mentions */
groupMentions?: {
/** The name of a group to mention (can be custom) */
Expand Down
29 changes: 18 additions & 11 deletions src/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -1492,19 +1492,26 @@ class Client extends EventEmitter {
}

if (options.mentions) {
!Array.isArray(options.mentions) &&
(options.mentions = [options.mentions]);
if (
options.mentions.some(
(possiblyContact) => possiblyContact instanceof Contact,
)
options.mentions !== '@all' &&
!Array.isArray(options.mentions)
) {
console.warn(
'Mentions with an array of Contact are now deprecated. See more at https://github.com/wwebjssapp-web.js/pull/2166.',
);
options.mentions = options.mentions.map(
(a) => a.id._serialized,
);
options.mentions = [options.mentions];
}

if (Array.isArray(options.mentions)) {
if (
options.mentions.some(
(possiblyContact) => possiblyContact instanceof Contact,
)
) {
console.warn(
'Mentions with an array of Contact are now deprecated. See more at https://github.com/wwebjs/whatsapp-web.js/pull/2166.',
);
options.mentions = options.mentions.map(
(a) => a.id._serialized,
);
}
}
}

Expand Down
21 changes: 17 additions & 4 deletions src/util/Injected/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,23 @@ exports.LoadUtils = () => {
delete options.quotedMessageId;
}

let mentionAll = {};
if (options.mentionedJidList) {
options.mentionedJidList = options.mentionedJidList.map((id) =>
window.require('WAWebWidFactory').createWid(id),
);
options.mentionedJidList = options.mentionedJidList.filter(Boolean);
if (options.mentionedJidList === '@all') {
mentionAll = { nonJidMentions: 1 };
options.mentionedJidList = [];
} else if (Array.isArray(options.mentionedJidList)) {
if (options.mentionedJidList.includes('@all')) {
options.mentionedJidList = options.mentionedJidList.filter(
(id) => id !== '@all',
);
}
options.mentionedJidList = options.mentionedJidList.map((id) =>
window.require('WAWebWidFactory').createWid(id),
);
options.mentionedJidList =
options.mentionedJidList.filter(Boolean);
}
}

if (options.groupMentions) {
Expand Down Expand Up @@ -480,6 +492,7 @@ exports.LoadUtils = () => {
...buttonOptions,
...listOptions,
...botOptions,
...mentionAll,
...extraOptions,
};

Expand Down
Loading