⚡ feat (release 🤖): Stelle v3.3.0 🎉(#34)

Ganyu-Studios · Dec 26, 2024 · 078fa8b · 078fa8b
2 parents e4c4a05 + 03b925a
commit 078fa8b
Show file tree

Hide file tree

Showing 33 changed files with 374 additions and 236 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "stelle-music",
-    "version": "0.3.2.5-BLAZER",
+    "version": "0.3.3.0-BLAZER",
     "description": "A music bot.",
     "main": "./dist/index.js",
     "type": "module",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/seyfert.config.js b/seyfert.config.js
@@ -5,7 +5,7 @@ import { config } from "seyfert";
 
 import { DEV_MODE, DEBUG_MODE } from "#stelle/data/Constants.js";
 
-const output = DEV_MODE ? "src" : "dist";
+const base = DEV_MODE ? "src" : "dist";
 
 export default config.bot({
     token: process.env.TOKEN ?? "Trailblazer",
@@ -22,8 +22,7 @@ export default config.bot({
      * @type {import("seyfert").RuntimeConfig["locations"] & { lavalink: string }}
      */
     locations: {
-        output,
-        base: "src",
+        base,
         lavalink: "lavalink",
         commands: "commands",
         components: "components",

diff --git a/src/commands/music/autoplay.ts b/src/commands/music/autoplay.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 
 import { StelleCategory } from "#stelle/types";
@@ -14,13 +14,9 @@ import { getAutoplayState } from "#stelle/utils/functions/utils.js";
 @StelleOptions({
     cooldown: 5,
     category: StelleCategory.Music,
-    checkPlayer: true,
-    inVoice: true,
-    sameVoice: true,
-    moreTracks: true,
-    checkNodes: true,
 })
 @LocalesT("locales.autoplay.name", "locales.autoplay.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer", "checkTracks"])
 export default class AutoplayCommand extends Command {
     public override async run(ctx: CommandContext) {
         const { client, guildId } = ctx;

diff --git a/src/commands/music/loop.ts b/src/commands/music/loop.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT, Options, createStringOption } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares, Options, createStringOption } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 
 import type { RepeatMode } from "lavalink-client";
@@ -38,9 +38,10 @@ const options = {
     contexts: ["Guild"],
     aliases: ["l"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, checkPlayer: true, inVoice: true, sameVoice: true, checkNodes: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @Options(options)
 @LocalesT("locales.loop.name", "locales.loop.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class LoopCommand extends Command {
     public override async run(ctx: CommandContext<typeof options>) {
         const { client, options, guildId } = ctx;

diff --git a/src/commands/music/move.ts b/src/commands/music/move.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT, Options, createChannelOption } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares, Options, createChannelOption } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 import { StelleCategory } from "#stelle/types";
 
@@ -31,9 +31,10 @@ const options = {
     contexts: ["Guild"],
     aliases: ["mov", "m"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, checkPlayer: true, inVoice: true, checkNodes: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @Options(options)
 @LocalesT("locales.move.name", "locales.move.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkPlayer"])
 export default class MoveCommand extends Command {
     public override async run(ctx: CommandContext<typeof options>) {
         const { client, options, guildId } = ctx;
@@ -54,14 +55,16 @@ export default class MoveCommand extends Command {
         player.options.voiceChannelId = voice.id;
         player.voiceChannelId = voice.id;
 
+        const channel = await ctx.channel();
+
         await player.connect();
         await ctx.editOrReply({
             embeds: [
                 {
                     color: client.config.color.success,
                     description: messages.commands.move({
                         voiceId: voice.id,
-                        textId: text?.id ?? ctx.channel()?.id ?? "1143606303850483280",
+                        textId: text?.id ?? channel?.id ?? "1143606303850483280",
                     }),
                 },
             ],

diff --git a/src/commands/music/nowplaying.ts b/src/commands/music/nowplaying.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT, type User } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares, type User } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 import { StelleCategory } from "#stelle/types";
 
@@ -13,8 +13,9 @@ import { createBar } from "#stelle/utils/functions/utils.js";
     contexts: ["Guild"],
     aliases: ["np"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, checkNodes: true, checkPlayer: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @LocalesT("locales.nowplaying.name", "locales.nowplaying.description")
+@Middlewares(["checkNodes", "checkPlayer"])
 export default class NowPlayingCommand extends Command {
     public override async run(ctx: CommandContext) {
         const { client, guildId } = ctx;

diff --git a/src/commands/music/play.ts b/src/commands/music/play.ts
@@ -5,6 +5,7 @@ import {
     Embed,
     LocalesT,
     type Message,
+    Middlewares,
     Options,
     type User,
     type WebhookMessage,
@@ -73,9 +74,10 @@ const options = {
     integrationTypes: ["GuildInstall"],
     contexts: ["Guild"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, inVoice: true, sameVoice: true, checkNodes: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @Options(options)
 @LocalesT("locales.play.name", "locales.play.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkVoicePermissions", "checkBotVoiceChannel"])
 export default class PlayCommand extends Command {
     public override async run(ctx: CommandContext<typeof options>): Promise<Message | WebhookMessage | void> {
         const { options, client, guildId, channelId, member } = ctx;

diff --git a/src/commands/music/queue.ts b/src/commands/music/queue.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, Embed, LocalesT, type User } from "seyfert";
+import { Command, type CommandContext, Declare, Embed, LocalesT, Middlewares, type User } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 
 import { StelleCategory } from "#stelle/types";
@@ -13,22 +13,19 @@ import { EmbedPaginator } from "#stelle/utils/Paginator.js";
 @StelleOptions({
     cooldown: 5,
     category: StelleCategory.Music,
-    checkPlayer: true,
-    inVoice: true,
-    sameVoice: true,
-    checkNodes: true,
-    checkQueue: true,
 })
 @LocalesT("locales.queue.name", "locales.queue.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer", "checkQueue"])
 export default class QueueCommand extends Command {
     public override async run(ctx: CommandContext) {
-        const { client, guildId, author } = ctx;
-
-        if (!guildId) return;
+        const { client, author } = ctx;
 
         const { messages } = await ctx.getLocale();
 
-        const player = client.manager.getPlayer(guildId);
+        const guild = await ctx.guild();
+        if (!guild) return;
+
+        const player = client.manager.getPlayer(guild.id);
         if (!player) return;
 
         const tracksPerPage = 20;
@@ -42,7 +39,7 @@ export default class QueueCommand extends Command {
                     new Embed()
                         .setDescription(messages.events.playerQueue({ tracks: tracks.slice(0, tracksPerPage).join("\n") }))
                         .setColor(client.config.color.extra)
-                        .setThumbnail(ctx.guild()!.iconURL())
+                        .setThumbnail(guild.iconURL())
                         .setTimestamp()
                         .setAuthor({ name: author.tag, iconUrl: author.avatarURL() }),
                 ],
@@ -55,7 +52,7 @@ export default class QueueCommand extends Command {
                     new Embed()
                         .setDescription(messages.events.playerQueue({ tracks: tracks.slice(i, i + tracksPerPage).join("\n") }))
                         .setColor(client.config.color.extra)
-                        .setThumbnail(ctx.guild()!.iconURL())
+                        .setThumbnail(guild.iconURL())
                         .setTimestamp()
                         .setAuthor({ name: author.tag, iconUrl: author.avatarURL() }),
                 );

diff --git a/src/commands/music/seek.ts b/src/commands/music/seek.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT, type OKFunction, Options, createStringOption } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares, type OKFunction, Options, createStringOption } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 
 import { EmbedColors } from "seyfert/lib/common/index.js";
@@ -33,9 +33,10 @@ const options = {
     contexts: ["Guild"],
     aliases: ["sk"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, checkPlayer: true, inVoice: true, sameVoice: true, checkNodes: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @Options(options)
 @LocalesT("locales.seek.name", "locales.seek.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class SeekCommand extends Command {
     public override async run(ctx: CommandContext<typeof options>) {
         const { client, options, guildId } = ctx;

diff --git a/src/commands/music/shuffle.ts b/src/commands/music/shuffle.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare } from "seyfert";
+import { Command, type CommandContext, Declare, Middlewares } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 import { StelleCategory } from "#stelle/types";
 
@@ -12,12 +12,8 @@ import { StelleCategory } from "#stelle/types";
 @StelleOptions({
     cooldown: 5,
     category: StelleCategory.Music,
-    checkNodes: true,
-    checkPlayer: true,
-    checkQueue: true,
-    inVoice: true,
-    sameVoice: true,
 })
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer", "checkQueue"])
 export default class ShuffleCommand extends Command {
     public override async run(ctx: CommandContext) {
         const { client } = ctx;

diff --git a/src/commands/music/skip.ts b/src/commands/music/skip.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT, Options, createIntegerOption } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares, Options, createIntegerOption } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 import { StelleCategory } from "#stelle/types";
 
@@ -22,14 +22,10 @@ const options = {
 @StelleOptions({
     cooldown: 5,
     category: StelleCategory.Music,
-    checkPlayer: true,
-    inVoice: true,
-    sameVoice: true,
-    checkNodes: true,
-    checkQueue: true,
 })
 @Options(options)
 @LocalesT("locales.skip.name", "locales.skip.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer", "checkQueue"])
 export default class SkipCommand extends Command {
     public override async run(ctx: CommandContext<typeof options>) {
         const { client, options, guildId } = ctx;

diff --git a/src/commands/music/stop.ts b/src/commands/music/stop.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 import { StelleCategory } from "#stelle/types";
 
@@ -9,8 +9,9 @@ import { StelleCategory } from "#stelle/types";
     contexts: ["Guild"],
     aliases: ["sp"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, checkPlayer: true, inVoice: true, sameVoice: true, checkNodes: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @LocalesT("locales.stop.name", "locales.stop.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class StopCommand extends Command {
     public override async run(ctx: CommandContext) {
         const { client, guildId } = ctx;

diff --git a/src/commands/music/volume.ts b/src/commands/music/volume.ts
@@ -1,4 +1,4 @@
-import { Command, type CommandContext, Declare, LocalesT, Options, createIntegerOption } from "seyfert";
+import { Command, type CommandContext, Declare, LocalesT, Middlewares, Options, createIntegerOption } from "seyfert";
 import { StelleOptions } from "#stelle/decorators";
 import { StelleCategory } from "#stelle/types";
 
@@ -22,9 +22,10 @@ const options = {
     contexts: ["Guild"],
     aliases: ["v", "vol"],
 })
-@StelleOptions({ cooldown: 5, category: StelleCategory.Music, checkPlayer: true, inVoice: true, sameVoice: true, checkNodes: true })
+@StelleOptions({ cooldown: 5, category: StelleCategory.Music })
 @Options(options)
 @LocalesT("locales.volume.name", "locales.volume.description")
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class VolumeCommand extends Command {
     public override async run(ctx: CommandContext<typeof options>) {
         const { client, options, guildId } = ctx;

diff --git a/src/components/autoplay.ts b/src/components/autoplay.ts
@@ -1,11 +1,9 @@
-import { ActionRow, Button, ComponentCommand, type ComponentContext } from "seyfert";
-import { StelleOptions } from "#stelle/decorators";
-
+import { ActionRow, Button, ComponentCommand, type ComponentContext, Middlewares } from "seyfert";
 import { type APIButtonComponentWithCustomId, ButtonStyle, ComponentType } from "seyfert/lib/types/index.js";
 
 import { getAutoplayState } from "#stelle/utils/functions/utils.js";
 
-@StelleOptions({ inVoice: true, sameVoice: true, checkPlayer: true, moreTracks: true, checkNodes: true })
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer", "checkTracks"])
 export default class AutoplayComponent extends ComponentCommand {
     componentType = "Button" as const;
 

diff --git a/src/components/loop.ts b/src/components/loop.ts
@@ -1,10 +1,9 @@
-import { ActionRow, Button, ComponentCommand, type ComponentContext } from "seyfert";
-import { StelleOptions } from "#stelle/decorators";
+import { ActionRow, Button, ComponentCommand, type ComponentContext, Middlewares } from "seyfert";
 
 import { type APIButtonComponentWithCustomId, ButtonStyle, ComponentType } from "seyfert/lib/types/index.js";
 import { getLoopState } from "#stelle/utils/functions/utils.js";
 
-@StelleOptions({ inVoice: true, sameVoice: true, checkPlayer: true, checkNodes: true })
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class ToggleLoopComponent extends ComponentCommand {
     componentType = "Button" as const;
 

diff --git a/src/components/pause.ts b/src/components/pause.ts
@@ -1,10 +1,9 @@
-import { ActionRow, Button, ComponentCommand, type ComponentContext } from "seyfert";
-import { StelleOptions } from "#stelle/decorators";
+import { ActionRow, Button, ComponentCommand, type ComponentContext, Middlewares } from "seyfert";
 
 import { type APIButtonComponentWithCustomId, ButtonStyle, ComponentType } from "seyfert/lib/types/index.js";
 import { getPauseState } from "#stelle/utils/functions/utils.js";
 
-@StelleOptions({ inVoice: true, sameVoice: true, checkPlayer: true, checkNodes: true })
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class PauseTrackComponent extends ComponentCommand {
     componentType = "Button" as const;
 

diff --git a/src/components/previous.ts b/src/components/previous.ts
@@ -1,10 +1,9 @@
-import { ComponentCommand, type ComponentContext } from "seyfert";
-import { StelleOptions } from "#stelle/decorators";
+import { ComponentCommand, type ComponentContext, Middlewares } from "seyfert";
 
 import { EmbedColors } from "seyfert/lib/common/index.js";
 import { MessageFlags } from "seyfert/lib/types/index.js";
 
-@StelleOptions({ inVoice: true, sameVoice: true, checkPlayer: true, checkNodes: true })
+@Middlewares(["checkNodes", "checkVoiceChannel", "checkBotVoiceChannel", "checkPlayer"])
 export default class PreviousTrackComponent extends ComponentCommand {
     componentType = "Button" as const;