Testersssszzszszszszsz 95% go brrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr…

…rrrrrrrr
Hypixel-API-Reborn · Sep 1, 2024 · 24a0bd1 · 24a0bd1
1 parent a3c2899
commit 24a0bd1
Show file tree

Hide file tree

Showing 41 changed files with 576 additions and 204 deletions.
diff --git a/src/API/getActiveHouses.test.ts b/src/API/getActiveHouses.test.ts
@@ -30,9 +30,9 @@ test('getActiveHouses', async () => {
     expect(house.owner).toBeDefined();
     expectTypeOf(house.owner).toEqualTypeOf<string>();
     expect(house.createdAtTimestamp).toBeDefined();
-    expectTypeOf(house.createdAtTimestamp).toEqualTypeOf<number>();
+    expectTypeOf(house.createdAtTimestamp).toEqualTypeOf<number | null>();
     expect(house.createdAt).toBeDefined();
-    expectTypeOf(house.createdAt).toEqualTypeOf<Date>();
+    expectTypeOf(house.createdAt).toEqualTypeOf<Date | null>();
     expect(house.players).toBeDefined();
     expectTypeOf(house.players).toEqualTypeOf<number>();
     expect(house.cookies).toBeDefined();

diff --git a/src/API/getLeaderboards.test.ts b/src/API/getLeaderboards.test.ts
@@ -23,16 +23,23 @@ test('getLeaderboards', async () => {
     expectTypeOf(data[key]).toEqualTypeOf<Leaderboard[]>();
     data[key].forEach((leaderboard: Leaderboard) => {
       expect(leaderboard).toBeDefined();
+      expect(leaderboard).instanceOf(Leaderboard);
       expectTypeOf(leaderboard).toEqualTypeOf<Leaderboard>();
-      expect(leaderboard.name).toBeDefined();
-      expectTypeOf(leaderboard.name).toEqualTypeOf<string | null>();
+
+      expect(leaderboard.path).toBeDefined();
+      expectTypeOf(leaderboard.path).toEqualTypeOf<string>();
+      expect(leaderboard.prefix).toBeDefined();
+      expectTypeOf(leaderboard.prefix).toEqualTypeOf<string>();
       expect(leaderboard.title).toBeDefined();
       expectTypeOf(leaderboard.title).toEqualTypeOf<string>();
-      expect(leaderboard.playerCount).toBeDefined();
-      expectTypeOf(leaderboard.playerCount).toEqualTypeOf<number>();
+      expect(leaderboard.location).toBeDefined();
+      expectTypeOf(leaderboard.location).toEqualTypeOf<string>();
+      expect(leaderboard.count).toBeDefined();
+      expect(leaderboard.count).toBeGreaterThanOrEqual(0);
+      expectTypeOf(leaderboard.count).toEqualTypeOf<number>();
       expect(leaderboard.leaders).toBeDefined();
       expectTypeOf(leaderboard.leaders).toEqualTypeOf<string[]>();
-      leaderboard.leaders.forEach((leader) => {
+      leaderboard.leaders.forEach((leader: string) => {
         expect(leader).toBeDefined();
         expectTypeOf(leader).toEqualTypeOf<string>();
       });

diff --git a/src/API/getLeaderboards.ts b/src/API/getLeaderboards.ts
@@ -1,5 +1,4 @@
 import Client from '../Client';
-import Constants from '../utils/Constants';
 import Endpoint from '../Private/Endpoint';
 import Leaderboard from '../structures/Leaderboard';
 import { RequestOptions } from '../Private/Requests';
@@ -11,19 +10,17 @@ class getLeaderboards extends Endpoint {
     this.client = client;
   }
 
-  async execute(options?: RequestOptions): Promise<any> {
+  async execute(options?: RequestOptions): Promise<Record<string, Leaderboard[]>> {
     const res = await this.client.requests.request('/leaderboards', options);
     if (res.options.raw) return res.data;
     if (!res.data.leaderboards) {
       throw new Error(this.client.errors.SOMETHING_WENT_WRONG.replace(/{cause}/, 'Try again.'));
     }
-    const lbnames = Object.create(Constants.leaderboardNames);
-    for (const name in lbnames) {
-      lbnames[name] = res.data.leaderboards[lbnames[name]].length
-        ? res.data.leaderboards[lbnames[name]].map((lb: any) => new Leaderboard(lb))
-        : [];
-    }
-    return lbnames;
+    const leaderboards: Record<string, Leaderboard[]> = {};
+    Object.keys(res.data.leaderboards).forEach((key) => {
+      leaderboards[key] = res.data.leaderboards[key].map((l: Record<string, any>) => new Leaderboard(l));
+    });
+    return leaderboards;
   }
 }
 

diff --git a/src/API/getPlayerHouses.test.ts b/src/API/getPlayerHouses.test.ts
@@ -38,9 +38,9 @@ test('getPlayerHouses', async () => {
     expect(house.owner).toBeDefined();
     expectTypeOf(house.owner).toEqualTypeOf<string>();
     expect(house.createdAtTimestamp).toBeDefined();
-    expectTypeOf(house.createdAtTimestamp).toEqualTypeOf<number>();
+    expectTypeOf(house.createdAtTimestamp).toEqualTypeOf<number | null>();
     expect(house.createdAt).toBeDefined();
-    expectTypeOf(house.createdAt).toEqualTypeOf<Date>();
+    expectTypeOf(house.createdAt).toEqualTypeOf<Date | null>();
     expect(house.players).toBeDefined();
     expectTypeOf(house.players).toEqualTypeOf<number>();
     expect(house.cookies).toBeDefined();

diff --git a/src/API/getRecentGames.test.ts b/src/API/getRecentGames.test.ts
@@ -33,21 +33,21 @@ test('getRecentGames', async () => {
     expectTypeOf(game).toEqualTypeOf<RecentGame>();
     expect(game).toBeInstanceOf(RecentGame);
     expect(game.game).toBeDefined();
-    expectTypeOf(game.game).toEqualTypeOf<Game>();
+    expectTypeOf(game.game).toEqualTypeOf<Game | null>();
     expect(game.dateTimestamp).toBeDefined();
     expectTypeOf(game.dateTimestamp).toEqualTypeOf<number | null>();
-    expect(game.date).toBeDefined();
-    expectTypeOf(game.date).toEqualTypeOf<Date | null>();
+    expect(game.dateAt).toBeDefined();
+    expectTypeOf(game.dateAt).toEqualTypeOf<Date | null>();
     expect(game.mode).toBeDefined();
     expectTypeOf(game.mode).toEqualTypeOf<string | null>();
     expect(game.map).toBeDefined();
     expectTypeOf(game.map).toEqualTypeOf<string | null>();
     expect(game.ongoing).toBeDefined();
     expectTypeOf(game.ongoing).toEqualTypeOf<boolean>();
-    expect(game.endedAt).toBeDefined();
-    expectTypeOf(game.endedAt).toEqualTypeOf<Date | null>();
     expect(game.endedTimestamp).toBeDefined();
     expectTypeOf(game.endedTimestamp).toEqualTypeOf<number | null>();
+    expect(game.endedAt).toBeDefined();
+    expectTypeOf(game.endedAt).toEqualTypeOf<Date | null>();
     expect(game.toString()).toBeDefined();
     expect(game.toString()).toEqual(game.mode);
     expectTypeOf(game.toString()).toEqualTypeOf<string | null>();

diff --git a/src/API/getSkyblockAuctions.test.ts b/src/API/getSkyblockAuctions.test.ts
@@ -266,7 +266,7 @@ test('getSkyblockAuctions (One Page Include Item Bytes)', async () => {
   client.destroy();
 });
 
-test('getSkyblockAuctions (All Pages)', async () => {
+test.skip('getSkyblockAuctions (All Pages)', async () => {
   const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-expect-error