huge changes once again
diff --git a/src/commands/user/about.ts b/src/commands/user/about.ts
index 0c7a3eb..8557d15 100644
--- a/src/commands/user/about.ts
+++ b/src/commands/user/about.ts
@@ -1,7 +1,7 @@
import Discord, { CommandInteraction, MessageActionRow, MessageButton } from "discord.js";
import { SelectMenuOption, SlashCommandSubcommandBuilder } from "@discordjs/builders";
import { WrappedCheck } from "jshaiku";
-import generateEmojiEmbed from "../../utils/generateEmojiEmbed.js";
+import EmojiEmbed from "../../utils/generateEmojiEmbed.js";
import getEmojiByName from "../../utils/getEmojiByName.js";
import generateKeyValueList from "../../utils/generateKeyValueList.js";
import createPageIndicator from "../../utils/createPageIndicator.js";
@@ -26,7 +26,7 @@
}
-const callback = async (interaction: CommandInteraction) => {
+const callback = async (interaction: CommandInteraction): Promise<any> => {
const { renderUser, renderDelta } = client.logger
let member = (interaction.options.getMember("user") || interaction.member) as Discord.GuildMember;
let flags: string[] = [];
@@ -105,7 +105,7 @@
let embeds = [
new Embed()
- .setEmbed(new generateEmojiEmbed()
+ .setEmbed(new EmojiEmbed()
.setTitle("User Info: General")
.setStatus("Success")
.setEmoji("MEMBER.JOIN")
@@ -129,7 +129,7 @@
.setImage((await member.user.fetch()).bannerURL({format: "gif"}))
).setTitle("General").setDescription("General information about the user").setPageId(0),
new Embed()
- .setEmbed(new generateEmojiEmbed()
+ .setEmbed(new EmojiEmbed()
.setTitle("User Info: Roles")
.setStatus("Success")
.setEmoji("GUILD.ROLES.CREATE")
@@ -144,7 +144,7 @@
.setThumbnail(await member.user.displayAvatarURL({dynamic: true}))
).setTitle("Roles").setDescription("Roles the user has").setPageId(1),
new Embed()
- .setEmbed(new generateEmojiEmbed()
+ .setEmbed(new EmojiEmbed()
.setTitle("User Info: Key Permissions")
.setStatus("Success")
.setEmoji("GUILD.ROLES.CREATE")
@@ -158,7 +158,7 @@
).setTitle("Key Permissions").setDescription("Key permissions the user has").setPageId(2),
]
let m
- m = await interaction.reply({embeds: [new generateEmojiEmbed().setTitle("Loading").setEmoji("NUCLEUS.LOADING").setStatus("Danger")], fetchReply: true, ephemeral: true});
+ m = await interaction.reply({embeds: [new EmojiEmbed().setTitle("Loading").setEmoji("NUCLEUS.LOADING").setStatus("Danger")], fetchReply: true, ephemeral: true});
let page = 0
let breakReason = ""
while (true) {
diff --git a/src/commands/user/avatar.ts b/src/commands/user/avatar.ts
index 9a84118..e72506f 100644
--- a/src/commands/user/avatar.ts
+++ b/src/commands/user/avatar.ts
@@ -1,10 +1,10 @@
import Discord, { CommandInteraction } from "discord.js";
import { SlashCommandSubcommandBuilder } from "@discordjs/builders";
import { WrappedCheck } from "jshaiku";
-import generateEmojiEmbed from "../../utils/generateEmojiEmbed.js";
+import EmojiEmbed from "../../utils/generateEmojiEmbed.js";
import getEmojiByName from "../../utils/getEmojiByName.js";
import generateKeyValueList from "../../utils/generateKeyValueList.js";
-import client from "../../client.js"
+import client from "../../utils/client.js"
const command = (builder: SlashCommandSubcommandBuilder) =>
builder
@@ -12,10 +12,10 @@
.setDescription("Shows the avatar of a user")
.addUserOption(option => option.setName("user").setDescription("The user to get the avatar of | Default: Yourself"))
-const callback = async (interaction: CommandInteraction) => {
+const callback = async (interaction: CommandInteraction): Promise<any> => {
const { renderUser } = client.logger
let member = (interaction.options.getMember("user") || interaction.member) as Discord.GuildMember;
- await interaction.reply({embeds: [new generateEmojiEmbed()
+ await interaction.reply({embeds: [new EmojiEmbed()
.setTitle("User Info")
.setStatus("Success")
.setEmoji("MEMBER.JOIN")
diff --git a/src/commands/user/track.ts b/src/commands/user/track.ts
index 0e6fafd..da332da 100644
--- a/src/commands/user/track.ts
+++ b/src/commands/user/track.ts
@@ -1,7 +1,7 @@
import Discord, { CommandInteraction, GuildMember, Message, MessageActionRow, MessageButton } from "discord.js";
import { SelectMenuOption, SlashCommandSubcommandBuilder } from "@discordjs/builders";
import { WrappedCheck } from "jshaiku";
-import generateEmojiEmbed from "../../utils/generateEmojiEmbed.js";
+import EmojiEmbed from "../../utils/generateEmojiEmbed.js";
import getEmojiByName from "../../utils/getEmojiByName.js";
import addPlural from "../../utils/plurals.js";
import client from "../../utils/client.js";
@@ -21,12 +21,12 @@
return "TRACKS.VERTICAL.MIDDLE." + disabled + active
}
-const callback = async (interaction: CommandInteraction) => {
+const callback = async (interaction: CommandInteraction): Promise<any> => {
const { renderUser } = client.logger;
const member = interaction.options.getMember("user") as GuildMember;
const guild = interaction.guild;
- let config = await client.database.read(guild.id);
- await interaction.reply({embeds: [new generateEmojiEmbed()
+ let config = await client.database.guilds.read(guild.id);
+ await interaction.reply({embeds: [new EmojiEmbed()
.setEmoji("NUCLEUS.LOADING")
.setTitle("Loading")
.setStatus("Danger")
@@ -35,9 +35,11 @@
let generated;
const roles = await guild.roles.fetch()
let memberRoles = await member.roles
+ let managed
while (true) {
let data = config.tracks[track]
- let managed = data.manageableBy.some(element => {return memberRoles.cache.has(element)})
+ if (data.manageableBy !== undefined) managed = data.manageableBy.some(element => {return memberRoles.cache.has(element)})
+ else managed = false
let dropdown = new Discord.MessageSelectMenu().addOptions(config.tracks.map((option, index) => {
let hasRoleInTrack = option.track.some(element => {return memberRoles.cache.has(element)})
return new SelectMenuOption({
@@ -94,7 +96,7 @@
} else {
currentRoleIndex = selected.length == 0 ? -1 : data.track.indexOf(selected[0].toString())
}
- let m = await interaction.editReply({embeds: [new generateEmojiEmbed()
+ let m = await interaction.editReply({embeds: [new EmojiEmbed()
.setEmoji("TRACKS.ICON")
.setTitle("Tracks")
.setDescription(`${generated}`)
@@ -160,16 +162,19 @@
}
const check = async (interaction: CommandInteraction, defaultCheck: WrappedCheck) => {
+ let tracks = (await client.database.guilds.read(interaction.guild.id)).tracks
+ if (!tracks) throw "This server does not have any tracks"
let member = (interaction.member as GuildMember)
// Allow the owner to promote anyone
if (member.id == interaction.guild.ownerId) return true
// Check if the user can manage any of the tracks
- // @ts-ignore
- let tracks = (await client.database.get(interaction.guild.id)).tracks
let managed = false
- tracks.forEach(element => { if (element.track.manageableBy.some(role => member.roles.cache.has(role))) managed = true });
+ tracks.forEach(element => {
+ if (!element.track.manageableBy) return
+ if (element.track.manageableBy.some(role => member.roles.cache.has(role))) managed = true
+ });
// Check if the user has manage_roles permission
- if (!managed && ! member.permissions.has("MANAGE_ROLES")) throw "You do not have the `manage_roles` permission";
+ if (!managed && ! member.permissions.has("MANAGE_ROLES")) throw "You do not have the Manage roles permission";
// Allow track
return true;
}