pull/62/head
TheCodedProf 3 years ago
parent 764e6c2cd0
commit 1cfa1aeaf8

@ -70,7 +70,7 @@ const presetButtons = [
buttons: ["createticket"], buttons: ["createticket"],
color: "RED" color: "RED"
} }
] ];
export const callback = async (interaction: CommandInteraction): Promise<void> => { export const callback = async (interaction: CommandInteraction): Promise<void> => {
const m = await interaction.reply({ const m = await interaction.reply({
@ -128,10 +128,10 @@ export const callback = async (interaction: CommandInteraction): Promise<void> =
.setLabel(preset.title) .setLabel(preset.title)
.setValue(i.toString()) .setValue(i.toString())
.setDescription(preset.description) .setDescription(preset.description)
.setEmoji(getEmojiByName("COLORS." + preset.color, "id") as APIMessageComponentEmoji) .setEmoji(getEmojiByName("COLORS." + preset.color, "id") as APIMessageComponentEmoji);
}) })
) )
) );
const buttonSelect = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents( const buttonSelect = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(
new StringSelectMenuBuilder() new StringSelectMenuBuilder()
@ -297,7 +297,7 @@ export const callback = async (interaction: CommandInteraction): Promise<void> =
switch (i.customId) { switch (i.customId) {
case "preset": { case "preset": {
const chosen = presetButtons[parseInt(i.values[0]!)]!; const chosen = presetButtons[parseInt(i.values[0]!)]!;
const newColor = colors[chosen.color!]! const newColor = colors[chosen.color!]!;
data = _.assign(data, chosen, { color: newColor }); data = _.assign(data, chosen, { color: newColor });
break; break;
} }

@ -471,10 +471,10 @@ const callback = async (interaction: CommandInteraction) => {
case "add": { case "add": {
const newPage = await editTrack(i, m, roles); const newPage = await editTrack(i, m, roles);
if (_.isEqual(newPage, defaultTrackData)) break; if (_.isEqual(newPage, defaultTrackData)) break;
if(!newPage) break; if (!newPage) break;
console.log(newPage) console.log(newPage);
tracks.push(newPage); tracks.push(newPage);
console.log(tracks) console.log(tracks);
page = tracks.length - 1; page = tracks.length - 1;
break; break;
} }

@ -98,7 +98,11 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
} roles from this track. `; } roles from this track. `;
conflictDropdown = []; conflictDropdown = [];
const yourRoles = guild.members.cache.get(interaction.user.id)!.roles; 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 += generated +=
"In order to promote or demote this user, you must select which role the member should keep."; "In order to promote or demote this user, you must select which role the member should keep.";
selected.forEach((role) => { selected.forEach((role) => {
@ -116,12 +120,12 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
.setPlaceholder("Select a role to keep") .setPlaceholder("Select a role to keep")
]; ];
} else { } else {
if(roles.get(selected[0]!)!.position >= yourRoles.highest.position) { if (roles.get(selected[0]!)!.position >= yourRoles.highest.position) {
generated += generated +=
"You don't have permission to manage one or more of the user's roles, and therefore can't select one to keep."; "You don't have permission to manage one or more of the user's roles, and therefore can't select one to keep.";
} else { } else {
generated += 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 { } else {

@ -283,31 +283,28 @@ export async function doMemberChecks(member: Discord.GuildMember): Promise<void>
.setCustomId(`mod:mute:${member.user.id}`) .setCustomId(`mod:mute:${member.user.id}`)
.setLabel("Mute") .setLabel("Mute")
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
new ButtonBuilder() new ButtonBuilder().setCustomId(`mod:kick:${member.user.id}`).setLabel("Kick").setStyle(ButtonStyle.Danger),
.setCustomId(`mod:kick:${member.user.id}`) new ButtonBuilder().setCustomId(`mod:ban:${member.user.id}`).setLabel("Ban").setStyle(ButtonStyle.Danger)
.setLabel("Kick") ];
.setStyle(ButtonStyle.Danger), if (usernameCheck !== null || nicknameCheck !== null)
new ButtonBuilder() buttons.concat([
.setCustomId(`mod:ban:${member.user.id}`)
.setLabel("Ban")
.setStyle(ButtonStyle.Danger)
]
if (usernameCheck !== null || nicknameCheck !== null) buttons.concat([
new ButtonBuilder() new ButtonBuilder()
.setCustomId(`mod:nickname:${member.user.id}`) .setCustomId(`mod:nickname:${member.user.id}`)
.setLabel("Change Name") .setLabel("Change Name")
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
]) ]);
if (avatarCheck || avatarTextCheck !== null) buttons.concat([ if (avatarCheck || avatarTextCheck !== null)
new ButtonBuilder() buttons.concat([
.setURL(member.displayAvatarURL()) new ButtonBuilder().setURL(member.displayAvatarURL()).setLabel("View Avatar").setStyle(ButtonStyle.Link)
.setLabel("View Avatar") ]);
.setStyle(ButtonStyle.Link) const components: ActionRowBuilder<ButtonBuilder>[] = [];
])
const components: ActionRowBuilder<ButtonBuilder>[] = []
for (let i = 0; i < buttons.length; i += 5) { for (let i = 0; i < buttons.length; i += 5) {
components.push(new ActionRowBuilder<ButtonBuilder>().addComponents(buttons.slice(i, Math.min(buttons.length - 1, i + 5)))) components.push(
new ActionRowBuilder<ButtonBuilder>().addComponents(
buttons.slice(i, Math.min(buttons.length - 1, i + 5))
)
);
} }
await channel.send({ await channel.send({

Loading…
Cancel
Save