illegitimate/illegitimate-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request illegitimate/illegitimate-bot!164
This commit is contained in:
Taken
2024-01-07 16:31:12 +00:00
parent dc94dd262b 952aa4bdd0
commit 7dc1cb52c2
13 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands/counting/ban.ts
View File

@@ -40,9 +40,7 @@ export default async function ban(
" has been banned from counting",
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL({
forceStatic: false,
})!,
icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined,
text: interaction.guild!.name + " | " + devMessage,
},
},

2
src/commands/counting/setup.ts
View File

@@ -35,7 +35,7 @@ export default async function setup(interaction: ChatInputCommandInteraction): P
description: "Counting channel has been set to " + channelMention(channel.id),
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL({ forceStatic: false })!,
icon_url: interaction.guild!.iconURL({ forceStatic: false }) || undefined,
text: interaction.guild!.name + " | " + devMessage
}
}]

4
src/commands/counting/unban.ts
View File

@@ -40,9 +40,7 @@ export default async function ban(
" has been unbanned from counting",
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL({
forceStatic: false,
})!,
icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined,
text: interaction.guild!.name + " | " + devMessage,
},
},

4
src/commands/guild/member.ts
View File

@@ -204,9 +204,7 @@ export default async function guildMember(
],
footer: {
text: interaction.guild!.name + " | " + devMessage,
icon_url: interaction.guild!.iconURL({
forceStatic: false,
})!,
icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined,
},
},
],

4
src/commands/guild/top.ts
View File

@@ -286,9 +286,7 @@ export default async function guildTop(
" | " +
devMessage +
cacheStatusText,
icon_url: interaction.guild!.iconURL({
forceStatic: false,
})!,
icon_url: interaction.guild!.iconURL({ forceStatic: false, }) || undefined,
},
},
],

11
src/commands/staff/beast.ts
View File

@@ -261,13 +261,6 @@ export default async function beast(
const hypixelExp = player.networkExp || 0
const level = hypixelLevel(hypixelExp)
const footerText = interaction.guild
? interaction.guild.name
: interaction.user.username
const footerIcon = interaction.guild
? interaction.guild.iconURL({ forceStatic: false })
: interaction.user.avatarURL({ forceStatic: false })
await interaction.editReply({
embeds: [
{
@@ -284,8 +277,8 @@ export default async function beast(
url: head!,
},
footer: {
text: footerText + " | " + devMessage,
icon_url: footerIcon!,
text: interaction.guild!.name + " | " + devMessage,
icon_url: interaction.guild!.iconURL({ forceStatic: false }) || undefined,
},
fields: statsFields,
},

12
src/commands/staff/help.ts
View File

@@ -46,12 +46,6 @@ export default async function help(
}
const embedColor = Number(color.replace("#", "0x"))
const footerText = interaction.guild
? interaction.guild.name
: interaction.user.username
const footerIcon = interaction.guild
? interaction.guild.iconURL({ forceStatic: false })
: interaction.user.avatarURL({ forceStatic: false })
await interaction.editReply({
embeds: [
@@ -61,11 +55,11 @@ export default async function help(
fields: commandList,
color: embedColor,
thumbnail: {
url: interaction.guild!.iconURL({ forceStatic: false })!,
url: interaction.guild!.iconURL({ forceStatic: false }) || "",
},
footer: {
icon_url: footerIcon!,
text: footerText + " | " + devMessage,
icon_url: interaction.guild!.iconURL({ forceStatic: false }) || undefined,
text: interaction.guild?.name + " | " + devMessage,
},
},
],

4
src/components/modals/denyreasonbox.ts
View File

@@ -83,9 +83,9 @@ export = {
"`",
)
.setColor(embedColor)
.setThumbnail(guild.iconURL())
.setThumbnail(guild.iconURL({ forceStatic: false }) || "")
.setFooter({
iconURL: guild.iconURL()!,
iconURL: guild.iconURL({ forceStatic: false }) || undefined,
text: "ID: " + applicantId,
})

4
src/components/modals/staffdenyreasonbox.ts
View File

@@ -70,10 +70,10 @@ export = {
"`",
color: embedColor,
thumbnail: {
url: applicant.avatarURL() || guild!.iconURL()!,
url: applicant.avatarURL({ forceStatic: false }) || "",
},
footer: {
icon_url: guild!.iconURL()!,
icon_url: guild!.iconURL({ forceStatic: false }) || undefined,
text: "ID: " + applicant.id,
},
},

2
src/components/modals/verifyModal.ts
View File

@@ -184,7 +184,7 @@ export = {
url: head!,
},
footer: {
icon_url: interaction.guild!.iconURL()!,
icon_url: interaction.guild!.iconURL({ forceStatic: false }) || undefined,
text: interaction.guild!.name + " | " + devMessage,
},
},

2
src/events/cron/weeklyGexp.ts
View File

@@ -116,7 +116,7 @@ async function guildWeekly() {
timestamp: new Date().toISOString(),
footer: {
text: channel.guild.name + " | " + devMessage,
icon_url: channel.guild.iconURL({ forceStatic: false })!,
icon_url: channel.guild.iconURL({ forceStatic: false }) || undefined,
},
},
],

4
src/events/server/guildMemberAdd/logNewJoins.ts
View File

@@ -22,8 +22,12 @@ export = {
"Account created: " +
member.user.createdAt.toLocaleString(),
color: embedColor,
thumbnail: {
url: member.user.avatarURL({ forceStatic: false }) || "",
},
footer: {
text: "ID: " + member.id,
icon_url: member.user.avatarURL({ forceStatic: false }) || undefined,
},
timestamp: new Date().toISOString(),
},

3
src/events/server/voiceStateUpdate/vcJoinLeave.ts
View File

@@ -32,6 +32,7 @@ export = {
color: embedColor,
footer: {
text: "ID: " + newState.member!.id,
icon_url: newState.member!.user.avatarURL({ forceStatic: false }) || undefined,
},
timestamp: new Date().toISOString(),
},
@@ -49,6 +50,7 @@ export = {
color: embedColor,
footer: {
text: "ID: " + oldState.member!.id,
icon_url: oldState.member!.user.avatarURL({ forceStatic: false }) || undefined,
},
timestamp: new Date().toISOString(),
},
@@ -70,6 +72,7 @@ export = {
color: embedColor,
footer: {
text: "ID: " + oldState.member!.id,
icon_url: oldState.member!.user.avatarURL({ forceStatic: false }) || undefined,
},
timestamp: new Date().toISOString(),
},