Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!362

src/commands/anime.ts

@@ -8,6 +8,7 @@ export default {
     description: "Anime subcommands",
     public: true,
     dev: false,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("anime")

src/commands/ban.ts

@@ -9,6 +9,7 @@ export default {
     description: "Ban a user",
     dev: false,
     public: false,
+    requiredRole: "admin",
 
     data: new SlashCommandBuilder()
         .setName("ban")
@@ -55,12 +56,6 @@ export default {
 
         const mod = await interaction.guild!.members.fetch(interaction.user.id)
         const memberRoles = member.roles.cache.map(role => role.id)
-        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.")
-            return
-        }
 
         if (interaction.guild!.members.me!.roles.highest.position <= member.roles.highest.position) {
             await interaction.editReply("I cannot ban this member.")

src/commands/botinfo.ts

@@ -11,6 +11,7 @@ export default {
     description: "Get information about the bot",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("botinfo")

src/commands/check.ts

@@ -10,6 +10,7 @@ export default {
     description: "Check a player's stats.",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("check")

src/commands/clear.ts

@@ -8,6 +8,7 @@ export default {
     description: "Clears messages",
     dev: false,
     public: false,
+    requiredRole: "admin",
 
     data: new SlashCommandBuilder()
         .setName("clear")

src/commands/config.ts

@@ -8,6 +8,7 @@ export default {
     description: "Configure the bot",
     dev: false,
     public: false,
+    requiredRole: "superadmin",
 
     data: new SlashCommandBuilder()
         .setName("config")

src/commands/find.ts

@@ -9,6 +9,7 @@ export default {
     description: "Find a person by the ign",
     dev: false,
     public: false,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("find")

src/commands/forceunverify.ts

@@ -11,6 +11,7 @@ export default {
     description: "Force unverify a user",
     dev: false,
     public: false,
+    requiredRole: "superadmin",
 
     data: new SlashCommandBuilder()
         .setName("forceunverify")

src/commands/forceupdate.ts

@@ -12,6 +12,7 @@ export default {
     description: "Force update the user",
     dev: false,
     public: false,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("forceupdate")

src/commands/forceverify.ts

@@ -13,6 +13,7 @@ export default {
     description: "Force verify a user.",
     dev: false,
     public: false,
+    requiredRole: "admin",
 
     data: new SlashCommandBuilder()
         .setName("forceverify")

src/commands/guild.ts

@@ -11,6 +11,7 @@ export default {
     dev: false,
     public: true,
     subcommands: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("guild")

src/commands/help.ts

@@ -7,6 +7,7 @@ export default {
     description: "Help command",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("help")

src/commands/kick.ts

@@ -9,6 +9,7 @@ export default {
     description: "Kick a member from the server.",
     dev: false,
     public: false,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("kick")
@@ -34,12 +35,6 @@ export default {
         const reason = interaction.options.getString("reason") ?? "No reason provided."
         const mod = await interaction.guild!.members.fetch(interaction.user.id)
         const memberRoles = member.roles.cache.map(role => role.id)
-        const modRoles = mod.roles.cache.map(role => role.id)
-
-        if (!modRoles.includes(helper) && !modRoles.includes(admin)) {
-            await interaction.editReply("You do not have permission to use this command.")
-            return
-        }
 
         if (member.id === interaction.applicationId) {
             await interaction.editReply("I cannot kick myself.")

src/commands/ping.ts

@@ -7,6 +7,7 @@ export default {
     description: "Get the bot's ping.",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("ping")

src/commands/pp.ts

@@ -8,6 +8,7 @@ export default {
     description: "Shows pp size",
     public: true,
     dev: false,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("pp")

src/commands/remove.ts

@@ -10,6 +10,7 @@ export default {
     description: "Remove a person on the waiting list.",
     dev: false,
     public: false,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("remove")

src/commands/reqs.ts

@@ -8,6 +8,7 @@ export default {
     description: "Displays the requirements for the guild.",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("reqs")

src/commands/send.ts

@@ -7,6 +7,7 @@ export default {
     description: "Send a message to a channel.",
     dev: false,
     public: false,
+    requiredRole: "superadmin",
 
     data: new SlashCommandBuilder()
         .setName("send")

src/commands/setnick.ts

@@ -8,6 +8,7 @@ export default {
     description: "Set your nickname",
     dev: false,
     public: false,
+    requiredRole: "admin",
 
     data: new SlashCommandBuilder()
         .setName("setnick")

src/commands/setup.ts

@@ -15,9 +15,10 @@ import { ICommand } from "~/typings"
 export default {
     name: "setup",
     description: "Used for setup of the bot.",
-    dev: true,
+    dev: false,
     public: false,
     subcommands: true,
+    requiredRole: "superadmin",
 
     data: new SlashCommandBuilder()
         .setName("setup")

src/commands/slowmode.ts

@@ -17,6 +17,7 @@ export default {
     description: "Set the slowmode of a channel.",
     dev: false,
     public: false,
+    requiredRole: "admin",
 
     data: new SlashCommandBuilder()
         .setName("slowmode")

src/commands/staff.ts

@@ -13,6 +13,7 @@ export default {
     dev: false,
     public: false,
     subcommands: true,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("staff")

src/commands/timeout.ts

@@ -10,6 +10,7 @@ export default {
     description: "Times out a memeber",
     dev: false,
     public: false,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("timeout")

src/commands/unban.ts

@@ -9,6 +9,7 @@ export default {
     description: "Unban a user from the server",
     dev: false,
     public: false,
+    requiredRole: "admin",
 
     data: new SlashCommandBuilder()
         .setName("unban")

src/commands/update.ts

@@ -12,6 +12,7 @@ export default {
     description: "Update your guild rank.",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("update")

src/commands/uuid.ts

@@ -9,6 +9,7 @@ export default {
     description: "Get a player's UUID",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("uuid")

src/commands/verify.ts

@@ -12,6 +12,7 @@ export default {
     description: "Verify yourself as a member of the server.",
     dev: false,
     public: true,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("verify")

src/commands/whoami.ts

@@ -9,6 +9,7 @@ export default {
     description: "Get your user info",
     public: true,
     dev: false,
+    requiredRole: "none",
 
     data: new SlashCommandBuilder()
         .setName("whoami")

src/commands/whois.ts

@@ -9,6 +9,7 @@ export default {
     description: "Get's the ign of a user.",
     dev: false,
     public: false,
+    requiredRole: "helper",
 
     data: new SlashCommandBuilder()
         .setName("whois")

src/typings/Autocomplete.ts

@@ -1,8 +0,0 @@
-import { AutocompleteInteraction } from "discord.js"
-import { ExtendedClient } from "~/utils/Client"
-
-export interface IAutocomplete {
-    name: string
-    description: string
-    execute: (arg: { interaction: AutocompleteInteraction, client: ExtendedClient }) => Promise<void>
-}

src/typings/Button.ts

@@ -1,8 +0,0 @@
-import { ButtonInteraction } from "discord.js"
-import { ExtendedClient } from "~/utils/Client"
-
-export interface IButton {
-    name: string
-    description: string
-    execute: (arg: { interaction: ButtonInteraction, client: ExtendedClient }) => Promise<void>
-}

src/typings/Command.ts

@@ -1,12 +0,0 @@
-import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js"
-import { ExtendedClient as Client } from "~/utils/Client"
-
-export interface ICommand {
-    name: string
-    description: string
-    dev?: boolean
-    public: boolean
-    subcommands?: boolean
-    data: SlashCommandBuilder
-    execute: (arg: { interaction: ChatInputCommandInteraction, client: Client }) => Promise<void>
-}

src/typings/ContextMenu.ts

@@ -1,10 +0,0 @@
-import { ContextMenuCommandBuilder, ContextMenuCommandInteraction } from "discord.js"
-import { ExtendedClient } from "~/utils/Client"
-
-export interface IContextMenu {
-    name: string
-    description: string
-    dev?: boolean
-    data: ContextMenuCommandBuilder
-    execute: (arg: { interaction: ContextMenuCommandInteraction, client: ExtendedClient }) => Promise<void>
-}

src/typings/Discord.ts

@@ -0,0 +1,56 @@
+import {
+    AutocompleteInteraction,
+    ButtonInteraction,
+    ChatInputCommandInteraction,
+    ClientEvents,
+    ContextMenuCommandBuilder,
+    ContextMenuCommandInteraction,
+    ModalSubmitInteraction,
+    SlashCommandBuilder
+} from "discord.js"
+import { ExtendedClient } from "~/utils/Client"
+
+export interface ICommand {
+    name: string
+    description: string
+    dev?: boolean
+    public: boolean
+    subcommands?: boolean
+    requiredRole?: "none" | "helper" | "admin" | "superadmin"
+    data: SlashCommandBuilder
+    execute: (arg: { interaction: ChatInputCommandInteraction, client: ExtendedClient }) => Promise<void>
+}
+export interface IContextMenu {
+    name: string
+    description: string
+    dev?: boolean
+    data: ContextMenuCommandBuilder
+    execute: (arg: { interaction: ContextMenuCommandInteraction, client: ExtendedClient }) => Promise<void>
+}
+export type SubCommand<T extends boolean = false> = (
+    arg: T extends true ? {
+            interaction: ChatInputCommandInteraction
+            client: ExtendedClient
+        } :
+        {
+            interaction: ChatInputCommandInteraction
+        }
+) => Promise<void>
+
+export interface IAutocomplete {
+    name: string
+    description: string
+    execute: (arg: { interaction: AutocompleteInteraction, client: ExtendedClient }) => Promise<void>
+}
+export interface IButton {
+    name: string
+    description: string
+    execute: (arg: { interaction: ButtonInteraction, client: ExtendedClient }) => Promise<void>
+}
+export interface IModal {
+    name: string
+    description: string
+    execute: (arg: { interaction: ModalSubmitInteraction, client: ExtendedClient }) => Promise<void>
+}
+
+export type Event<E extends keyof ClientEvents> = (...args: ClientEvents[E]) => void

src/typings/Event.ts

@@ -1,3 +0,0 @@
-import { ClientEvents } from "discord.js"
-
-export type Event<E extends keyof ClientEvents> = (...args: ClientEvents[E]) => void

src/typings/Modal.ts

@@ -1,8 +0,0 @@
-import { ModalSubmitInteraction } from "discord.js"
-import { ExtendedClient } from "~/utils/Client"
-
-export interface IModal {
-    name: string
-    description: string
-    execute: (arg: { interaction: ModalSubmitInteraction, client: ExtendedClient }) => Promise<void>
-}

src/typings/SubCommand.ts

@@ -1,14 +0,0 @@
-import { ChatInputCommandInteraction } from "discord.js"
-import { ExtendedClient } from "~/utils/Client"
-
-type InteractionObject = {
-    interaction: ChatInputCommandInteraction
-}
-
-type ClientObject = {
-    client: ExtendedClient
-}
-
-type SubCommandObject<T extends boolean> = T extends true ? InteractionObject & ClientObject : InteractionObject
-
-export type SubCommand<T extends boolean = false> = (arg: SubCommandObject<T>) => Promise<void>

src/typings/TimeZones.ts

@@ -1,4 +1,4 @@
-type TimeZonesArray = [
+export type TimeZones = [
     "Africa/Abidjan",
     "Africa/Accra",
     "Africa/Addis_Ababa",
@@ -427,6 +427,4 @@ type TimeZonesArray = [
     "Pacific/Truk",
     "Pacific/Wake",
     "Pacific/Wallis"
-]
+][number]
-
-export type TimeZones = TimeZonesArray[number]

src/typings/index.ts

@@ -1,11 +1,6 @@
-export * from "./Autocomplete"
-export * from "./Button"
-export * from "./Command"
-export * from "./ContextMenu"
 export * from "./Cron"
-export * from "./Event"
+export * from "./Discord"
 export * from "./General"
 export * from "./Guild"
-export * from "./Modal"
 export * from "./Player"
-export * from "./SubCommand"
+export * from "./TimeZones"

src/utils/Events/command.ts

@@ -1,10 +1,11 @@
-import { Events, MessageFlags } from "discord.js"
+import { Events, GuildMember, MessageFlags } from "discord.js"
 import fs from "fs"
 import path from "path"
 import { embedColor } from "~/config/options"
 import { ICommand, LoadEventsOptions } from "~/typings"
 import { ExtendedClient as Client } from "~/utils/Client"
 import logToChannel from "~/utils/Functions/logtochannel"
+import { isAdmin, isHelper, isSuperAdmin } from "../Functions/staff"
 import tryCatch from "../Functions/trycatch"
 import { log } from "../Logger"
 
@@ -33,6 +34,43 @@ export default async function loadSlashCommandsEvents(client: Client, { ft, dir
             return
         }
 
+        if (!command.requiredRole && !isSuperAdmin(interaction.member as GuildMember)) {
+            await interaction.reply({
+                content: "You do not have permission to use this command.",
+                flags: MessageFlags.Ephemeral
+            })
+            return
+        }
+
+        switch (command.requiredRole) {
+            case "superadmin":
+                if (!isSuperAdmin(interaction.member as GuildMember)) {
+                    await interaction.reply({
+                        content: "You do not have permission to use this command.",
+                        flags: MessageFlags.Ephemeral
+                    })
+                }
+                break
+            case "admin":
+                if (!isAdmin(interaction.member as GuildMember)) {
+                    await interaction.reply({
+                        content: "You do not have permission to use this command.",
+                        flags: MessageFlags.Ephemeral
+                    })
+                }
+                break
+            case "helper":
+                if (!isHelper(interaction.member as GuildMember)) {
+                    await interaction.reply({
+                        content: "You do not have permission to use this command.",
+                        flags: MessageFlags.Ephemeral
+                    })
+                }
+                break
+            case "none":
+                break
+        }
+
         const [error] = await tryCatch(command.execute({ interaction, client }))
         if (!error) return
 

src/utils/Functions/staff.ts

@@ -0,0 +1,14 @@
+import { GuildMember, PermissionFlagsBits } from "discord.js"
+import { admin, helper } from "~/config/roles"
+
+export function isSuperAdmin(member: GuildMember) {
+    return member.permissions.has(PermissionFlagsBits.Administrator)
+}
+
+export function isAdmin(member: GuildMember) {
+    return member.roles.cache.has(admin) || member.permissions.has(PermissionFlagsBits.Administrator)
+}
+
+export function isHelper(member: GuildMember) {
+    return member.roles.cache.has(helper) || member.roles.cache.has(admin) || member.permissions.has(PermissionFlagsBits.Administrator)
+}