Skip to content

Commit 036ed3a

Browse files
committed
re-do !everyone command
1 parent 7862c29 commit 036ed3a

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

src/commands/everyone.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Marca todos os membros do grupo.
1010
\`\`\`--quoted\`\`\` -> _marca com a mensagem citada._
1111
\`\`\`--help\`\`\` -> _mostra esta mensagem._
1212
`.trim(),
13-
defaultMessage: 'Marcando todo mundo.',
13+
defaultMessage: '@everyone',
1414
};
1515

1616
class Everyone {
@@ -20,7 +20,7 @@ class Everyone {
2020
}
2121

2222
async execute(data, message) {
23-
const { text, args } = data;
23+
const { args } = data;
2424
const isAdm = await chattools.isAdm(message);
2525

2626
if (!isAdm) {
@@ -36,24 +36,18 @@ class Everyone {
3636
const chat = await message.getChat();
3737
const { participants } = chat;
3838

39-
if (args.includes('quoted')) {
39+
if (message.hasQuotedMsg) {
4040
const quotedMessage = await message.getQuotedMessage();
41-
await chat.sendMessage(quotedMessage.body, {
42-
mentions: participants,
43-
});
44-
return;
45-
}
4641

47-
if (text) {
48-
await chat.sendMessage(text, {
42+
chat.sendMessage(this.strings.defaultMessage, {
43+
// eslint-disable-next-line no-underscore-dangle
44+
quotedMessageId: quotedMessage.id._serialized,
4945
mentions: participants,
5046
});
5147
return;
5248
}
5349

54-
await chat.sendMessage(this.strings.defaultMessage, {
55-
mentions: participants,
56-
});
50+
throw new Error('No message was replied.');
5751
}
5852
}
5953

0 commit comments

Comments
 (0)