diff options
| -rw-r--r-- | src/bot.ts | 2 | ||||
| -rw-r--r-- | src/utils/loading-message.ts | 20 |
2 files changed, 12 insertions, 10 deletions
@@ -96,7 +96,7 @@ export default class { }); this.client.on('ready', async () => { - console.log(`Ready! Invite the bot with https://discordapp.com/oauth2/authorize?client_id=${this.clientId}&scope=bot&permissions=36760640`); + console.log(`Ready! Invite the bot with https://discordapp.com/oauth2/authorize?client_id=${this.clientId}&scope=bot&permissions=36752448`); }); this.client.on('error', console.error); diff --git a/src/utils/loading-message.ts b/src/utils/loading-message.ts index 115aff2..95c7a2f 100644 --- a/src/utils/loading-message.ts +++ b/src/utils/loading-message.ts @@ -64,15 +64,17 @@ export default class { this.isStopped = true; - if (str) { - if (wasAlreadyStopped) { - await this.msg.edit(str); - } else { - await Promise.all([this.msg.reactions.removeAll(), this.msg.edit(str)]); - } - } else { - await this.msg.reactions.removeAll(); - } + const editPromise = str ? this.msg.edit(str) : null; + const reactPromise = str && !wasAlreadyStopped ? (async () => { + await this.msg.fetch(); + await Promise.all(this.msg.reactions.cache.map(async react => { + if (react.me) { + await react.users.remove(this.msg.client.user!.id); + } + })); + })() : null; + + await Promise.all([editPromise, reactPromise]); return this.msg; } |