chore: use decorators

package.json

@@ -20,10 +20,12 @@
   "dependencies": {
     "@eslint/eslintrc": "^3.1.0",
     "@prisma/client": "^5.21.1",
+    "@sapphire/decorators": "^6.1.0",
     "@sapphire/discord.js-utilities": "^7.3.0",
     "@sapphire/fetch": "^3.0.3",
     "@sapphire/framework": "^5.2.1",
     "@sapphire/plugin-logger": "^4.0.2",
+    "@sapphire/time-utilities": "^1.7.12",
     "@sapphire/utilities": "^3.17.0",
     "discord.js": "^14.16.3",
     "dotenv": "^16.4.5"

src/commands/fun/cat.ts

@@ -2,17 +2,14 @@ import { Command } from "@sapphire/framework";
 import { fetch, FetchResultTypes } from "@sapphire/fetch";
 import { EmbedBuilder } from "discord.js";
 import type { APIPetResponse } from "../../utils";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+  name: "cat",
+  description: "shows a cat 😽",
+  requiredClientPermissions: ["EmbedLinks"],
+})
 export class CatCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "cat",
-      description: "shows a cat 😽",
-      requiredClientPermissions: ["EmbedLinks"],
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => builder.setName(this.name).setDescription(this.description),

src/commands/fun/coinflip.ts

@@ -1,15 +1,12 @@
 import { Command } from "@sapphire/framework";
 import { EmbedBuilder } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "coinflip",
+    description: "flip! shows heads or tails 🪙",
+})
 export class CoinflipCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "coinflip",
-      description: "flip! shows heads or tails 🪙",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => builder.setName(this.name).setDescription(this.description),

src/commands/fun/dog.ts

@@ -2,16 +2,13 @@ import { Command } from "@sapphire/framework";
 import { fetch, FetchResultTypes } from "@sapphire/fetch";
 import { EmbedBuilder } from "discord.js";
 import type { APIPetResponse } from "../../utils";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "dog",
+    description: "shows a dog 🐶",
+})
 export class DogCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "dog",
-      description: "shows a dog 🐶",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => builder.setName(this.name).setDescription(this.description),

src/commands/fun/duck.ts

@@ -1,17 +1,14 @@
 import { Command } from "@sapphire/framework";
 import { fetch, FetchResultTypes } from "@sapphire/fetch";
 import { EmbedBuilder } from "discord.js";
-import type { APIPetInterface } from "../../utils/types/types.js";
+import type { APIPetInterface } from "../../utils";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "duck",
+    description: "shows a duck 🦆",
+})
 export class DuckCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "duck",
-      description: "shows a duck 🦆",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => builder.setName(this.name).setDescription(this.description),

src/commands/fun/rps.ts

@@ -1,15 +1,12 @@
 import { Command } from "@sapphire/framework";
 import { EmbedBuilder } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "rps",
+    description: "will it be: rock, paper, or scissors? 🤔",
+})
 export class RockPaperScissorsCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "rps",
-      description: "will it be: rock, paper, or scissors? 🤔",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) =>

src/commands/misc/avatar.ts

@@ -1,16 +1,13 @@
 import { Command } from "@sapphire/framework";
 import { EmbedBuilder, type ImageExtension, type ImageSize } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "avatar",
+    description: "shows a user's avatar",
+})
 export class AvatarCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "avatar",
-      description: "shows a user's avatar",
-    });
-  }
-
-  public override registerApplicationCommands(registry: Command.Registry) {
+    public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) =>
         builder

src/commands/misc/iplookup.ts

@@ -1,16 +1,13 @@
 import { Command } from "@sapphire/framework";
 import { fetch, FetchResultTypes } from "@sapphire/fetch";
 import { EmbedBuilder } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "iplookup",
+    description: "shows information about an ip address",
+})
 export class ServerInfoCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "iplookup",
-      description: "shows information about an ip address",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) =>
@@ -44,7 +41,7 @@ export class ServerInfoCommand extends Command {
     }
 
     const res: any = await fetch(
-      `http://ip-api.com/json/${ip}?fields=156435`,
+      `https://ip-api.com/json/${ip}?fields=156435`,
       FetchResultTypes.JSON
     );
 

src/commands/misc/ping.ts

@@ -1,14 +1,11 @@
 import { Command } from "@sapphire/framework";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+    name: "ping",
+    description: "shows latency between bot and discord",
+})
 export class PingCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "ping",
-      description: "shows latency between bot and discord",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => builder.setName(this.name).setDescription(this.description),

src/commands/misc/serverinfo.ts

@@ -7,17 +7,14 @@ import {
   inlineCode,
   time,
 } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+  name: "serverinfo",
+  description: "shows information about the server",
+  runIn: CommandOptionsRunTypeEnum.GuildAny,
+})
 export class ServerInfoCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "serverinfo",
-      description: "shows information about the server",
-      runIn: CommandOptionsRunTypeEnum.GuildAny,
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => builder.setName(this.name).setDescription(this.description),

src/commands/misc/setnick.ts

@@ -1,18 +1,15 @@
 import { Command, CommandOptionsRunTypeEnum } from "@sapphire/framework";
 import { EmbedBuilder, PermissionFlagsBits } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+  name: "setnick",
+  description: "set the nickname of a user",
+  requiredClientPermissions: [PermissionFlagsBits.ManageNicknames],
+  requiredUserPermissions: [PermissionFlagsBits.ManageNicknames],
+  runIn: CommandOptionsRunTypeEnum.GuildAny,
+})
 export class SetNickCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "setnick",
-      description: "set the nickname of a user",
-      requiredClientPermissions: [PermissionFlagsBits.ManageNicknames],
-      requiredUserPermissions: [PermissionFlagsBits.ManageNicknames],
-      runIn: CommandOptionsRunTypeEnum.GuildAny,
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) =>

src/commands/misc/whois.ts

@@ -1,15 +1,12 @@
 import { Command } from "@sapphire/framework";
 import { EmbedBuilder } from "discord.js";
+import { ApplyOptions } from "@sapphire/decorators";
 
+@ApplyOptions<Command.Options>({
+  name: "whois",
+  description: "shows information about a user",
+})
 export class WhoisCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "whois",
-      description: "shows information about a user",
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) =>

src/commands/moderation/ban.ts

@@ -9,19 +9,16 @@ import {
 } from "discord.js";
 import { ModerationType } from "@prisma/client";
 import { handleInfraction } from "../../utils";
-
+import { ApplyOptions } from "@sapphire/decorators";
+
+@ApplyOptions<Command.Options>({
+  name: "ban",
+  description: "ban a member 🔨",
+  requiredUserPermissions: [PermissionFlagsBits.BanMembers],
+  requiredClientPermissions: [PermissionFlagsBits.BanMembers],
+  runIn: CommandOptionsRunTypeEnum.GuildAny,
+})
 export class BanCommand extends Command {
-  public constructor(context: Command.LoaderContext, options: Command.Options) {
-    super(context, {
-      ...options,
-      name: "ban",
-      description: "ban a member 🔨",
-      requiredUserPermissions: [PermissionFlagsBits.BanMembers],
-      requiredClientPermissions: [PermissionFlagsBits.BanMembers],
-      runIn: CommandOptionsRunTypeEnum.GuildAny,
-    });
-  }
-
   public override registerApplicationCommands(registry: Command.Registry) {
     registry.registerChatInputCommand(
       (builder) => {