From 00bafc07003759956b6973daff9310735e61b71b Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:04:19 +0100 Subject: [PATCH 01/15] Update avatarUrl.ts --- src/helpers/members/avatarUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/members/avatarUrl.ts b/src/helpers/members/avatarUrl.ts index 0114d497a..975d3fcdf 100644 --- a/src/helpers/members/avatarUrl.ts +++ b/src/helpers/members/avatarUrl.ts @@ -7,7 +7,7 @@ export function avatarURL( bot: Bot, userId: bigint, discriminator: number, - options: { + options?: { avatar?: string | bigint; size?: ImageSize; format?: ImageFormat; From c37f77ce970d77733d628755736407d50540ab04 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:04:37 +0100 Subject: [PATCH 02/15] Update guildSplashUrl.ts --- src/helpers/guilds/guildSplashUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildSplashUrl.ts b/src/helpers/guilds/guildSplashUrl.ts index d9f28209b..7392cf893 100644 --- a/src/helpers/guilds/guildSplashUrl.ts +++ b/src/helpers/guilds/guildSplashUrl.ts @@ -6,7 +6,7 @@ import type { Bot } from "../../bot.ts"; export function guildSplashURL( bot: Bot, id: bigint, - options: { + options?: { splash?: string | bigint; size?: ImageSize; format?: ImageFormat; From 13f2ab30ca674c3ebec72a0eba31e30cb22c805e Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:05:11 +0100 Subject: [PATCH 03/15] Update guildIconUrl.ts --- src/helpers/guilds/guildIconUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index ca7a29c76..c4e125cbe 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -6,7 +6,7 @@ import type { Bot } from "../../bot.ts"; export function guildIconURL( bot: Bot, id: bigint, - options: { + options?: { icon?: string | bigint; size?: ImageSize; format?: ImageFormat; From 5afe7342a5ce64d6f512de0b9aaa8cca5aa5c878 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:09:43 +0100 Subject: [PATCH 04/15] Update editBotProfile.ts --- src/helpers/misc/editBotProfile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/misc/editBotProfile.ts b/src/helpers/misc/editBotProfile.ts index eb55b1a2e..65daf5ecb 100644 --- a/src/helpers/misc/editBotProfile.ts +++ b/src/helpers/misc/editBotProfile.ts @@ -5,7 +5,7 @@ import type { Bot } from "../../bot.ts"; /** Modifies the bot's username or avatar. * NOTE: username: if changed may cause the bot's discriminator to be randomized. */ -export async function editBotProfile(bot: Bot, options: { username?: string; botAvatarURL?: string | null }) { +export async function editBotProfile(bot: Bot, options?: { username?: string; botAvatarURL?: string | null }) { // Nothing was edited if (!options.username && options.botAvatarURL === undefined) return; // Check username requirements if username was provided From b10e3c3fb5099bbb7f639b9d4aea6a0f2a94bce0 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:26:34 +0100 Subject: [PATCH 05/15] Update guildIconUrl.ts --- src/helpers/guilds/guildIconUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index c4e125cbe..1882a164f 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -6,8 +6,8 @@ import type { Bot } from "../../bot.ts"; export function guildIconURL( bot: Bot, id: bigint, + icon?: string | bigint, options?: { - icon?: string | bigint; size?: ImageSize; format?: ImageFormat; } From fd5a7a1b46a1f242ad32a2bcd09b590843cca684 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:27:25 +0100 Subject: [PATCH 06/15] Update editBotProfile.ts --- src/helpers/misc/editBotProfile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/misc/editBotProfile.ts b/src/helpers/misc/editBotProfile.ts index 65daf5ecb..eb55b1a2e 100644 --- a/src/helpers/misc/editBotProfile.ts +++ b/src/helpers/misc/editBotProfile.ts @@ -5,7 +5,7 @@ import type { Bot } from "../../bot.ts"; /** Modifies the bot's username or avatar. * NOTE: username: if changed may cause the bot's discriminator to be randomized. */ -export async function editBotProfile(bot: Bot, options?: { username?: string; botAvatarURL?: string | null }) { +export async function editBotProfile(bot: Bot, options: { username?: string; botAvatarURL?: string | null }) { // Nothing was edited if (!options.username && options.botAvatarURL === undefined) return; // Check username requirements if username was provided From bf9356d907a1bb74ad3c7924a6cc06b82644d20e Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:33:25 +0100 Subject: [PATCH 07/15] Update guildIconUrl.ts --- src/helpers/guilds/guildIconUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index 1882a164f..42b6c7e4f 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -6,7 +6,7 @@ import type { Bot } from "../../bot.ts"; export function guildIconURL( bot: Bot, id: bigint, - icon?: string | bigint, + icon: string | bigint | undefined, options?: { size?: ImageSize; format?: ImageFormat; From a13613c533a786461c9edf423d66c33dfd15f8f5 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:52:12 +0100 Subject: [PATCH 08/15] Update guildSplashUrl.ts --- src/helpers/guilds/guildSplashUrl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/guilds/guildSplashUrl.ts b/src/helpers/guilds/guildSplashUrl.ts index 7392cf893..fede8e985 100644 --- a/src/helpers/guilds/guildSplashUrl.ts +++ b/src/helpers/guilds/guildSplashUrl.ts @@ -6,13 +6,13 @@ import type { Bot } from "../../bot.ts"; export function guildSplashURL( bot: Bot, id: bigint, + splash: string | bigint | undefined, options?: { - splash?: string | bigint; size?: ImageSize; format?: ImageFormat; } ) { - return options.splash + return splash ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_SPLASH( id, From 62f295efd10757347b4d7d9954d42a855bb66f70 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:53:02 +0100 Subject: [PATCH 09/15] Update guildIconUrl.ts --- src/helpers/guilds/guildIconUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index 42b6c7e4f..706c02090 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -12,7 +12,7 @@ export function guildIconURL( format?: ImageFormat; } ) { - return options.icon + return icon ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_ICON( id, From 047623b860ea03275b4c8347aac9d3e4ec958924 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Thu, 16 Dec 2021 16:21:37 +0100 Subject: [PATCH 10/15] Update guildSplashUrl.ts --- src/helpers/guilds/guildSplashUrl.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/helpers/guilds/guildSplashUrl.ts b/src/helpers/guilds/guildSplashUrl.ts index fede8e985..f9afc3beb 100644 --- a/src/helpers/guilds/guildSplashUrl.ts +++ b/src/helpers/guilds/guildSplashUrl.ts @@ -16,10 +16,10 @@ export function guildSplashURL( ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_SPLASH( id, - typeof options.splash === "string" ? options.splash : bot.utils.iconBigintToHash(options.splash) + typeof splash === "string" ? splash : bot.utils.iconBigintToHash(splash) ), - options.size || 128, - options.format + options?.size || 128, + options?.format ) : undefined; } From 78a0f0b51e3cfcdd680d91e7f358db6e522703bb Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Thu, 16 Dec 2021 16:22:20 +0100 Subject: [PATCH 11/15] Update guildIconUrl.ts --- src/helpers/guilds/guildIconUrl.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index 706c02090..1e04b16d4 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -16,10 +16,10 @@ export function guildIconURL( ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_ICON( id, - typeof options.icon === "string" ? options.icon : bot.utils.iconBigintToHash(options.icon) + typeof icon === "string" ? icon : bot.utils.iconBigintToHash(icon) ), - options.size || 128, - options.format + options?.size || 128, + options?.format ) : undefined; } From ee914f0816e6f24333e122e0ba20056f6efb8739 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Sun, 19 Dec 2021 18:18:44 +0100 Subject: [PATCH 12/15] Update src/helpers/members/avatarUrl.ts Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com> --- src/helpers/members/avatarUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/members/avatarUrl.ts b/src/helpers/members/avatarUrl.ts index 975d3fcdf..b1d6c4be8 100644 --- a/src/helpers/members/avatarUrl.ts +++ b/src/helpers/members/avatarUrl.ts @@ -8,7 +8,7 @@ export function avatarURL( userId: bigint, discriminator: number, options?: { - avatar?: string | bigint; + avatar: string | bigint | undefined; size?: ImageSize; format?: ImageFormat; } From 0b09e261946baa384aacc6e373e7f1f12c44dc5d Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Mon, 20 Dec 2021 18:41:36 +0100 Subject: [PATCH 13/15] Update guildIconUrl.ts --- src/helpers/guilds/guildIconUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildIconUrl.ts b/src/helpers/guilds/guildIconUrl.ts index 1e04b16d4..fcd4d89c5 100644 --- a/src/helpers/guilds/guildIconUrl.ts +++ b/src/helpers/guilds/guildIconUrl.ts @@ -6,7 +6,7 @@ import type { Bot } from "../../bot.ts"; export function guildIconURL( bot: Bot, id: bigint, - icon: string | bigint | undefined, + icon: bigint | undefined, options?: { size?: ImageSize; format?: ImageFormat; From 659efea48613567e18d885e25dde026528294eb5 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Mon, 20 Dec 2021 18:45:15 +0100 Subject: [PATCH 14/15] Update guildSplashUrl.ts --- src/helpers/guilds/guildSplashUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/guilds/guildSplashUrl.ts b/src/helpers/guilds/guildSplashUrl.ts index f9afc3beb..defaa4930 100644 --- a/src/helpers/guilds/guildSplashUrl.ts +++ b/src/helpers/guilds/guildSplashUrl.ts @@ -6,7 +6,7 @@ import type { Bot } from "../../bot.ts"; export function guildSplashURL( bot: Bot, id: bigint, - splash: string | bigint | undefined, + splash: bigint | undefined, options?: { size?: ImageSize; format?: ImageFormat; From 6455e3727e85014b6f81603fee0ea8e8efbae020 Mon Sep 17 00:00:00 2001 From: a boi here <41384430+some-boi@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:02:55 +0100 Subject: [PATCH 15/15] Update avatarUrl.ts --- src/helpers/members/avatarUrl.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/helpers/members/avatarUrl.ts b/src/helpers/members/avatarUrl.ts index b1d6c4be8..4bbd15d87 100644 --- a/src/helpers/members/avatarUrl.ts +++ b/src/helpers/members/avatarUrl.ts @@ -8,19 +8,19 @@ export function avatarURL( userId: bigint, discriminator: number, options?: { - avatar: string | bigint | undefined; + avatar: bigint | undefined; size?: ImageSize; format?: ImageFormat; } ) { - return options.avatar + return options?.avatar ? bot.utils.formatImageURL( bot.constants.endpoints.USER_AVATAR( userId, - typeof options.avatar === "string" ? options.avatar : bot.utils.iconBigintToHash(options.avatar) + typeof options?.avatar === "string" ? options.avatar : bot.utils.iconBigintToHash(options?.avatar) ), - options.size || 128, - options.format + options?.size || 128, + options?.format ) : bot.constants.endpoints.USER_DEFAULT_AVATAR(Number(discriminator) % 5); }