diff options
author | mat <github@matdoes.dev> | 2021-05-31 00:01:06 -0500 |
---|---|---|
committer | mat <github@matdoes.dev> | 2021-05-31 00:01:06 -0500 |
commit | 5d6682ccc27b752902912cfe18a665662290d7fb (patch) | |
tree | bd2fced0617610dcfe85426ecbb8367f4495a62b | |
parent | 5541e5d3b99cbf5ed0436e89f0c4ccabf64e400a (diff) | |
download | skyblock-api-5d6682ccc27b752902912cfe18a665662290d7fb.tar.gz skyblock-api-5d6682ccc27b752902912cfe18a665662290d7fb.tar.bz2 skyblock-api-5d6682ccc27b752902912cfe18a665662290d7fb.zip |
removed fetching all the members in all of the leaderboards
-rw-r--r-- | build/database.js | 17 | ||||
-rw-r--r-- | build/index.js | 3 | ||||
-rw-r--r-- | src/database.ts | 15 | ||||
-rw-r--r-- | src/index.ts | 5 |
4 files changed, 4 insertions, 36 deletions
diff --git a/build/database.js b/build/database.js index 4ba2376..34727f9 100644 --- a/build/database.js +++ b/build/database.js @@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.updateAccount = exports.fetchAccountFromDiscord = exports.fetchAccount = exports.fetchSession = exports.createSession = exports.finishedCachingAllLeaderboards = exports.finishedCachingRawLeaderboards = exports.queueUpdateDatabaseProfile = exports.queueUpdateDatabaseMember = exports.updateDatabaseProfile = exports.updateDatabaseMember = exports.fetchMemberLeaderboardSpots = exports.fetchLeaderboard = exports.fetchProfileLeaderboard = exports.fetchMemberLeaderboard = exports.fetchAllMemberLeaderboardAttributes = exports.fetchSlayerLeaderboards = exports.fetchAllLeaderboardsCategorized = exports.cachedRawLeaderboards = void 0; +exports.updateAccount = exports.fetchAccountFromDiscord = exports.fetchAccount = exports.fetchSession = exports.createSession = exports.finishedCachingRawLeaderboards = exports.queueUpdateDatabaseProfile = exports.queueUpdateDatabaseMember = exports.updateDatabaseProfile = exports.updateDatabaseMember = exports.fetchMemberLeaderboardSpots = exports.fetchLeaderboard = exports.fetchProfileLeaderboard = exports.fetchMemberLeaderboard = exports.fetchAllMemberLeaderboardAttributes = exports.fetchSlayerLeaderboards = exports.fetchAllLeaderboardsCategorized = exports.cachedRawLeaderboards = void 0; const stats_1 = require("./cleaners/skyblock/stats"); const slayers_1 = require("./cleaners/skyblock/slayers"); const mongodb_1 = require("mongodb"); @@ -538,7 +538,6 @@ async function removeBadMemberLeaderboardAttributes() { } } exports.finishedCachingRawLeaderboards = false; -exports.finishedCachingAllLeaderboards = false; /** Fetch all the leaderboards, used for caching. Don't call this often! */ async function fetchAllLeaderboards(fast) { const leaderboards = await fetchAllMemberLeaderboardAttributes(); @@ -547,20 +546,6 @@ async function fetchAllLeaderboards(fast) { for (const leaderboard of util_1.shuffle(leaderboards)) await fetchMemberLeaderboardRaw(leaderboard); exports.finishedCachingRawLeaderboards = true; - // shuffle so if the application is restarting many times itll still be useful - if (_1.debug) - console.debug('Caching leaderboards!'); - for (const leaderboard of util_1.shuffle(leaderboards)) { - if (!fast) - // wait 2 seconds so it doesnt use as much ram - await util_1.sleep(2 * 1000); - else - await util_1.sleep(500); - await fetchMemberLeaderboard(leaderboard); - } - exports.finishedCachingAllLeaderboards = true; - if (_1.debug) - console.debug('Finished caching leaderboards!'); } async function createSession(refreshToken, userData) { const sessionId = uuid_1.v4(); diff --git a/build/index.js b/build/index.js index a799d2a..5f88c7e 100644 --- a/build/index.js +++ b/build/index.js @@ -56,8 +56,7 @@ app.get('/', async (req, res) => { res.json({ ok: true, uptimeHours: (currentTime - startTime) / 1000 / 60 / 60, - finishedCachingRawLeaderboards: database_1.finishedCachingRawLeaderboards, - finishedCachingAllLeaderboards: database_1.finishedCachingAllLeaderboards + finishedCachingRawLeaderboards: database_1.finishedCachingRawLeaderboards }); }); app.get('/player/:user', async (req, res) => { diff --git a/src/database.ts b/src/database.ts index 3cad5b5..9e74790 100644 --- a/src/database.ts +++ b/src/database.ts @@ -677,7 +677,6 @@ async function removeBadMemberLeaderboardAttributes(): Promise<void> { } export let finishedCachingRawLeaderboards = false -export let finishedCachingAllLeaderboards = false /** Fetch all the leaderboards, used for caching. Don't call this often! */ async function fetchAllLeaderboards(fast?: boolean): Promise<void> { @@ -688,20 +687,6 @@ async function fetchAllLeaderboards(fast?: boolean): Promise<void> { for (const leaderboard of shuffle(leaderboards)) await fetchMemberLeaderboardRaw(leaderboard) finishedCachingRawLeaderboards = true - - // shuffle so if the application is restarting many times itll still be useful - if (debug) console.debug('Caching leaderboards!') - for (const leaderboard of shuffle(leaderboards)) { - if (!fast) - // wait 2 seconds so it doesnt use as much ram - await sleep(2 * 1000) - else - await sleep(500) - - await fetchMemberLeaderboard(leaderboard) - } - finishedCachingAllLeaderboards = true - if (debug) console.debug('Finished caching leaderboards!') } export async function createSession(refreshToken: string, userData: discord.DiscordUser): Promise<string> { diff --git a/src/index.ts b/src/index.ts index 642e9b3..389a1fe 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import { createSession, fetchAccount, fetchAccountFromDiscord, fetchAllLeaderboardsCategorized, fetchLeaderboard, fetchMemberLeaderboardSpots, fetchSession, finishedCachingAllLeaderboards, finishedCachingRawLeaderboards, updateAccount } from './database' +import { createSession, fetchAccountFromDiscord, fetchAllLeaderboardsCategorized, fetchLeaderboard, fetchMemberLeaderboardSpots, fetchSession, finishedCachingRawLeaderboards, updateAccount } from './database' import { fetchMemberProfile, fetchUser } from './hypixel' import rateLimit from 'express-rate-limit' import * as constants from './constants' @@ -36,8 +36,7 @@ app.get('/', async(req, res) => { res.json({ ok: true, uptimeHours: (currentTime - startTime) / 1000 / 60 / 60, - finishedCachingRawLeaderboards, - finishedCachingAllLeaderboards + finishedCachingRawLeaderboards }) }) |