From 1cfa1aeaf811b67e74840730154ba86aa2b51703 Mon Sep 17 00:00:00 2001 From: TheCodedProf Date: Sat, 11 Mar 2023 16:07:37 -0500 Subject: [PATCH] prettiered --- src/commands/server/buttons.ts | 8 +++--- src/commands/settings/tracks.ts | 6 ++--- src/commands/user/track.ts | 10 +++++--- src/reflex/scanners.ts | 43 +++++++++++++++------------------ 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/commands/server/buttons.ts b/src/commands/server/buttons.ts index c89e481..f07f3ce 100644 --- a/src/commands/server/buttons.ts +++ b/src/commands/server/buttons.ts @@ -70,7 +70,7 @@ const presetButtons = [ buttons: ["createticket"], color: "RED" } -] +]; export const callback = async (interaction: CommandInteraction): Promise => { const m = await interaction.reply({ @@ -128,10 +128,10 @@ export const callback = async (interaction: CommandInteraction): Promise = .setLabel(preset.title) .setValue(i.toString()) .setDescription(preset.description) - .setEmoji(getEmojiByName("COLORS." + preset.color, "id") as APIMessageComponentEmoji) + .setEmoji(getEmojiByName("COLORS." + preset.color, "id") as APIMessageComponentEmoji); }) ) - ) + ); const buttonSelect = new ActionRowBuilder().addComponents( new StringSelectMenuBuilder() @@ -297,7 +297,7 @@ export const callback = async (interaction: CommandInteraction): Promise = switch (i.customId) { case "preset": { const chosen = presetButtons[parseInt(i.values[0]!)]!; - const newColor = colors[chosen.color!]! + const newColor = colors[chosen.color!]!; data = _.assign(data, chosen, { color: newColor }); break; } diff --git a/src/commands/settings/tracks.ts b/src/commands/settings/tracks.ts index c81eeed..b79f54d 100644 --- a/src/commands/settings/tracks.ts +++ b/src/commands/settings/tracks.ts @@ -471,10 +471,10 @@ const callback = async (interaction: CommandInteraction) => { case "add": { const newPage = await editTrack(i, m, roles); if (_.isEqual(newPage, defaultTrackData)) break; - if(!newPage) break; - console.log(newPage) + if (!newPage) break; + console.log(newPage); tracks.push(newPage); - console.log(tracks) + console.log(tracks); page = tracks.length - 1; break; } diff --git a/src/commands/user/track.ts b/src/commands/user/track.ts index 92553ff..1ce05ee 100644 --- a/src/commands/user/track.ts +++ b/src/commands/user/track.ts @@ -98,7 +98,11 @@ const callback = async (interaction: CommandInteraction): Promise => { } roles from this track. `; conflictDropdown = []; const yourRoles = guild.members.cache.get(interaction.user.id)!.roles; - if ((roles.get(selected[0]!)!.position < yourRoles.highest.position && roles.get(selected[0]!)!.position < guild.members.me!.roles.highest.position!) || managed) { + if ( + (roles.get(selected[0]!)!.position < yourRoles.highest.position && + roles.get(selected[0]!)!.position < guild.members.me!.roles.highest.position!) || + managed + ) { generated += "In order to promote or demote this user, you must select which role the member should keep."; selected.forEach((role) => { @@ -116,12 +120,12 @@ const callback = async (interaction: CommandInteraction): Promise => { .setPlaceholder("Select a role to keep") ]; } else { - if(roles.get(selected[0]!)!.position >= yourRoles.highest.position) { + if (roles.get(selected[0]!)!.position >= yourRoles.highest.position) { generated += "You don't have permission to manage one or more of the user's roles, and therefore can't select one to keep."; } else { generated += - "I don't have permission to manage one or more of the user's roles, and therefore can't select one to keep." + "I don't have permission to manage one or more of the user's roles, and therefore can't select one to keep."; } } } else { diff --git a/src/reflex/scanners.ts b/src/reflex/scanners.ts index b6860d1..1b9d740 100644 --- a/src/reflex/scanners.ts +++ b/src/reflex/scanners.ts @@ -283,31 +283,28 @@ export async function doMemberChecks(member: Discord.GuildMember): Promise .setCustomId(`mod:mute:${member.user.id}`) .setLabel("Mute") .setStyle(ButtonStyle.Primary), - new ButtonBuilder() - .setCustomId(`mod:kick:${member.user.id}`) - .setLabel("Kick") - .setStyle(ButtonStyle.Danger), - new ButtonBuilder() - .setCustomId(`mod:ban:${member.user.id}`) - .setLabel("Ban") - .setStyle(ButtonStyle.Danger) - ] - if (usernameCheck !== null || nicknameCheck !== null) buttons.concat([ - new ButtonBuilder() - .setCustomId(`mod:nickname:${member.user.id}`) - .setLabel("Change Name") - .setStyle(ButtonStyle.Primary) - ]) - if (avatarCheck || avatarTextCheck !== null) buttons.concat([ - new ButtonBuilder() - .setURL(member.displayAvatarURL()) - .setLabel("View Avatar") - .setStyle(ButtonStyle.Link) - ]) - const components: ActionRowBuilder[] = [] + new ButtonBuilder().setCustomId(`mod:kick:${member.user.id}`).setLabel("Kick").setStyle(ButtonStyle.Danger), + new ButtonBuilder().setCustomId(`mod:ban:${member.user.id}`).setLabel("Ban").setStyle(ButtonStyle.Danger) + ]; + if (usernameCheck !== null || nicknameCheck !== null) + buttons.concat([ + new ButtonBuilder() + .setCustomId(`mod:nickname:${member.user.id}`) + .setLabel("Change Name") + .setStyle(ButtonStyle.Primary) + ]); + if (avatarCheck || avatarTextCheck !== null) + buttons.concat([ + new ButtonBuilder().setURL(member.displayAvatarURL()).setLabel("View Avatar").setStyle(ButtonStyle.Link) + ]); + const components: ActionRowBuilder[] = []; for (let i = 0; i < buttons.length; i += 5) { - components.push(new ActionRowBuilder().addComponents(buttons.slice(i, Math.min(buttons.length - 1, i + 5)))) + components.push( + new ActionRowBuilder().addComponents( + buttons.slice(i, Math.min(buttons.length - 1, i + 5)) + ) + ); } await channel.send({