Fix inconsistencies in types (#175)

* performance improvement on handler * fix types
yorunoken · Apr 14, 2024 · bcac18d · bcac18d
1 parent 6ebccc7
commit bcac18d
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 93 deletions.
diff --git a/src/commands/general/config.ts b/src/commands/general/config.ts
@@ -1,12 +1,11 @@
 import { getUser, insertData } from "@utils/database";
 import { ScoreEmbed } from "@type/database";
 import { ApplicationCommandOptionType } from "lilybird";
-import type { ApplicationCommandData, GuildInteraction, Interaction } from "@lilybird/transformers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
 import type { EmbedStructure } from "lilybird";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "config",
         description: "Set your account configurations",
@@ -37,7 +36,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
     if (!interaction.inGuild()) return;
 

diff --git a/src/commands/general/ping.ts b/src/commands/general/ping.ts
@@ -1,8 +1,7 @@
 import { client } from "@utils/initalize";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: { name: "ping", description: "pong!!" },
     run: async (interaction) => {
         await interaction.deferReply();

diff --git a/src/commands/general/prefix.ts b/src/commands/general/prefix.ts
@@ -2,8 +2,8 @@ import { getServer, insertData } from "@utils/database";
 import { DEFAULT_PREFIX, MAX_AMOUNT_OF_PREFIXES } from "@utils/constants";
 import { prefixesCache } from "@listeners/guildCreate";
 import { ApplicationCommandOptionType, EmbedType, PermissionFlags } from "lilybird";
-import type { ApplicationCommandData, GuildInteraction, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 const commands: Record<string, ({ prefix, interaction, guildId }: { prefix?: string, interaction: GuildInteraction<ApplicationCommandData>, guildId: string }) => Promise<void>> = {
     add,
@@ -21,7 +21,6 @@ const PERMISSIONS_NEEDED = PermissionNames[Number(PERMISSIONS_NEEDED_INT)];
 const PERMISSION_NEEDED_STRING = `Looks like you don't have the necessary permissions for this command. Permission(s) needed: \`${PERMISSIONS_NEEDED}\``;
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "prefix",
         description: "Set, remove and list the bot's prefixes",
@@ -48,7 +47,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
     if (!interaction.inGuild()) return;
 

diff --git a/src/commands/help/help.ts b/src/commands/help/help.ts
@@ -1,8 +1,7 @@
 import { helpBuilder } from "@builders/help";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: { name: "help", description: "Get info about the bot." },
     run: async (interaction) => {
         await interaction.deferReply();

diff --git a/src/commands/osu/avatar.ts b/src/commands/osu/avatar.ts
@@ -4,11 +4,10 @@ import { UserType } from "@type/commandArgs";
 import { EmbedBuilderType } from "@type/embedBuilders";
 import { avatarBuilder } from "@builders/avatar";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "avatar",
         description: "Display the avatar of a user.",
@@ -28,8 +27,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/background.ts b/src/commands/osu/background.ts
@@ -4,11 +4,10 @@ import { EmbedBuilderType } from "@type/embedBuilders";
 import { backgroundBuilder } from "@builders/background";
 import { client } from "@utils/initalize";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "background",
         description: "Display background of a beatmap.",
@@ -23,8 +22,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/banner.ts b/src/commands/osu/banner.ts
@@ -4,11 +4,10 @@ import { client } from "@utils/initalize";
 import { UserType } from "@type/commandArgs";
 import { EmbedBuilderType } from "@type/embedBuilders";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "banner",
         description: "Display the banner of a user.",
@@ -28,8 +27,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/compare.ts b/src/commands/osu/compare.ts
@@ -5,11 +5,10 @@ import { compareBuilder } from "@builders/compare";
 import { getBeatmapIdFromContext } from "@utils/osu";
 import { EmbedBuilderType } from "@type/embedBuilders";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "compare",
         description: "Display play(s) of a user on a beatmap.",
@@ -71,8 +70,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/leaderboard.ts b/src/commands/osu/leaderboard.ts
@@ -8,11 +8,10 @@ import { mesageDataForButtons } from "@utils/cache";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
 import type { LeaderboardBuilderOptions } from "@type/embedBuilders";
 import type { Mod } from "osu-web.js";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "leaderboard",
         description: "Display the leaderboard of a beatmap",
@@ -44,8 +43,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/link.ts b/src/commands/osu/link.ts
@@ -1,17 +1,15 @@
 import { encrypt } from "../..";
 import { buildAuthUrl } from "@utils/osu";
 import type { AuthScope } from "@type/osu";
-import type { SlashCommand } from "@lilybird/handlers";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
 
 export default {
-    post: "GLOBAL",
     data: { name: "link", description: "Link your osu! account to the bot." },
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply(true);
 
     const encryptedDiscordId = `${encrypt(interaction.member.user.id)}`;

diff --git a/src/commands/osu/map.ts b/src/commands/osu/map.ts
@@ -4,11 +4,10 @@ import { mapBuilder } from "@builders/map";
 import { EmbedBuilderType } from "@type/embedBuilders";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
 import type { Mod } from "osu-web.js";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "map",
         description: "Display statistics of a beatmap.",
@@ -29,8 +28,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/profile.ts b/src/commands/osu/profile.ts
@@ -4,11 +4,10 @@ import { client } from "@utils/initalize";
 import { UserType } from "@type/commandArgs";
 import { EmbedBuilderType } from "@type/embedBuilders";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "profile",
         description: "Display statistics of a user.",
@@ -34,8 +33,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/recent.ts b/src/commands/osu/recent.ts
@@ -9,11 +9,10 @@ import { mesageDataForButtons } from "@utils/cache";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
 import type { PlaysBuilderOptions } from "@type/embedBuilders";
 import type { Mod } from "osu-web.js";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "recent",
         description: "Display recent play(s) of a user.",
@@ -82,8 +81,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/recentbest.ts b/src/commands/osu/recentbest.ts
@@ -9,11 +9,10 @@ import { mesageDataForButtons } from "@utils/cache";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
 import type { PlaysBuilderOptions } from "@type/embedBuilders";
 import type { Mod } from "osu-web.js";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "recentbest",
         description: "Display most recent top play(s) of a user.",
@@ -84,8 +83,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/recentlist.ts b/src/commands/osu/recentlist.ts
@@ -9,11 +9,10 @@ import { mesageDataForButtons } from "@utils/cache";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
 import type { PlaysBuilderOptions } from "@type/embedBuilders";
 import type { Mod } from "osu-web.js";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "recentlist",
         description: "Display a list of recent play(s) of a user.",
@@ -89,8 +88,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/top.ts b/src/commands/osu/top.ts
@@ -9,11 +9,10 @@ import { mesageDataForButtons } from "@utils/cache";
 import { ApplicationCommandOptionType, EmbedType } from "lilybird";
 import type { PlaysBuilderOptions } from "@type/embedBuilders";
 import type { Mod } from "osu-web.js";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
-import type { SlashCommand } from "@lilybird/handlers";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
 
 export default {
-    post: "GLOBAL",
     data: {
         name: "top",
         description: "Display top play(s) of a user.",
@@ -84,8 +83,7 @@ export default {
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply();
 
     const args = getCommandArgs(interaction);

diff --git a/src/commands/osu/unlink.ts b/src/commands/osu/unlink.ts
@@ -1,16 +1,14 @@
 import { getUser, removeUser } from "@utils/database";
 import { slashCommandsIds } from "@utils/cache";
-import type { SlashCommand } from "@lilybird/handlers";
-import type { ApplicationCommandData, Interaction } from "@lilybird/transformers";
+import type { SlashCommand } from "@type/commands";
+import type { ApplicationCommandData, GuildInteraction } from "@lilybird/transformers";
 
 export default {
-    post: "GLOBAL",
     data: { name: "unlink", description: "Unlink your osu! account from the bot." },
     run
 } satisfies SlashCommand;
 
-async function run(interaction: Interaction<ApplicationCommandData>): Promise<void> {
-    if (!interaction.inGuild()) return;
+async function run(interaction: GuildInteraction<ApplicationCommandData>): Promise<void> {
     await interaction.deferReply(true);
 
     const linkCommand = slashCommandsIds.get("link");