Removed api

Nick-NCSU · Sep 9, 2021 · f44bc22 · f44bc22
1 parent 1766ea3
commit f44bc22
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 182 deletions.
diff --git a/Limiter.js b/Limiter.js
@@ -60,9 +60,9 @@ class Limit {
             let self = this;
             // Repeats checking until there are enough points
             (function wait() {
-                if(self.getPoints() - num >= 0) { // If there is room to remove the points
-                    self.setPoints(self.getPoints() - num); // Remove the points
-                    setTimeout(() => self.addPoints(num), 65000); // Add the points back 65 seconds after
+                if(self.points - num >= 0) { // If there is room to remove the points
+                    self.points = self.points - num; // Remove the points
+                    setTimeout(() => self.addPoints(num), 70000); // Add the points back 65 seconds after
                     return resolve();
                 } else {
                     setTimeout(wait, 1000); // Else try again after 1 second
@@ -86,13 +86,5 @@ class Limit {
         }
         return this.points;
     }
-
-    /**
-     * Alias for removePoints(num)
-     * @param {*} num number of points to remove
-     */
-    removeTokens(num) {
-        return this.removePoints(num);
-    }
 }
 module.exports = Limit;
diff --git a/api/categories.js b/api/categories.js
diff --git a/api/examine.js b/api/examine.js
diff --git a/api/game-sub.js b/api/game-sub.js
diff --git a/api/game.js b/api/game.js
diff --git a/api/index.js b/api/index.js
diff --git a/api/leaderboard.js b/api/leaderboard.js
diff --git a/api/link.js b/api/link.js
diff --git a/api/new.js b/api/new.js
diff --git a/api/player.js b/api/player.js
diff --git a/api/search.js b/api/search.js
diff --git a/api/time.js b/api/time.js
diff --git a/api/user.js b/api/user.js
diff --git a/api/variables.js b/api/variables.js
diff --git a/api/wr.js b/api/wr.js
diff --git a/commands/categories.js b/commands/categories.js
@@ -1,6 +1,6 @@
 const { MessageEmbed } = require('discord.js');
 const { SlashCommandBuilder } = require('@discordjs/builders');
-const commands = require('../api');
+const tokens = require('../index.js')
 
 /**
  * Function to provide a list of categories for the given game
@@ -18,7 +18,7 @@ module.exports = {
         ),
 	async execute(interaction) {
         const game = interaction.options.get('game').value.toLowerCase();
-        const { data } = await commands.Categories.getCategories(game);
+        const { data } = await tokens.fetch(`https://www.speedrun.com/api/v1/games?abbreviation=${game}&embed=categories.variables`);
         // Checks if game exists
         if (!data.length) {
             return await interaction.editReply(`No results found for **${game}**.`);
@@ -30,6 +30,7 @@ module.exports = {
             .setURL(dataArr.weblink)
             .setThumbnail(dataArr.assets["cover-large"].uri)
         // Iterates through all the categories for the game
+        let size = 0;
         for (const category of dataArr.categories.data) {
             let variables = '';
             if (category.variables.data[0]) {
@@ -42,7 +43,13 @@ module.exports = {
             } else {
                 variables = 'None';
             }
-            embed.addField('**Category:** ' + category.name + '** - id:** ' + category.id, ' **Variables:** ' + variables + '\n');
+            const string = '**Category:** ' + category.name + '** - id:** ' + category.id
+            const string2 = ' **Variables:** ' + variables + '\n';
+            size += string.length + string2.length;
+            if(size > 6000) {
+                break;
+            }
+            embed.addField(string, string2);
         }
         return await interaction.editReply({ embeds: [embed] });
 	},

diff --git a/commands/leaderboard.js b/commands/leaderboard.js
@@ -1,6 +1,4 @@
-const commands = require('../api');
 const tokens = require('../index.js');
-const fetch = require('node-fetch');
 const { MessageEmbed } = require('discord.js');
 const { SlashCommandBuilder } = require('@discordjs/builders');
 
@@ -21,7 +19,7 @@ module.exports = {
         const game = interaction.options.get('game').value.toLowerCase();
 
         // Retrieves all subcategories for the full game and ILs
-        const {data} = await commands.NewLB.getSubcategories(game);
+        const {data} = await tokens.fetch(`https://www.speedrun.com/api/v1/games/${game}?embed=categories.variables,levels.variables`);
         // If nothing is returned
         if (!data) {
             return await interaction.editReply(`No results found for **${game}**.`);
@@ -123,7 +121,7 @@ module.exports = {
             let data2;
             // If category has no sub categories
             if(c[2].length == 0) {
-                await tokens.limit().removeTokens(1).then(data2 = await fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/category/${c[0]}?top=1&embed=players`).then(response => response.json()));
+                data2 = await tokens.fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/category/${c[0]}?top=1&embed=players`);
                 for(const run of data2.data.runs) {
                     b:
                     for(const player of run.run.players) {
@@ -157,7 +155,7 @@ module.exports = {
                     } else {
                         varString += `&var-${c[1][0]}=${o}`;
                     }
-                    await tokens.limit().removeTokens(1).then(data2 = await fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/category/${c[0]}?` + varString.substr(1) + '&top=1&embed=players').then(response => response.json()));
+                    data2 = await tokens.fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/category/${c[0]}?` + varString.substr(1) + '&top=1&embed=players');
                     if(!data2.data) {
                         console.log(`https://www.speedrun.com/api/v1/leaderboards/${game}/category/${c[0]}?` + varString.substr(1) + '&top=1&embed=players');
                         console.log(data2);
@@ -204,7 +202,7 @@ module.exports = {
         for(const c of sublevels) {
             let data3;
             if(c[1][2].length == 0) {
-                await tokens.limit().removeTokens(1).then(data3 = await fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/level/${c[0]}/${c[1][0]}?top=1&embed=players`).then(response => response.json()));
+                data3 = await tokens.fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/level/${c[0]}/${c[1][0]}?top=1&embed=players`);
                 for(const run of data3.data.runs) {
                     b:
                     for(const player of run.run.players) {
@@ -238,7 +236,7 @@ module.exports = {
                     } else {
                         varString += `&var-${c[1][1][0]}=${o}`;
                     }
-                    await tokens.limit().removeTokens(1).then(data3 = await fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/level/${c[0]}/${c[1][0]}?` + varString.substr(1) + '&top=1&embed=players').then(response => response.json()));
+                    data3 = await tokens.fetch(`https://www.speedrun.com/api/v1/leaderboards/${game}/level/${c[0]}/${c[1][0]}?` + varString.substr(1) + '&top=1&embed=players');
                     if(!data3.data) {
                         console.log(`https://www.speedrun.com/api/v1/leaderboards/${game}/level/${c[0]}/${c[1][0]}?` + varString.substr(1) + '&top=1&embed=players');
                         console.log(data3);

diff --git a/commands/link.js b/commands/link.js
@@ -1,6 +1,6 @@
-const commands = require('../api');
 const { MessageEmbed } = require('discord.js');
 const { SlashCommandBuilder } = require('@discordjs/builders');
+const tokens = require('../index.js')
 
 /**
  * Function to provide a link to the given game
@@ -16,7 +16,7 @@ module.exports = {
         ),
 	async execute(interaction) {
         const game = interaction.options.get('game').value.toLowerCase();
-        const {data} = await commands.Link.getLink(game);
+        const {data} = await tokens.fetch(`https://www.speedrun.com/api/v1/games?abbreviation=${game}`);
         [answer] = data;
         // Checks if game exists
         if (!answer || answer.length == 0) {

diff --git a/commands/search.js b/commands/search.js
@@ -1,6 +1,6 @@
-const commands = require('../api');
 const { MessageEmbed } = require('discord.js');
 const { SlashCommandBuilder } = require('@discordjs/builders');
+const tokens = require('../index.js')
 
 module.exports = {
     data: new SlashCommandBuilder()
@@ -23,7 +23,8 @@ module.exports = {
         } else {
             page = page.value;
         }
-        const { data } = await commands.Search.getSearch(search, page);
+        let offset = (page - 1) * 20;
+        const { data } = await tokens.fetch(`https://www.speedrun.com/api/v1/games?name=${search}&offset=${offset}`);
         if (!data.length) {
             return interaction.editReply(`No results found for **${search}**.`)
         }

diff --git a/commands/unverified.js b/commands/unverified.js
@@ -1,6 +1,6 @@
-const commands = require('../api');
 const { MessageEmbed } = require('discord.js');
 const { SlashCommandBuilder } = require('@discordjs/builders');
+const tokens = require('../index.js')
 
 /**
  * Function to provide a link to the given game
@@ -16,15 +16,15 @@ module.exports = {
         ),
 	async execute(interaction) {
         const game = interaction.options.get('game').value.toLowerCase();
-        const gameData = await commands.Game.getGame(game);
+        const gameData = await tokens.fetch(`https://www.speedrun.com/api/v1/games/${game}`);
         if(!gameData.data) {
             return await interaction.editReply('Game does not exist.');
         }
         const id = gameData.data.id;
-        let data = await commands.New.getUnexamine(id);
+        let data = await tokens.fetch(`https://www.speedrun.com/api/v1/runs?game=${id}&status=new&max=200&orderby=submitted&direction=asc`);
         const firstPage = data.data[0];
         while (data.pagination.size == 200){
-            data = await commands.New.getUnexamine(id, data.pagination.offset + 200);
+            data = await tokens.fetch(`https://www.speedrun.com/api/v1/runs?game=${id}&status=new&max=200&orderby=submitted&direction=asc&offset=${data.pagination.offset + 200}`);
         }
         const num = data.pagination.offset + data.pagination.size;
         const embed = new MessageEmbed()

diff --git a/commands/verified.js b/commands/verified.js
@@ -1,6 +1,6 @@
-const commands = require('../api');
 const { MessageEmbed } = require('discord.js');
 const { SlashCommandBuilder } = require('@discordjs/builders');
+const tokens = require('../index.js')
 
 /**
  * Returns the number of runs verified by the user
@@ -17,20 +17,20 @@ module.exports = {
 	async execute(interaction) {
         const user = interaction.options.get('user').value.toLowerCase();
         //Search for user on speedrun.com
-        const playerData = await commands.User.getUser(user);
+        const playerData = await tokens.fetch(`https://www.speedrun.com/api/v1/users/${user}`);
         //If player doesn't exist
         if(!playerData.data) {
             return await interaction.editReply('User does not exist.');
         }
         //Retrieve runs for game
         const id = playerData.data.id;
-        let data = await commands.Examine.getExamine(id);
+        let data = await tokens.fetch(`https://www.speedrun.com/api/v1/runs?examiner=${id}&max=200`);
         //While the pagination.size == 200 keep looping
-        while (data.size == 200 && data.offset != 9800){
-            data = await commands.Examine.getExamine(id, data.offset + 200);
+        while (data.pagination.size == 200 && data.pagination.offset != 9800){
+            data = await tokens.fetch(`https://www.speedrun.com/api/v1/runs?examiner=${id}&max=200&offset=${data.pagination.offset + 200}`);
         }
         //Number of runs = the total offset + the current size
-        const num = data.offset + data.size;
+        const num = data.pagination.offset + data.pagination.size;
         //Creates embed
         const embed = new MessageEmbed()
             .setColor('118855')