aboutsummaryrefslogtreecommitdiff
path: root/src/lib/extensions/discord-akairo
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2022-02-21 16:08:38 -0500
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2022-02-21 16:08:38 -0500
commit5116ccf230c933c290676d033a5639b3913ee03b (patch)
tree7ebd8bb012b22c016e8d38d79b551cf43155d4dd /src/lib/extensions/discord-akairo
parentd3464427ea9b08b54a0444795bf4aedab55d3afc (diff)
downloadtanzanite-5116ccf230c933c290676d033a5639b3913ee03b.tar.gz
tanzanite-5116ccf230c933c290676d033a5639b3913ee03b.tar.bz2
tanzanite-5116ccf230c933c290676d033a5639b3913ee03b.zip
perf: make massban actually work
Diffstat (limited to 'src/lib/extensions/discord-akairo')
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index ecfa360..9903140 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -678,16 +678,17 @@ export class BushClientUtil extends ClientUtil {
*/
public async resolveNonCachedUser(user: UserResolvable | undefined | null): Promise<BushUser | undefined> {
if (user == null) return undefined;
- const id =
- user instanceof User || user instanceof GuildMember || user instanceof ThreadMember
- ? user.id
+ const resolvedUser =
+ user instanceof User
+ ? <BushUser>user
+ : user instanceof GuildMember
+ ? <BushUser>user.user
+ : user instanceof ThreadMember
+ ? <BushUser>user.user
: user instanceof Message
- ? user.author.id
- : typeof user === 'string'
- ? user
+ ? <BushUser>user.author
: undefined;
- if (!id) return undefined;
- else return await client.users.fetch(id).catch(() => undefined);
+ return resolvedUser ?? (await client.users.fetch(user as Snowflake).catch(() => undefined));
}
/**