From 49020945ffaa82c8cb0cb3f129fd5fb5b1543ec8 Mon Sep 17 00:00:00 2001 From: Taken Date: Sat, 20 Jan 2024 21:23:03 +0100 Subject: [PATCH] Small tweaks to fomating --- src/commands/ban.ts | 4 +--- src/commands/config.ts | 3 ++- src/commands/guild/info.ts | 6 ++---- src/commands/guild/member.ts | 3 +-- src/commands/guild/top.ts | 2 +- src/commands/setup.ts | 10 +++++----- src/events/server/interactions/logBtnsCmds.ts | 3 ++- src/events/server/voiceStateUpdate/vcJoinLeave.ts | 4 ++-- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/commands/ban.ts b/src/commands/ban.ts index 86cdcde..8fcab83 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -59,9 +59,7 @@ export = { const modRoles = mod.roles.cache.map(role => role.id) if (!modRoles.includes(admin)) { - await interaction.editReply( - "You do not have permission to use this command." - ) + await interaction.editReply("You do not have permission to use this command.") return } diff --git a/src/commands/config.ts b/src/commands/config.ts index ec720da..bc171b6 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -60,7 +60,8 @@ export = { await interaction.editReply({ embeds: [{ - description: "Successfully updated `" + setting + "` to value `" + value + "`." + description: "Successfully updated `" + setting + "` to value `" + value + "`.", + color: embedColor }] }) } diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index f45aecf..cdd099d 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -129,8 +129,7 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction const guildOwner = guildMembers.find(m => m.rank === "Guild Master")!.uuid const guildOwnerName = await getIGN(guildOwner) - const guildRanksUnsorted = guild!.ranks.sort((a, b) => b.priority - a.priority - ) + const guildRanksUnsorted = guild!.ranks.sort((a, b) => b.priority - a.priority) const guildRanks = guildRanksUnsorted.map(r => "**➺ " + r.name + "** `[" + r.tag + "]`").join("\n") const allGuildMembersWeeklyXP = guildMembers.map(member => member.expHistory) @@ -156,8 +155,7 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction }, { name: "**GEXP**", - value: - "**➺ Total weekly GEXP:** `" + totalGuildMembersWeeklyXP + "`\n" + + value: "**➺ Total weekly GEXP:** `" + totalGuildMembersWeeklyXP + "`\n" + "**➺ Daily avarage:** `" + averageGuildMembersWeeklyXP + "`\n" + "**➺ Total GEXP:** `" + guildExp + "`" }, diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index 4c88e26..dcfc5a0 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -143,8 +143,7 @@ export default async function guildMember(interaction: ChatInputCommandInteracti }, { name: "**Weekly GEXP**", - value: - "**➺ Total:** `" + totalWeeklyGexp + "`\n" + + value: "**➺ Total:** `" + totalWeeklyGexp + "`\n" + "**➺ Daily avarage:** `" + averageWeeklyGexp + "`" }, { diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 60ceae9..1b9450c 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -152,7 +152,7 @@ export default async function guildTop(interaction: ChatInputCommandInteraction) let guildData: GuildTopData = [] const fieldsValueRaw: string[] = [] const allMembersSorted = allMembersDailyGEXP.sort((a, b) => b.gexp - a.gexp) - const allMembersSortedUUIDArray = allMembersSorted.map(member => { return member.uuid }) + const allMembersSortedUUIDArray = allMembersSorted.map(member => member.uuid) if (!cachedData) { cacheStatus = false diff --git a/src/commands/setup.ts b/src/commands/setup.ts index f6c9fd6..6f9630b 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -79,11 +79,11 @@ export = { const subcommand = interaction.options.getSubcommand() const channel = interaction.options.getChannel("channel") as TextChannel const embedColor = Number(color.replace("#", "0x")) - let title: string = "" - let description: string = "" - let customId: string = "" - let label: string = "" - let emoji: string = "" + let title = "" + let description = "" + let customId = "" + let label = "" + let emoji = "" if (subcommand === "sendguildapplication") { title = "Guild Application" diff --git a/src/events/server/interactions/logBtnsCmds.ts b/src/events/server/interactions/logBtnsCmds.ts index d8ad8b2..1075cc1 100644 --- a/src/events/server/interactions/logBtnsCmds.ts +++ b/src/events/server/interactions/logBtnsCmds.ts @@ -14,7 +14,8 @@ export = { color( interaction.user.username + " ran " + interaction.commandName + " " + - interaction.options.getSubcommand(), "pink" + interaction.options.getSubcommand(), + "pink" ) ) } catch { diff --git a/src/events/server/voiceStateUpdate/vcJoinLeave.ts b/src/events/server/voiceStateUpdate/vcJoinLeave.ts index a34a293..40d65cd 100644 --- a/src/events/server/voiceStateUpdate/vcJoinLeave.ts +++ b/src/events/server/voiceStateUpdate/vcJoinLeave.ts @@ -47,8 +47,8 @@ export = { logToChannel("bot", { embeds: [{ title: "Voice Channel Switch", - description: userMention(oldState.member!.id) + " switched from " + channelMention(oldChannel.id) + - " to " + channelMention(newChannel.id), + description: userMention(oldState.member!.id) + " switched from " + + channelMention(oldChannel.id) + " to " + channelMention(newChannel.id), color: embedColor, footer: { text: "ID: " + oldState.member!.id,