Merge pull request #492 from aternosorg/id

don't send second message if no bans were found
aternosorg · May 30, 2022 · dfe25af · dfe25af
2 parents 25e95a4 + 7c5a33e
commit dfe25af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/commands/CommandSource.js b/src/commands/CommandSource.js
@@ -130,6 +130,9 @@ class CommandSource {
             return this.#interaction.editReply(options);
         }
         else {
+            if (!this.#response) {
+                return this.#message.channel.send(options);
+            }
             return this.#response.edit(options);
         }
     }

diff --git a/src/commands/utility/IDCommand.js b/src/commands/utility/IDCommand.js
@@ -38,12 +38,14 @@ class IDCommand extends Command {
 
         const users = /** @type {Collection<Snowflake, GuildMember>} */ await this.source.getGuild().members.fetch({query});
 
+        let replied = false;
         if (users.size !== 0) {
             await this.editReply(this._generateResultEmbed(query, Array.from(users.values()))
-                .setFooter({text: 'I\'m still searching the ban, on big guilds this can take a while...'}));
+                .setFooter({text: 'I\'m still searching in the ban list, on guilds with a lot of bans this can take a while...'}));
+            replied = true;
         }
         const bans = await this._fetchAndFilterBans(user, discrim);
-        if (bans.size === 0) {
+        if (bans.size === 0 && !replied) {
             return this.sendError('No users found');
         }
         else {