From b3d9fcbc02e1a95d28eed11a762bf252a2f96e91 Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 7 Jan 2024 23:06:49 +0100 Subject: [PATCH] More forcestatic options removed --- src/commands-contextmenu/updateuser.ts | 6 +++--- src/commands/ban.ts | 2 +- src/commands/check.ts | 2 +- src/commands/counting.ts | 4 +--- src/commands/counting/ban.ts | 6 ++---- src/commands/counting/unban.ts | 6 ++---- src/commands/forceunverify.ts | 2 +- src/commands/forceupdate.ts | 8 +++----- src/commands/forceverify.ts | 2 +- src/commands/guild.ts | 4 +--- src/commands/guild/member.ts | 10 +++------- src/commands/guild/top.ts | 2 +- src/commands/help.ts | 4 ++-- src/commands/instructions.ts | 2 +- src/commands/kick.ts | 2 +- src/commands/ping.ts | 4 +--- src/commands/reqs.ts | 4 ++-- src/commands/send.ts | 6 +++--- src/commands/slowmode.ts | 7 ++----- src/commands/unban.ts | 4 ++-- src/commands/update.ts | 8 +++----- src/commands/uuid.ts | 2 +- src/commands/whoami.ts | 2 +- src/commands/whois.ts | 3 +-- src/utils/eventHandlers/autocomplete.ts | 4 +--- src/utils/eventHandlers/button.ts | 4 +--- src/utils/eventHandlers/command.ts | 4 +--- src/utils/eventHandlers/contextmenu.ts | 4 +--- src/utils/eventHandlers/modal.ts | 4 +--- 29 files changed, 45 insertions(+), 77 deletions(-) diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index 8af1d67..8d4ca34 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -34,7 +34,7 @@ export = { color: embedColor, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -87,7 +87,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -155,7 +155,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/ban.ts b/src/commands/ban.ts index 7a5dd8a..1020b8d 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -151,7 +151,7 @@ export = { url: member.user.avatarURL() || "", }, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, diff --git a/src/commands/check.ts b/src/commands/check.ts index fc509f5..709d043 100644 --- a/src/commands/check.ts +++ b/src/commands/check.ts @@ -301,7 +301,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: true, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, fields: statsFields, }, diff --git a/src/commands/counting.ts b/src/commands/counting.ts index 87e0c43..909fe32 100644 --- a/src/commands/counting.ts +++ b/src/commands/counting.ts @@ -80,9 +80,7 @@ export = { footer: { text: interaction.guild!.name + " | " + devMessage, icon_url: - interaction.guild!.iconURL({ - forceStatic: false, - }) || undefined, + interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/counting/ban.ts b/src/commands/counting/ban.ts index d0454b1..7581377 100644 --- a/src/commands/counting/ban.ts +++ b/src/commands/counting/ban.ts @@ -21,9 +21,7 @@ export default async function ban( " is currently banned from counting", color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, @@ -40,7 +38,7 @@ export default async function ban( " has been banned from counting", color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, diff --git a/src/commands/counting/unban.ts b/src/commands/counting/unban.ts index 10d6cc5..613d6e8 100644 --- a/src/commands/counting/unban.ts +++ b/src/commands/counting/unban.ts @@ -21,9 +21,7 @@ export default async function ban( " is currently not banned from counting", color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, @@ -40,7 +38,7 @@ export default async function ban( " has been unbanned from counting", color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index ab8ce31..63ea845 100644 --- a/src/commands/forceunverify.ts +++ b/src/commands/forceunverify.ts @@ -87,7 +87,7 @@ export = { color: embedColor, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index 8addaf3..6a473df 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -45,7 +45,7 @@ export = { color: embedColor, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -100,9 +100,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -170,7 +168,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index a647bd7..b719dcf 100644 --- a/src/commands/forceverify.ts +++ b/src/commands/forceverify.ts @@ -222,7 +222,7 @@ export = { url: head!, }, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, diff --git a/src/commands/guild.ts b/src/commands/guild.ts index ac18c58..93cffc7 100644 --- a/src/commands/guild.ts +++ b/src/commands/guild.ts @@ -109,9 +109,7 @@ export = { footer: { text: interaction.guild!.name + " | " + devMessage, icon_url: - interaction.guild!.iconURL({ - forceStatic: false, - }) || undefined, + interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index 99f5fee..bbc4552 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -54,9 +54,7 @@ export default async function guildMember( }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -102,9 +100,7 @@ export default async function guildMember( }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -204,7 +200,7 @@ export default async function guildMember( ], footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 10936bd..266b3bc 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -286,7 +286,7 @@ export default async function guildTop( " | " + devMessage + cacheStatusText, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/help.ts b/src/commands/help.ts index e98382b..eacabdb 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -66,10 +66,10 @@ export = { fields: commandList, color: embedColor, thumbnail: { - url: interaction.guild!.iconURL({ forceStatic: true }) || "", + url: interaction.guild!.iconURL() || "", }, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, diff --git a/src/commands/instructions.ts b/src/commands/instructions.ts index af85d54..2ca075b 100644 --- a/src/commands/instructions.ts +++ b/src/commands/instructions.ts @@ -32,7 +32,7 @@ export = { color: embedColor, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, image: { url: instructionsgif, diff --git a/src/commands/kick.ts b/src/commands/kick.ts index 5fb228b..680f524 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -114,7 +114,7 @@ export = { url: member.user.avatarURL() || "", }, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, } }, diff --git a/src/commands/ping.ts b/src/commands/ping.ts index 897dfa9..dd4a1be 100644 --- a/src/commands/ping.ts +++ b/src/commands/ping.ts @@ -27,9 +27,7 @@ export = { footer: { text: interaction.guild!.name + " | " + devMessage, icon_url: - interaction.guild?.iconURL({ - forceStatic: false, - }) || undefined, + interaction.guild?.iconURL() || undefined, }, timestamp: new Date().toISOString(), }, diff --git a/src/commands/reqs.ts b/src/commands/reqs.ts index 6710eac..30ee333 100644 --- a/src/commands/reqs.ts +++ b/src/commands/reqs.ts @@ -35,7 +35,7 @@ export = { color: embedColor, thumbnail: { url: - interaction.guild!.iconURL({ forceStatic: false, }) || "", + interaction.guild!.iconURL() || "", }, fields: [ { @@ -70,7 +70,7 @@ export = { ], footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/send.ts b/src/commands/send.ts index b5d2e55..dbc5a83 100644 --- a/src/commands/send.ts +++ b/src/commands/send.ts @@ -46,11 +46,11 @@ export = { description: message, color: embedColor, thumbnail: { - url: interaction.guild!.iconURL({ forceStatic: false, }) || "", + url: interaction.guild!.iconURL() || "", }, footer: { text: interaction.guild!.id + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: true }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -63,7 +63,7 @@ export = { color: embedColor, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/slowmode.ts b/src/commands/slowmode.ts index d79ee0d..21060c5 100644 --- a/src/commands/slowmode.ts +++ b/src/commands/slowmode.ts @@ -53,9 +53,7 @@ export = { footer: { text: interaction.guild!.name + " | " + devMessage, icon_url: - interaction.guild!.iconURL({ - forceStatic: false, - }) || undefined, + interaction.guild!.iconURL() || undefined, }, }, ], @@ -95,8 +93,7 @@ export = { footer: { text: interaction.guild!.name + " | " + devMessage, icon_url: - interaction.guild!.iconURL({ forceStatic: true }) || - undefined, + interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/unban.ts b/src/commands/unban.ts index 769e2f8..a11ab5d 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -90,7 +90,7 @@ export = { }, footer: { text: "ID: " + user!.id, - icon_url: user.avatarURL({ forceStatic: false}) || undefined, + icon_url: user.avatarURL() || undefined, }, timestamp: new Date().toISOString(), }, @@ -110,7 +110,7 @@ export = { url: user!.avatarURL() || "", }, footer: { - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.guild!.name + " | " + devMessage, }, }, diff --git a/src/commands/update.ts b/src/commands/update.ts index 95908ae..d1f5106 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -33,7 +33,7 @@ export = { color: embedColor, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -75,9 +75,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], @@ -144,7 +142,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/uuid.ts b/src/commands/uuid.ts index dc97a7e..3831a1f 100644 --- a/src/commands/uuid.ts +++ b/src/commands/uuid.ts @@ -60,7 +60,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index 75233a6..c8c725b 100644 --- a/src/commands/whoami.ts +++ b/src/commands/whoami.ts @@ -54,7 +54,7 @@ export = { }, footer: { text: interaction.guild!.name + " | " + devMessage, - icon_url: interaction.guild!.iconURL({ forceStatic: true, }) || undefined, + icon_url: interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/commands/whois.ts b/src/commands/whois.ts index 3d00d3e..efe81b4 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -60,8 +60,7 @@ export = { footer: { text: interaction.guild!.name + " | " + devMessage, icon_url: - interaction.guild!.iconURL({ forceStatic: true }) || - undefined, + interaction.guild!.iconURL() || undefined, }, }, ], diff --git a/src/utils/eventHandlers/autocomplete.ts b/src/utils/eventHandlers/autocomplete.ts index 834a35e..3d9dc3e 100644 --- a/src/utils/eventHandlers/autocomplete.ts +++ b/src/utils/eventHandlers/autocomplete.ts @@ -61,9 +61,7 @@ export default function loadAutocompleteEvents(client: Client, ft: FileType) { description: String(error), color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.user.username + " | " + diff --git a/src/utils/eventHandlers/button.ts b/src/utils/eventHandlers/button.ts index 25d6917..427a771 100644 --- a/src/utils/eventHandlers/button.ts +++ b/src/utils/eventHandlers/button.ts @@ -49,9 +49,7 @@ export default function loadButtonEvents(client: Client, ft: FileType) { description: String(error), color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.user.username + " | " + diff --git a/src/utils/eventHandlers/command.ts b/src/utils/eventHandlers/command.ts index 2532e00..ffe3bca 100644 --- a/src/utils/eventHandlers/command.ts +++ b/src/utils/eventHandlers/command.ts @@ -49,9 +49,7 @@ export default function loadSlashCommandsEvents(client: Client, ft: FileType) { description: String(error), color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.user.username + " | " + diff --git a/src/utils/eventHandlers/contextmenu.ts b/src/utils/eventHandlers/contextmenu.ts index 403e835..29db098 100644 --- a/src/utils/eventHandlers/contextmenu.ts +++ b/src/utils/eventHandlers/contextmenu.ts @@ -56,9 +56,7 @@ export default function loadContextMenuEvents(client: Client, ft: FileType) { description: String(error), color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.user.username + " | " + diff --git a/src/utils/eventHandlers/modal.ts b/src/utils/eventHandlers/modal.ts index 8241677..dbc6dd7 100644 --- a/src/utils/eventHandlers/modal.ts +++ b/src/utils/eventHandlers/modal.ts @@ -50,9 +50,7 @@ export default function loadModalEvents(client: Client, ft: FileType) { description: String(error), color: embedColor, footer: { - icon_url: interaction.guild!.iconURL({ - forceStatic: false, - })!, + icon_url: interaction.guild!.iconURL() || undefined, text: interaction.user.username + " | " +