Refactored code and removed the require lines of the old files

naseif · Dec 8, 2021 · 4286abf · 4286abf
1 parent 31aa8e9
commit 4286abf
Show file tree

Hide file tree

Showing 15 changed files with 337 additions and 128 deletions.
diff --git a/commands/Anime/highfive.js b/commands/Anime/highfive.js
@@ -1,5 +1,4 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { requestAPI } = require("../../modules/requestAPI");
 const { getUserFromMention } = require("../../modules/getUserFromMention");
 
 module.exports = {
@@ -11,7 +10,9 @@ module.exports = {
   async run(message, args, client) {
     try {
       const user = getUserFromMention(args[0], client);
-      const highFive = await requestAPI("https://api.waifu.pics/sfw/highfive");
+      const highFive = await client.apis.request(
+        "https://api.waifu.pics/sfw/highfive"
+      );
       const highFiveEmbed = {
         color: "#9dcc37",
         image: {
@@ -42,7 +43,9 @@ module.exports = {
   async execute(interaction, client) {
     await interaction.deferReply();
     try {
-      const highFive = await requestAPI("https://api.waifu.pics/sfw/highfive");
+      const highFive = await client.apis.request(
+        "https://api.waifu.pics/sfw/highfive"
+      );
       const highFiveEmbed = {
         color: "#9dcc37",
         image: {

diff --git a/commands/Anime/hug.js b/commands/Anime/hug.js
@@ -1,14 +1,14 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { requestAPI } = require("../../modules/requestAPI");
 
 module.exports = {
   name: "hug",
   args: false,
   description: "Sends a hug gif",
   usage: "hug",
   async run(message, args, client) {
+    console.log("hi");
     try {
-      const hug = await requestAPI("https://api.waifu.pics/sfw/hug");
+      const hug = await client.apis.request("https://api.waifu.pics/sfw/hug");
       const hugEmbed = {
         color: "#9dcc37",
         image: {
@@ -24,6 +24,7 @@ module.exports = {
       };
       return await message.channel.send({ embeds: [hugEmbed] });
     } catch (error) {
+      console.log(error);
       client.logger(error.message, "error");
       return await message.channel.send(
         `❌ | Couldn't retrieve a hug gif, Sorry!`
@@ -36,7 +37,7 @@ module.exports = {
   async execute(interaction, client) {
     await interaction.deferReply();
     try {
-      const hug = await requestAPI("https://api.waifu.pics/sfw/hug");
+      const hug = await client.apis.request("https://api.waifu.pics/sfw/hug");
       const hugEmbed = {
         color: "#9dcc37",
         image: {

diff --git a/commands/Anime/searchAnime.js b/commands/Anime/searchAnime.js
@@ -1,7 +1,5 @@
 const { embedMessage } = require("../../modules/embedSimple");
-const { getAnimeInfo } = require("../../modules/get-anime-details");
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { logger } = require("../../modules/logger");
 
 module.exports = {
   name: "searchanime",
@@ -16,7 +14,7 @@ module.exports = {
         embeds: [embedMessage("RED", "❌ You have to provide an anime name!")],
       });
     try {
-      const Anime = await getAnimeInfo(searchString);
+      const Anime = await client.apis.getAnimeInfo(searchString);
       const animeEmbed = {
         color: "#9dcc37",
         title: `${Anime.titlerom} AKA ${Anime.titleeng ?? `${Anime.titlerom}`}`,
@@ -72,11 +70,11 @@ module.exports = {
 
       return await message.channel.send({ embeds: [animeEmbed] });
     } catch (err) {
+      client.logger(err.message, "error");
+      console.error(err);
       return await message.channel.send({
         embeds: [embedMessage("RED", `❌ Could not find this Anime, Sry!`)],
       });
-      logger(err.message, "error");
-      console.error(err);
     }
   },
   data: new SlashCommandBuilder()
@@ -93,7 +91,7 @@ module.exports = {
     const animeName = interaction.options.getString("anime");
 
     try {
-      const Anime = await getAnimeInfo(animeName);
+      const Anime = await client.apis.getAnimeInfo(animeName);
       const animeEmbed = {
         color: "#9dcc37",
         title: `${Anime.titlerom} AKA ${Anime.titleeng ?? `${Anime.titlerom}`}`,
@@ -152,7 +150,7 @@ module.exports = {
       await interaction.followUp({
         embeds: [embedMessage("RED", `❌ Could not find this Anime, Sry!`)],
       });
-      logger(err.message, "error");
+      client.logger(err.message, "error");
       console.error(err);
     }
   },

diff --git a/commands/Anime/waifu.js b/commands/Anime/waifu.js
@@ -1,5 +1,4 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { requestAPI } = require("../../modules/requestAPI");
 
 module.exports = {
   name: "waifu",
@@ -8,7 +7,9 @@ module.exports = {
   usage: "waifu",
   async run(message, args, client) {
     try {
-      const waifu = await requestAPI("https://api.waifu.pics/sfw/waifu");
+      const waifu = await client.apis.request(
+        "https://api.waifu.pics/sfw/waifu"
+      );
       const waifuEmbed = {
         color: "#9dcc37",
         image: {
@@ -25,7 +26,9 @@ module.exports = {
       return await message.channel.send({ embeds: [waifuEmbed] });
     } catch (error) {
       client.logger(error.message, "error");
-      return await message.channel.send(`❌ | Couldn't retrieve a waifu pic, Sorry!`);
+      return await message.channel.send(
+        `❌ | Couldn't retrieve a waifu pic, Sorry!`
+      );
     }
   },
   data: new SlashCommandBuilder()
@@ -34,7 +37,9 @@ module.exports = {
   async execute(interaction, client) {
     await interaction.deferReply();
     try {
-      const waifu = await requestAPI("https://api.waifu.pics/sfw/waifu");
+      const waifu = await client.apis.request(
+        "https://api.waifu.pics/sfw/waifu"
+      );
       const waifuEmbed = {
         color: "#9dcc37",
         image: {
@@ -51,7 +56,9 @@ module.exports = {
       return await interaction.followUp({ embeds: [waifuEmbed] });
     } catch (error) {
       client.logger(error.message, "error");
-      return await interaction.followUp(`❌ | Couldn't retrieve a waifu pic, Sorry!`);
+      return await interaction.followUp(
+        `❌ | Couldn't retrieve a waifu pic, Sorry!`
+      );
     }
   },
 };
diff --git a/commands/Fun/gif.js b/commands/Fun/gif.js
@@ -1,6 +1,5 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { embedMessage } = require("../../modules/embedSimple");
-const { requestAPI } = require("../../modules/requestAPI");
 const { GiphyKey } = require("../../config.json");
 
 module.exports = {
@@ -22,7 +21,7 @@ module.exports = {
       });
 
     if (!query) {
-      const random = await requestAPI(
+      const random = await client.apis.request(
         `https://api.giphy.com/v1/gifs/random?api_key=${GiphyKey}`,
         {
           method: "GET",
@@ -118,7 +117,7 @@ module.exports = {
         ],
       });
     if (!query) {
-      const random = await requestAPI(
+      const random = await client.apis.request(
         `https://api.giphy.com/v1/gifs/random?api_key=${GiphyKey}`,
         {
           method: "GET",
@@ -145,7 +144,7 @@ module.exports = {
       return await interaction.followUp({ embeds: [randomEmbed] });
     }
 
-    const request = await requestAPI(
+    const request = await client.api.request(
       `https://api.giphy.com/v1/gifs/search?q=${query}&api_key=${GiphyKey}&limit=25`,
       {
         method: "GET",

diff --git a/commands/Fun/insult.js b/commands/Fun/insult.js
@@ -1,7 +1,6 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { embedMessage } = require("../../modules/embedSimple");
 const { getUserFromMention } = require("../../modules/getUserFromMention");
-const { requestAPI } = require("../../modules/requestAPI");
 
 module.exports = {
   name: "insult",
@@ -29,7 +28,7 @@ module.exports = {
       });
 
     try {
-      const insult = await requestAPI(
+      const insult = await client.apis.request(
         "https://evilinsult.com/generate_insult.php?lang=en&type=json"
       );
 
@@ -54,7 +53,7 @@ module.exports = {
     const user = interaction.options.getUser("user");
 
     try {
-      const insult = await requestAPI(
+      const insult = await client.apis.request(
         "https://evilinsult.com/generate_insult.php?lang=en&type=json"
       );
 

diff --git a/commands/Fun/jokes.js b/commands/Fun/jokes.js
@@ -1,5 +1,4 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { requestAPI } = require("../../modules/requestAPI");
 
 module.exports = {
   name: "joke",
@@ -8,7 +7,7 @@ module.exports = {
   description: "Gets a random joke!",
   async run(message, args, client) {
     try {
-      const joke = await requestAPI(
+      const joke = await client.apis.request(
         "https://v2.jokeapi.dev/joke/Miscellaneous,Dark,Pun,Spooky,Christmas"
       );
 
@@ -53,7 +52,7 @@ module.exports = {
     await interaction.deferReply();
 
     try {
-      const joke = await requestAPI(
+      const joke = await client.apis.request(
         "https://v2.jokeapi.dev/joke/Miscellaneous,Dark,Pun,Spooky,Christmas"
       );
 

diff --git a/commands/Misc/searchMovie.js b/commands/Misc/searchMovie.js
@@ -1,8 +1,6 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { TMDb } = require("../../config.json");
 const { embedMessage } = require("../../modules/embedSimple");
-const { getMovieID, getDetails } = require("../../modules/getMovieInfo");
-const { logger } = require("../../modules/logger");
 
 module.exports = {
   name: "searchmovie",
@@ -45,17 +43,17 @@ module.exports = {
         embeds: [embedMessage("#9dcc37", `You have to provide a Movie name!`)],
       });
     try {
-      let movie;
-      if (searchString[1]) {
-        const movieWithYear = await getMovieID(
-          searchString[0],
-          searchString[1]
-        );
-        movie = await getDetails(movieWithYear);
-      } else {
-        const withoutYear = await getMovieID(searchString[0]);
-        movie = await getDetails(withoutYear);
-      }
+      let movie = await client.api.getMovieDetails(searchString[0], TMDb);
+      // if (searchString[1]) {
+      //   const movieWithYear = await getMovieID(
+      //     searchString[0],
+      //     searchString[1]
+      //   );
+      //   movie = await getDetails(movieWithYear);
+      // } else {
+      //   const withoutYear = await getMovieID(searchString[0]);
+      //   movie = await getDetails(withoutYear);
+      // }
 
       const movieEmbed = {
         color: "#9dcc37",
@@ -121,7 +119,7 @@ module.exports = {
 
       return await message.channel.send({ embeds: [movieEmbed] });
     } catch (error) {
-      logger(error.message, "error");
+      client.logger(error.message, "error");
       console.error(error);
     }
   },
@@ -146,8 +144,7 @@ module.exports = {
       });
 
     try {
-      const movieID = await getMovieID(movieName);
-      const movie = await getDetails(movieID);
+      const movie = await client.apis.getMovieDetails(movieName, TMDb);
 
       const movieEmbed = {
         color: "#9dcc37",

diff --git a/commands/Music/lyrics.js b/commands/Music/lyrics.js
@@ -2,7 +2,6 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { embedMessage } = require("../../modules/embedSimple");
 const { getSong } = require("genius-lyrics-api");
 const { geniusApiKey } = require("../../config.json");
-const { chunkSubstr } = require("../../modules/chunkString");
 
 module.exports = {
   name: "lyrics",
@@ -85,7 +84,7 @@ module.exports = {
       };
 
       if (lyrics.lyrics.length > 4096) {
-        const chunkLyrics = chunkSubstr(lyrics.lyrics, 4096);
+        const chunkLyrics = client.tools.chunkSubstr(lyrics.lyrics, 4096);
         chunkLyrics.forEach(async (str) => {
           lyricsEmbed.description = str;
           return await message.channel.send({ embeds: [lyricsEmbed] });
@@ -189,7 +188,7 @@ module.exports = {
       };
 
       if (lyrics.lyrics.length > 4096) {
-        const chunkLyrics = chunkSubstr(lyrics.lyrics, 4096);
+        const chunkLyrics = client.tools.chunkSubstr(lyrics.lyrics, 4096);
         chunkLyrics.forEach(async (str) => {
           lyricsEmbed.description = str;
           return await interaction.followUp({ embeds: [lyricsEmbed] });

diff --git a/commands/Music/queue.js b/commands/Music/queue.js
@@ -1,5 +1,4 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { chunkSubstr } = require("../../modules/chunkString");
 const { embedMessage } = require("../../modules/embedSimple");
 
 module.exports = {
@@ -40,7 +39,7 @@ module.exports = {
     };
 
     if (tracks.join("\n").length > 4096) {
-      const chunked = chunkSubstr(tracks.join("\n"), 4096);
+      const chunked = client.tools.chunkSubstr(tracks.join("\n"), 4096);
       chunked.forEach(async (str) => {
         queueEmbed.description = str;
         return await message.channel.send({ embeds: [queueEmbed] });
@@ -81,7 +80,7 @@ module.exports = {
     };
 
     if (tracks.join("\n").length > 4096) {
-      const chunked = chunkSubstr(tracks.join("\n"), 4096);
+      const chunked = client.tools.chunkSubstr(tracks.join("\n"), 4096);
       chunked.forEach(async (str) => {
         queueEmbed.description = str;
         return await interaction.followUp({ embeds: [queueEmbed] });

diff --git a/events/error.js b/events/error.js
@@ -1,8 +1,8 @@
-const { logger } = require(".././modules/logger");
+const { Utils } = require("devtools-ts");
 
 module.exports = {
   name: "error",
   async execute(error) {
-    logger(error, "error");
+    new Utils().logger(error, "error");
   },
 };
diff --git a/modules/Music.js b/modules/Music.js
@@ -1,7 +1,6 @@
 const { embedMessage } = require("./embedSimple.js");
 const playdl = require("play-dl");
 const { QueryType } = require("discord-player");
-const { logger } = require("./logger.js");
 
 class Music {
   /**
@@ -147,7 +146,7 @@ class Music {
             });
         return;
       } catch (err) {
-        logger(err.message, "error");
+        client.logger(err.message, "error");
         console.log(err);
         await command.reply({
           embeds: [