From 0b340ceb717209b3331aa07d034cf1db98f0bb6c Mon Sep 17 00:00:00 2001 From: Jacob Date: Thu, 22 Aug 2024 21:37:29 +0800 Subject: [PATCH 1/3] move --- src/API/index.ts | 24 +++++----- .../getAuction.test.ts} | 42 +++++++++--------- .../getAuction.ts} | 10 ++--- .../getAuctions.test.ts} | 44 +++++++++---------- .../getAuctions.ts} | 12 ++--- .../getAuctionsByPlayer.test.ts} | 32 +++++++------- .../getAuctionsByPlayer.ts} | 10 ++--- .../getBazaar.test.ts} | 14 +++--- .../getBazaar.ts} | 10 ++--- .../getBingo.test.ts} | 14 +++--- .../getBingo.ts} | 10 ++--- .../getFireSales.test.ts} | 12 ++--- .../getFireSales.ts} | 10 ++--- .../getGarden.test.ts} | 18 ++++---- .../getGarden.ts} | 10 ++--- .../getGovernment.test.ts} | 16 +++---- .../getGovernment.ts} | 10 ++--- .../getMember.test.ts} | 30 ++++++------- .../getMember.ts} | 10 ++--- .../getMuseum.test.ts} | 22 +++++----- .../getMuseum.ts} | 10 ++--- .../getNews.test.ts} | 12 ++--- .../getNews.ts} | 10 ++--- .../getProfiles.test.ts} | 30 ++++++------- .../getProfiles.ts} | 10 ++--- src/index.ts | 24 +++++----- src/typings/index.d.ts | 2 +- 27 files changed, 229 insertions(+), 229 deletions(-) rename src/API/{getSkyblockAuction.test.ts => skyblock/getAuction.test.ts} (90%) rename src/API/{getSkyblockAuction.ts => skyblock/getAuction.ts} (80%) rename src/API/{getSkyblockAuctions.test.ts => skyblock/getAuctions.test.ts} (92%) rename src/API/{getSkyblockAuctions.ts => skyblock/getAuctions.ts} (85%) rename src/API/{getSkyblockAuctionsByPlayer.test.ts => skyblock/getAuctionsByPlayer.test.ts} (88%) rename src/API/{getSkyblockAuctionsByPlayer.ts => skyblock/getAuctionsByPlayer.ts} (71%) rename src/API/{getSkyblockBazaar.test.ts => skyblock/getBazaar.test.ts} (84%) rename src/API/{getSkyblockBazaar.ts => skyblock/getBazaar.ts} (64%) rename src/API/{getSkyblockBingo.test.ts => skyblock/getBingo.test.ts} (79%) rename src/API/{getSkyblockBingo.ts => skyblock/getBingo.ts} (61%) rename src/API/{getSkyblockFireSales.test.ts => skyblock/getFireSales.test.ts} (83%) rename src/API/{getSkyblockFireSales.ts => skyblock/getFireSales.ts} (62%) rename src/API/{getSkyblockGarden.test.ts => skyblock/getGarden.test.ts} (75%) rename src/API/{getSkyblockGarden.ts => skyblock/getGarden.ts} (66%) rename src/API/{getSkyblockGovernment.test.ts => skyblock/getGovernment.test.ts} (85%) rename src/API/{getSkyblockGovernment.ts => skyblock/getGovernment.ts} (60%) rename src/API/{getSkyblockMember.test.ts => skyblock/getMember.test.ts} (91%) rename src/API/{getSkyblockMember.ts => skyblock/getMember.ts} (87%) rename src/API/{getSkyblockMuseum.test.ts => skyblock/getMuseum.test.ts} (80%) rename src/API/{getSkyblockMuseum.ts => skyblock/getMuseum.ts} (71%) rename src/API/{getSkyblockNews.test.ts => skyblock/getNews.test.ts} (81%) rename src/API/{getSkyblockNews.ts => skyblock/getNews.ts} (62%) rename src/API/{getSkyblockProfiles.test.ts => skyblock/getProfiles.test.ts} (83%) rename src/API/{getSkyblockProfiles.ts => skyblock/getProfiles.ts} (87%) diff --git a/src/API/index.ts b/src/API/index.ts index 71b302de..b114c23d 100644 --- a/src/API/index.ts +++ b/src/API/index.ts @@ -11,18 +11,18 @@ import getPlayer from './getPlayer'; import getPlayerHouses from './getPlayerHouses'; import getQuests from './getQuests'; import getRecentGames from './getRecentGames'; -import getSkyblockAuction from './getSkyblockAuction'; -import getSkyblockAuctions from './getSkyblockAuctions'; -import getSkyblockAuctionsByPlayer from './getSkyblockAuctionsByPlayer'; -import getSkyblockBazaar from './getSkyblockBazaar'; -import getSkyblockBingo from './getSkyblockBingo'; -import getSkyblockFireSales from './getSkyblockFireSales'; -import getSkyblockGarden from './getSkyblockGarden'; -import getSkyblockGovernment from './getSkyblockGovernment'; -import getSkyblockMember from './getSkyblockMember'; -import getSkyblockMuseum from './getSkyblockMuseum'; -import getSkyblockNews from './getSkyblockNews'; -import getSkyblockProfiles from './getSkyblockProfiles'; +import getSkyblockAuction from './skyblock/getAuction'; +import getSkyblockAuctions from './skyblock/getAuctions'; +import getSkyblockAuctionsByPlayer from './skyblock/getAuctionsByPlayer'; +import getSkyblockBazaar from './skyblock/getBazaar'; +import getSkyblockBingo from './skyblock/getBingo'; +import getSkyblockFireSales from './skyblock/getFireSales'; +import getSkyblockGarden from './skyblock/getGarden'; +import getSkyblockGovernment from './skyblock/getGovernment'; +import getSkyblockMember from './skyblock/getMember'; +import getSkyblockMuseum from './skyblock/getMuseum'; +import getSkyblockNews from './skyblock/getNews'; +import getSkyblockProfiles from './skyblock/getProfiles'; import getStatus from './getStatus'; import getWatchdogStats from './getWatchdogStats'; export default { diff --git a/src/API/getSkyblockAuction.test.ts b/src/API/skyblock/getAuction.test.ts similarity index 90% rename from src/API/getSkyblockAuction.test.ts rename to src/API/skyblock/getAuction.test.ts index 48aa5ae0..ad2b93b8 100644 --- a/src/API/getSkyblockAuction.test.ts +++ b/src/API/skyblock/getAuction.test.ts @@ -1,47 +1,47 @@ -import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { SkyblockRarity } from '../utils/SkyblockUtils'; -import Bid from '../structures/SkyBlock/Auctions/Bid'; +import Auction from '../../structures/SkyBlock/Auctions/Auction'; +import { SkyblockRarity } from '../../utils/SkyblockUtils'; +import Bid from '../../structures/SkyBlock/Auctions/Bid'; import { expect, expectTypeOf, test } from 'vitest'; -import ItemBytes from '../structures/ItemBytes'; -import Client from '../Client'; +import ItemBytes from '../../structures/ItemBytes'; +import Client from '../../Client'; -test('getSkyblockAuction (raw)', async () => { +test('Client#skyblock.Auction (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuction('player', auctions.auctions[0].auctioneerUuid, { raw: true }); + const data = await client.skyblock.getAuction('player', auctions.auctions[0].auctioneerUuid, { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockAuction (No Query)', () => { +test('Client#skyblock.Auction (No Query)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuction('player')).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); + expect(() => client.skyblock.getAuction('player')).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); client.destroy(); }); -test('getSkyblockAuction (Bad Filter)', () => { +test('Client#skyblock.Auction (Bad Filter)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuction('meow')).rejects.toThrowError(client.errors.BAD_AUCTION_FILTER); + expect(() => client.skyblock.getAuction('meow')).rejects.toThrowError(client.errors.BAD_AUCTION_FILTER); client.destroy(); }); -test('getSkyblockAuction (Auction)', async () => { +test('Client#skyblock.Auction (Auction)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuction('auction', auctions.auctions[0].auctioneerUuid); + const data = await client.skyblock.getAuction('auction', auctions.auctions[0].auctioneerUuid); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); @@ -120,14 +120,14 @@ test('getSkyblockAuction (Auction)', async () => { client.destroy(); }); -test('getSkyblockAuction (Player)', async () => { +test('Client#skyblock.Auction (Player)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuction('player', auctions.auctions[0].auctioneerUuid); + const data = await client.skyblock.getAuction('player', auctions.auctions[0].auctioneerUuid); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); @@ -206,14 +206,14 @@ test('getSkyblockAuction (Player)', async () => { client.destroy(); }); -test('getSkyblockAuction (Profile)', async () => { +test('Client#skyblock.Auction (Profile)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuction('profile', auctions.auctions[0].auctioneerProfile); + const data = await client.skyblock.getAuction('profile', auctions.auctions[0].auctioneerProfile); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockAuction.ts b/src/API/skyblock/getAuction.ts similarity index 80% rename from src/API/getSkyblockAuction.ts rename to src/API/skyblock/getAuction.ts index 91d88ba1..e0665888 100644 --- a/src/API/getSkyblockAuction.ts +++ b/src/API/skyblock/getAuction.ts @@ -1,9 +1,9 @@ -import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { AuctionRequestOptions } from './API'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import Auction from '../../structures/SkyBlock/Auctions/Auction'; +import { AuctionRequestOptions } from '../API'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockAction extends Endpoint { +class getAction extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockAuctions.test.ts b/src/API/skyblock/getAuctions.test.ts similarity index 92% rename from src/API/getSkyblockAuctions.test.ts rename to src/API/skyblock/getAuctions.test.ts index a67acfbe..4d690520 100644 --- a/src/API/getSkyblockAuctions.test.ts +++ b/src/API/skyblock/getAuctions.test.ts @@ -1,58 +1,58 @@ -import AuctionInfo from '../structures/SkyBlock/Auctions/AuctionInfo'; -import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { SkyblockRarity } from '../utils/SkyblockUtils'; -import Bid from '../structures/SkyBlock/Auctions/Bid'; +import AuctionInfo from '../../structures/SkyBlock/Auctions/AuctionInfo'; +import Auction from '../../structures/SkyBlock/Auctions/Auction'; +import { SkyblockRarity } from '../../utils/SkyblockUtils'; +import Bid from '../../structures/SkyBlock/Auctions/Bid'; import { expect, expectTypeOf, test } from 'vitest'; -import ItemBytes from '../structures/ItemBytes'; -import Client from '../Client'; +import ItemBytes from '../../structures/ItemBytes'; +import Client from '../../Client'; -test('getSkyblockAuctions (raw)', async () => { +test('Client#skyblock.Auctions (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctions(1, { raw: true }); + const data = await client.skyblock.getAuctions(1, { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockAuctions (No input)', () => { +test('Client#skyblock.Auctions (No input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuctions()).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); + expect(() => client.skyblock.getAuctions()).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); client.destroy(); }); -test('getSkyblockAuctions (Negative Input)', () => { +test('Client#skyblock.Auctions (Negative Input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuctions(-1)).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); + expect(() => client.skyblock.getAuctions(-1)).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); client.destroy(); }); -test('getSkyblockAuctions (Page 0)', () => { +test('Client#skyblock.Auctions (Page 0)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuctions(0)).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); + expect(() => client.skyblock.getAuctions(0)).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); client.destroy(); }); -test('getSkyblockAuctions (String Input)', () => { +test('Client#skyblock.Auctions (String Input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuctions('hi')).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); + expect(() => client.skyblock.getAuctions('hi')).rejects.toThrowError(client.errors.INVALID_OPTION_VALUE); client.destroy(); }); -test('getSkyblockAuctions (One Page)', async () => { +test('Client#skyblock.Auctions (One Page)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctions(1); + const data = await client.skyblock.getAuctions(1); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf<{ info: AuctionInfo; auctions: Auction[] }>(); expect(data.info).toBeDefined(); @@ -147,11 +147,11 @@ test('getSkyblockAuctions (One Page)', async () => { client.destroy(); }); -test('getSkyblockAuctions (One Page Include Item Bytes)', async () => { +test('Client#skyblock.Auctions (One Page Include Item Bytes)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctions(1, { includeItemBytes: true }); + const data = await client.skyblock.getAuctions(1, { includeItemBytes: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf<{ info: AuctionInfo; auctions: Auction[] }>(); expect(data.info).toBeDefined(); @@ -246,11 +246,11 @@ test('getSkyblockAuctions (One Page Include Item Bytes)', async () => { client.destroy(); }); -test('getSkyblockAuctions (All Pages)', async () => { +test('Client#skyblock.Auctions (All Pages)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctions('*'); + const data = await client.skyblock.getAuctions('*'); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf<{ info: AuctionInfo; auctions: Auction[] }>(); expect(data.info).toBeDefined(); diff --git a/src/API/getSkyblockAuctions.ts b/src/API/skyblock/getAuctions.ts similarity index 85% rename from src/API/getSkyblockAuctions.ts rename to src/API/skyblock/getAuctions.ts index fd2b3e3d..e31dff2c 100644 --- a/src/API/getSkyblockAuctions.ts +++ b/src/API/skyblock/getAuctions.ts @@ -1,10 +1,10 @@ -import AuctionInfo from '../structures/SkyBlock/Auctions/AuctionInfo'; -import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { AuctionRequestOptions } from './API'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import AuctionInfo from '../../structures/SkyBlock/Auctions/AuctionInfo'; +import Auction from '../../structures/SkyBlock/Auctions/Auction'; +import { AuctionRequestOptions } from '../API'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockAuctions extends Endpoint { +class getAuctions extends Endpoint { readonly client: Client; declare options: AuctionRequestOptions; constructor(client: Client) { diff --git a/src/API/getSkyblockAuctionsByPlayer.test.ts b/src/API/skyblock/getAuctionsByPlayer.test.ts similarity index 88% rename from src/API/getSkyblockAuctionsByPlayer.test.ts rename to src/API/skyblock/getAuctionsByPlayer.test.ts index 24515665..e80f18ce 100644 --- a/src/API/getSkyblockAuctionsByPlayer.test.ts +++ b/src/API/skyblock/getAuctionsByPlayer.test.ts @@ -1,39 +1,39 @@ -import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { SkyblockRarity } from '../utils/SkyblockUtils'; -import Bid from '../structures/SkyBlock/Auctions/Bid'; +import Auction from '../../structures/SkyBlock/Auctions/Auction'; +import { SkyblockRarity } from '../../utils/SkyblockUtils'; +import Bid from '../../structures/SkyBlock/Auctions/Bid'; import { expect, expectTypeOf, test } from 'vitest'; -import ItemBytes from '../structures/ItemBytes'; -import Client from '../Client'; +import ItemBytes from '../../structures/ItemBytes'; +import Client from '../../Client'; -test('getSkyblockAuctionsByPlayer (raw)', async () => { +test('Client#skyblock.AuctionsByPlayer (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctionsByPlayer(auctions.auctions[0].auctioneerUuid, { raw: true }); + const data = await client.skyblock.getAuctionsByPlayer(auctions.auctions[0].auctioneerUuid, { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockAuctionsByPlayer (No Input)', () => { +test('Client#skyblock.AuctionsByPlayer (No Input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockAuctionsByPlayer()).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); + expect(() => client.skyblock.getAuctionsByPlayer()).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); client.destroy(); }); -test('getSkyblockAuctionsByPlayer', async () => { +test('Client#skyblock.AuctionsByPlayer', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctionsByPlayer(auctions.auctions[0].auctioneerUuid); + const data = await client.skyblock.getAuctionsByPlayer(auctions.auctions[0].auctioneerUuid); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); @@ -136,14 +136,14 @@ test('getSkyblockAuctionsByPlayer', async () => { client.destroy(); }); -test('getSkyblockAuctionsByPlayer (Item Bytes)', async () => { +test('Client#skyblock.AuctionsByPlayer (Item Bytes)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const auctions = await client.getSkyblockAuctions(1); + const auctions = await client.skyblock.getAuctions(1); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockAuctionsByPlayer(auctions.auctions[0].auctioneerUuid, { + const data = await client.skyblock.getAuctionsByPlayer(auctions.auctions[0].auctioneerUuid, { includeItemBytes: true }); expect(data).toBeDefined(); diff --git a/src/API/getSkyblockAuctionsByPlayer.ts b/src/API/skyblock/getAuctionsByPlayer.ts similarity index 71% rename from src/API/getSkyblockAuctionsByPlayer.ts rename to src/API/skyblock/getAuctionsByPlayer.ts index 7f482a27..8ffd1a10 100644 --- a/src/API/getSkyblockAuctionsByPlayer.ts +++ b/src/API/skyblock/getAuctionsByPlayer.ts @@ -1,9 +1,9 @@ -import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { AuctionRequestOptions } from './API'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import Auction from '../../structures/SkyBlock/Auctions/Auction'; +import { AuctionRequestOptions } from '../API'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockActionsByPlayer extends Endpoint { +class getActionsByPlayer extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockBazaar.test.ts b/src/API/skyblock/getBazaar.test.ts similarity index 84% rename from src/API/getSkyblockBazaar.test.ts rename to src/API/skyblock/getBazaar.test.ts index 1aad4ff3..86738976 100644 --- a/src/API/getSkyblockBazaar.test.ts +++ b/src/API/skyblock/getBazaar.test.ts @@ -1,22 +1,22 @@ import { expect, expectTypeOf, test } from 'vitest'; -import Product from '../structures/SkyBlock/Bazzar/Product'; -import Order from '../structures/SkyBlock/Bazzar/Order'; -import Client from '../Client'; +import Product from '../../structures/SkyBlock/Bazzar/Product'; +import Order from '../../structures/SkyBlock/Bazzar/Order'; +import Client from '../../Client'; -test('getSkyblockBazarr (raw)', async () => { +test('Client#skyblock.Bazarr (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockBazaar({ raw: true }); + const data = await client.skyblock.getBazaar({ raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockBazarr', async () => { +test('Client#skyblock.Bazarr', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockBazaar(); + const data = await client.skyblock.getBazaar(); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); data.forEach((product: Product) => { diff --git a/src/API/getSkyblockBazaar.ts b/src/API/skyblock/getBazaar.ts similarity index 64% rename from src/API/getSkyblockBazaar.ts rename to src/API/skyblock/getBazaar.ts index cc2a8530..b1c00eb0 100644 --- a/src/API/getSkyblockBazaar.ts +++ b/src/API/skyblock/getBazaar.ts @@ -1,9 +1,9 @@ -import Product from '../structures/SkyBlock/Bazzar/Product'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import Product from '../../structures/SkyBlock/Bazzar/Product'; +import { RequestOptions } from '../../Private/Requests'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockBazaar extends Endpoint { +class getBazaar extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockBingo.test.ts b/src/API/skyblock/getBingo.test.ts similarity index 79% rename from src/API/getSkyblockBingo.test.ts rename to src/API/skyblock/getBingo.test.ts index cfdc96ec..02728838 100644 --- a/src/API/getSkyblockBingo.test.ts +++ b/src/API/skyblock/getBingo.test.ts @@ -1,23 +1,23 @@ -import BingoData from '../structures/SkyBlock/Static/BingoData'; -import Bingo from '../structures/SkyBlock/Static/Bingo'; +import BingoData from '../../structures/SkyBlock/Static/BingoData'; +import Bingo from '../../structures/SkyBlock/Static/Bingo'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockBingo (raw)', async () => { +test('Client#skyblock.Bingo (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockBingo({ raw: true }); + const data = await client.skyblock.getBingo({ raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockBingo', async () => { +test('Client#skyblock.Bingo', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockBingo(); + const data = await client.skyblock.getBingo(); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(BingoData); expect(data.lastUpdatedTimestamp).toBeDefined(); diff --git a/src/API/getSkyblockBingo.ts b/src/API/skyblock/getBingo.ts similarity index 61% rename from src/API/getSkyblockBingo.ts rename to src/API/skyblock/getBingo.ts index 887ff5d0..75a8fea5 100644 --- a/src/API/getSkyblockBingo.ts +++ b/src/API/skyblock/getBingo.ts @@ -1,9 +1,9 @@ -import BingoData from '../structures/SkyBlock/Static/BingoData'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import BingoData from '../../structures/SkyBlock/Static/BingoData'; +import { RequestOptions } from '../../Private/Requests'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockBingo extends Endpoint { +class getBingo extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockFireSales.test.ts b/src/API/skyblock/getFireSales.test.ts similarity index 83% rename from src/API/getSkyblockFireSales.test.ts rename to src/API/skyblock/getFireSales.test.ts index 54276f46..b0386bde 100644 --- a/src/API/getSkyblockFireSales.test.ts +++ b/src/API/skyblock/getFireSales.test.ts @@ -1,22 +1,22 @@ -import FireSale from '../structures/SkyBlock/Static/FireSale'; +import FireSale from '../../structures/SkyBlock/Static/FireSale'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockFireSales (raw)', async () => { +test('Client#skyblock.FireSales (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockFireSales({ raw: true }); + const data = await client.skyblock.getFireSales({ raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockFireSales', async () => { +test('Client#skyblock.FireSales', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockFireSales(); + const data = await client.skyblock.getFireSales(); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); data.forEach((firesale: FireSale) => { diff --git a/src/API/getSkyblockFireSales.ts b/src/API/skyblock/getFireSales.ts similarity index 62% rename from src/API/getSkyblockFireSales.ts rename to src/API/skyblock/getFireSales.ts index d7de84d3..e9e98315 100644 --- a/src/API/getSkyblockFireSales.ts +++ b/src/API/skyblock/getFireSales.ts @@ -1,9 +1,9 @@ -import FireSale from '../structures/SkyBlock/Static/FireSale'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import FireSale from '../../structures/SkyBlock/Static/FireSale'; +import { RequestOptions } from '../../Private/Requests'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockFireSales extends Endpoint { +class getFireSales extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockGarden.test.ts b/src/API/skyblock/getGarden.test.ts similarity index 75% rename from src/API/getSkyblockGarden.test.ts rename to src/API/skyblock/getGarden.test.ts index 1b64e206..40d37b9d 100644 --- a/src/API/getSkyblockGarden.test.ts +++ b/src/API/skyblock/getGarden.test.ts @@ -3,34 +3,34 @@ import SkyblockGarden, { SkyblockGardenComposter, SkyblockGardenVisitor, SkyblockGarenCrops -} from '../structures/SkyBlock/SkyblockGarden'; -import { SkyblockSkillLevel } from '../utils/SkyblockUtils'; +} from '../../structures/SkyBlock/SkyblockGarden'; +import { SkyblockSkillLevel } from '../../utils/SkyblockUtils'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockGarden (no input)', () => { +test('Client#skyblock.Garden (no input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockGarden()).rejects.toThrowError(client.errors.NO_UUID); + expect(() => client.skyblock.getGarden()).rejects.toThrowError(client.errors.NO_UUID); client.destroy(); }); -test('getSkyblockGarden (raw)', async () => { +test('Client#skyblock.Garden (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockGarden('805c9751-0ff1-4cb6-8e9c-1067bf3bc601', { raw: true }); + const data = await client.skyblock.getGarden('805c9751-0ff1-4cb6-8e9c-1067bf3bc601', { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockGarden', async () => { +test('Client#skyblock.Garden', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockGarden('805c9751-0ff1-4cb6-8e9c-1067bf3bc601'); + const data = await client.skyblock.getGarden('805c9751-0ff1-4cb6-8e9c-1067bf3bc601'); expect(data).toBeDefined(); expect(data).toBeInstanceOf(SkyblockGarden); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockGarden.ts b/src/API/skyblock/getGarden.ts similarity index 66% rename from src/API/getSkyblockGarden.ts rename to src/API/skyblock/getGarden.ts index cba1b0d7..43df1b50 100644 --- a/src/API/getSkyblockGarden.ts +++ b/src/API/skyblock/getGarden.ts @@ -1,9 +1,9 @@ -import SkyblockGarden from '../structures/SkyBlock/SkyblockGarden'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import SkyblockGarden from '../../structures/SkyBlock/SkyblockGarden'; +import { RequestOptions } from '../../Private/Requests'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockGarden extends Endpoint { +class getGarden extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockGovernment.test.ts b/src/API/skyblock/getGovernment.test.ts similarity index 85% rename from src/API/getSkyblockGovernment.test.ts rename to src/API/skyblock/getGovernment.test.ts index f6ff9d2d..783f4f8d 100644 --- a/src/API/getSkyblockGovernment.test.ts +++ b/src/API/skyblock/getGovernment.test.ts @@ -1,24 +1,24 @@ -import GovernmentData from '../structures/SkyBlock/Static/Government'; -import Candidate from '../structures/SkyBlock/Static/Candidate'; -import Perk from '../structures/SkyBlock/Static/Perk'; +import GovernmentData from '../../structures/SkyBlock/Static/Government'; +import Candidate from '../../structures/SkyBlock/Static/Candidate'; +import Perk from '../../structures/SkyBlock/Static/Perk'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockGovernment (raw)', async () => { +test('Client#skyblock.Government (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockGovernment({ raw: true }); + const data = await client.skyblock.getGovernment({ raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockGovernment', async () => { +test('Client#skyblock.Government', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockGovernment(); + const data = await client.skyblock.getGovernment(); expect(data).toBeDefined(); expect(data).toBeInstanceOf(GovernmentData); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockGovernment.ts b/src/API/skyblock/getGovernment.ts similarity index 60% rename from src/API/getSkyblockGovernment.ts rename to src/API/skyblock/getGovernment.ts index 997114a8..a71e3784 100644 --- a/src/API/getSkyblockGovernment.ts +++ b/src/API/skyblock/getGovernment.ts @@ -1,9 +1,9 @@ -import GovernmentData from '../structures/SkyBlock/Static/Government.js'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint.js'; -import Client from '../Client.js'; +import GovernmentData from '../../structures/SkyBlock/Static/Government.js'; +import { RequestOptions } from '../../Private/Requests.js'; +import Endpoint from '../../Private/Endpoint.js'; +import Client from '../../Client.js'; -class getSkyblockGovernment extends Endpoint { +class getGovernment extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockMember.test.ts b/src/API/skyblock/getMember.test.ts similarity index 91% rename from src/API/getSkyblockMember.test.ts rename to src/API/skyblock/getMember.test.ts index d2e9f40c..babe52dc 100644 --- a/src/API/getSkyblockMember.test.ts +++ b/src/API/skyblock/getMember.test.ts @@ -8,49 +8,49 @@ import { SkyblockMemberStats, SkyblockSkillLevel, SkyblockRarity -} from '../utils/SkyblockUtils'; -import SkyblockMember, { SkyblockMemberArmor, SkyblockMemberEquipment } from '../structures/SkyBlock/SkyblockMember'; -import SkyblockInventoryItem, { SkyblockGemstone } from '../structures/SkyBlock/SkyblockInventoryItem'; -import SkyblockGarden from '../structures/SkyBlock/SkyblockGarden'; -import SkyblockMuseum from '../structures/SkyBlock/SkyblockMuseum'; -import SkyblockPet from '../structures/SkyBlock/SkyblockPet'; +} from '../../utils/SkyblockUtils'; +import SkyblockMember, { SkyblockMemberArmor, SkyblockMemberEquipment } from '../../structures/SkyBlock/SkyblockMember'; +import SkyblockInventoryItem, { SkyblockGemstone } from '../../structures/SkyBlock/SkyblockInventoryItem'; +import SkyblockGarden from '../../structures/SkyBlock/SkyblockGarden'; +import SkyblockMuseum from '../../structures/SkyBlock/SkyblockMuseum'; +import SkyblockPet from '../../structures/SkyBlock/SkyblockPet'; import { NetworthResult } from 'skyhelper-networth'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockMember (raw)', async () => { +test('Client#skyblock.Member (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockMember('14727faefbdc4aff848cd2713eb9939e', { raw: true }); + const data = await client.skyblock.getMember('14727faefbdc4aff848cd2713eb9939e', { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockMember (no input)', () => { +test('Client#skyblock.Member (no input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockMember()).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); + expect(() => client.skyblock.getMember()).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); client.destroy(); }); -test('getSkyblockMember (no profiles)', () => { +test('Client#skyblock.Member (no profiles)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockMember('b45add7b081443909fb00aa9a3e15eb0')).rejects.toThrowError( + expect(() => client.skyblock.getMember('b45add7b081443909fb00aa9a3e15eb0')).rejects.toThrowError( client.errors.NO_SKYBLOCK_PROFILES ); client.destroy(); }); -test('getSkyblockMember', async () => { +test('Client#skyblock.Member', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockMember('14727faefbdc4aff848cd2713eb9939e'); + const data = await client.skyblock.getMember('14727faefbdc4aff848cd2713eb9939e'); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockMember.ts b/src/API/skyblock/getMember.ts similarity index 87% rename from src/API/getSkyblockMember.ts rename to src/API/skyblock/getMember.ts index df38001c..ef29dc3b 100644 --- a/src/API/getSkyblockMember.ts +++ b/src/API/skyblock/getMember.ts @@ -1,9 +1,9 @@ -import SkyblockMember from '../structures/SkyBlock/SkyblockMember'; -import { SkyblockRequestOptions } from './API'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import SkyblockMember from '../../structures/SkyBlock/SkyblockMember'; +import { SkyblockRequestOptions } from '../API'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockMember extends Endpoint { +class getMember extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockMuseum.test.ts b/src/API/skyblock/getMuseum.test.ts similarity index 80% rename from src/API/getSkyblockMuseum.test.ts rename to src/API/skyblock/getMuseum.test.ts index 0ec329bc..eec35368 100644 --- a/src/API/getSkyblockMuseum.test.ts +++ b/src/API/skyblock/getMuseum.test.ts @@ -1,33 +1,33 @@ -import SkyblockInventoryItem from '../structures/SkyBlock/SkyblockInventoryItem'; -import SkyblockMuseumItem from '../structures/SkyBlock/SkyblockMuseumItem'; -import SkyblockProfile from '../structures/SkyBlock/SkyblockProfile'; -import SkyblockMuseum from '../structures/SkyBlock/SkyblockMuseum'; +import SkyblockInventoryItem from '../../structures/SkyBlock/SkyblockInventoryItem'; +import SkyblockMuseumItem from '../../structures/SkyBlock/SkyblockMuseumItem'; +import SkyblockProfile from '../../structures/SkyBlock/SkyblockProfile'; +import SkyblockMuseum from '../../structures/SkyBlock/SkyblockMuseum'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockMuseum (raw)', async () => { +test('Client#skyblock.Museum (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const profiles = await client.getSkyblockProfiles('Skreewy'); + const profiles = await client.skyblock.getProfiles('Skreewy'); const profile = profiles.find((profile: SkyblockProfile) => true === profile.selected); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockMuseum('Skreewy', profile.profileId, { raw: true }); + const data = await client.skyblock.getMuseum('Skreewy', profile.profileId, { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockMuseum', async () => { +test('Client#skyblock.Museum', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const profiles = await client.getSkyblockProfiles('Skreewy'); + const profiles = await client.skyblock.getProfiles('Skreewy'); const profile = profiles.find((profile: SkyblockProfile) => true === profile.selected); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockMuseum('Skreewy', profile.profileId); + const data = await client.skyblock.getMuseum('Skreewy', profile.profileId); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockMuseum.ts b/src/API/skyblock/getMuseum.ts similarity index 71% rename from src/API/getSkyblockMuseum.ts rename to src/API/skyblock/getMuseum.ts index e3af11a4..535409db 100644 --- a/src/API/getSkyblockMuseum.ts +++ b/src/API/skyblock/getMuseum.ts @@ -1,9 +1,9 @@ -import SkyblockMuseum from '../structures/SkyBlock/SkyblockMuseum'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import SkyblockMuseum from '../../structures/SkyBlock/SkyblockMuseum'; +import { RequestOptions } from '../../Private/Requests'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockMuseum extends Endpoint { +class getMuseum extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockNews.test.ts b/src/API/skyblock/getNews.test.ts similarity index 81% rename from src/API/getSkyblockNews.test.ts rename to src/API/skyblock/getNews.test.ts index a57db120..528ae3e4 100644 --- a/src/API/getSkyblockNews.test.ts +++ b/src/API/skyblock/getNews.test.ts @@ -1,22 +1,22 @@ -import SkyblockNews from '../structures/SkyBlock/News/SkyblockNews'; +import SkyblockNews from '../../structures/SkyBlock/News/SkyblockNews'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockNews (raw)', async () => { +test('Client#skyblock.News (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockNews({ raw: true }); + const data = await client.skyblock.getNews({ raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockNews', async () => { +test('Client#skyblock.News', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockNews(); + const data = await client.skyblock.getNews(); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockNews.ts b/src/API/skyblock/getNews.ts similarity index 62% rename from src/API/getSkyblockNews.ts rename to src/API/skyblock/getNews.ts index cc1e8085..b394fd9d 100644 --- a/src/API/getSkyblockNews.ts +++ b/src/API/skyblock/getNews.ts @@ -1,9 +1,9 @@ -import SkyblockNews from '../structures/SkyBlock/News/SkyblockNews'; -import { RequestOptions } from '../Private/Requests'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import SkyblockNews from '../../structures/SkyBlock/News/SkyblockNews'; +import { RequestOptions } from '../../Private/Requests'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockNews extends Endpoint { +class getNews extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/API/getSkyblockProfiles.test.ts b/src/API/skyblock/getProfiles.test.ts similarity index 83% rename from src/API/getSkyblockProfiles.test.ts rename to src/API/skyblock/getProfiles.test.ts index 2534cca6..ea78736c 100644 --- a/src/API/getSkyblockProfiles.test.ts +++ b/src/API/skyblock/getProfiles.test.ts @@ -1,41 +1,41 @@ -import SkyblockProfile from '../structures/SkyBlock/SkyblockProfile'; -import SkyblockMember from '../structures/SkyBlock/SkyblockMember'; +import SkyblockProfile from '../../structures/SkyBlock/SkyblockProfile'; +import SkyblockMember from '../../structures/SkyBlock/SkyblockMember'; import { expect, expectTypeOf, test } from 'vitest'; -import Client from '../Client'; +import Client from '../../Client'; -test('getSkyblockProfiles (raw)', async () => { +test('Client#skyblock.Profiles (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockProfiles('14727faefbdc4aff848cd2713eb9939e', { raw: true }); + const data = await client.skyblock.getProfiles('14727faefbdc4aff848cd2713eb9939e', { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); client.destroy(); }); -test('getSkyblockProfiles (no input)', () => { +test('Client#skyblock.Profiles (no input)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockProfiles()).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); + expect(() => client.skyblock.getProfiles()).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); client.destroy(); }); -test('getSkyblockProfiles (no profiles)', () => { +test('Client#skyblock.Profiles (no profiles)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - expect(() => client.getSkyblockProfiles('b45add7b081443909fb00aa9a3e15eb0')).rejects.toThrowError( + expect(() => client.skyblock.getProfiles('b45add7b081443909fb00aa9a3e15eb0')).rejects.toThrowError( client.errors.NO_SKYBLOCK_PROFILES ); client.destroy(); }); -test('getSkyblockProfiles', async () => { +test('Client#skyblock.Profiles', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockProfiles('14727faefbdc4aff848cd2713eb9939e'); + const data = await client.skyblock.getProfiles('14727faefbdc4aff848cd2713eb9939e'); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); @@ -75,11 +75,11 @@ test('getSkyblockProfiles', async () => { client.destroy(); }); -test('getSkyblockProfiles (garden)', async () => { +test('Client#skyblock.Profiles (garden)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockProfiles('kathund', { garden: true }); + const data = await client.skyblock.getProfiles('kathund', { garden: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); @@ -119,11 +119,11 @@ test('getSkyblockProfiles (garden)', async () => { client.destroy(); }); -test('getSkyblockProfiles (museum)', async () => { +test('Client#skyblock.Profiles (museum)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error - const data = await client.getSkyblockProfiles('14727faefbdc4aff848cd2713eb9939e', { museum: true }); + const data = await client.skyblock.getProfiles('14727faefbdc4aff848cd2713eb9939e', { museum: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/getSkyblockProfiles.ts b/src/API/skyblock/getProfiles.ts similarity index 87% rename from src/API/getSkyblockProfiles.ts rename to src/API/skyblock/getProfiles.ts index 8a86bab0..601fa345 100644 --- a/src/API/getSkyblockProfiles.ts +++ b/src/API/skyblock/getProfiles.ts @@ -1,9 +1,9 @@ -import SkyblockProfile from '../structures/SkyBlock/SkyblockProfile'; -import { SkyblockRequestOptions } from './API'; -import Endpoint from '../Private/Endpoint'; -import Client from '../Client'; +import SkyblockProfile from '../../structures/SkyBlock/SkyblockProfile'; +import { SkyblockRequestOptions } from '../API'; +import Endpoint from '../../Private/Endpoint'; +import Client from '../../Client'; -class getSkyblockProfiles extends Endpoint { +class getProfiles extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); diff --git a/src/index.ts b/src/index.ts index 3a535159..38bab421 100644 --- a/src/index.ts +++ b/src/index.ts @@ -17,17 +17,17 @@ export * from './API/getPlayer'; export * from './API/getPlayerHouses'; export * from './API/getQuests'; export * from './API/getRecentGames'; -export * from './API/getSkyblockAuction'; -export * from './API/getSkyblockAuctions'; -export * from './API/getSkyblockAuctionsByPlayer'; -export * from './API/getSkyblockBazaar'; -export * from './API/getSkyblockBingo'; -export * from './API/getSkyblockFireSales'; -export * from './API/getSkyblockGarden'; -export * from './API/getSkyblockGovernment'; -export * from './API/getSkyblockMember'; -export * from './API/getSkyblockMuseum'; -export * from './API/getSkyblockNews'; -export * from './API/getSkyblockProfiles'; +export * from './API/skyblock/getAuction'; +export * from './API/skyblock/getAuctions'; +export * from './API/skyblock/getAuctionsByPlayer'; +export * from './API/skyblock/getBazaar'; +export * from './API/skyblock/getBingo'; +export * from './API/skyblock/getFireSales'; +export * from './API/skyblock/getGarden'; +export * from './API/skyblock/getGovernment'; +export * from './API/skyblock/getMember'; +export * from './API/skyblock/getMuseum'; +export * from './API/skyblock/getNews'; +export * from './API/skyblock/getProfiles'; export * from './API/getStatus'; export * from './API/getWatchdogStats'; diff --git a/src/typings/index.d.ts b/src/typings/index.d.ts index e9f4edff..80d41921 100644 --- a/src/typings/index.d.ts +++ b/src/typings/index.d.ts @@ -15,7 +15,7 @@ import Quests from '../structures/Static/Quests'; import RecentGame from '../structures/RecentGame'; import { AuctionRequestOptions, SkyblockRequestOptions } from '../API/API'; import Auction from '../structures/SkyBlock/Auctions/Auction'; -import { getSkyblockAuctionsOptions } from '../API/getSkyblockAuctions'; +import { getSkyblockAuctionsOptions } from '../API/skyblock/getAuctions'; import AuctionInfo from '../structures/SkyBlock/Auctions/AuctionInfo'; import Product from '../structures/SkyBlock/Bazzar/Product'; import BingoData from '../structures/SkyBlock/Static/BingoData'; From 345fb0c75824c157066d9c16fd22d748ab61b83e Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 23 Aug 2024 09:18:41 +0800 Subject: [PATCH 2/3] Skyblock Into section --- src/API/index.ts | 26 +----------------------- src/API/skyblock/getAuction.ts | 4 ++-- src/API/skyblock/getAuctions.ts | 2 +- src/API/skyblock/getAuctionsByPlayer.ts | 4 ++-- src/API/skyblock/getBazaar.ts | 2 +- src/API/skyblock/getBingo.ts | 2 +- src/API/skyblock/getFireSales.ts | 2 +- src/API/skyblock/getGarden.ts | 2 +- src/API/skyblock/getGovernment.ts | 2 +- src/API/skyblock/getMember.ts | 10 +++------ src/API/skyblock/getMuseum.ts | 2 +- src/API/skyblock/getNews.ts | 2 +- src/API/skyblock/getProfiles.ts | 10 +++------ src/API/skyblock/index.ts | 27 +++++++++++++++++++++++++ src/Client.ts | 11 +++++++++- src/Errors.ts | 4 ++-- 16 files changed, 58 insertions(+), 54 deletions(-) create mode 100644 src/API/skyblock/index.ts diff --git a/src/API/index.ts b/src/API/index.ts index b114c23d..0a77f604 100644 --- a/src/API/index.ts +++ b/src/API/index.ts @@ -11,18 +11,6 @@ import getPlayer from './getPlayer'; import getPlayerHouses from './getPlayerHouses'; import getQuests from './getQuests'; import getRecentGames from './getRecentGames'; -import getSkyblockAuction from './skyblock/getAuction'; -import getSkyblockAuctions from './skyblock/getAuctions'; -import getSkyblockAuctionsByPlayer from './skyblock/getAuctionsByPlayer'; -import getSkyblockBazaar from './skyblock/getBazaar'; -import getSkyblockBingo from './skyblock/getBingo'; -import getSkyblockFireSales from './skyblock/getFireSales'; -import getSkyblockGarden from './skyblock/getGarden'; -import getSkyblockGovernment from './skyblock/getGovernment'; -import getSkyblockMember from './skyblock/getMember'; -import getSkyblockMuseum from './skyblock/getMuseum'; -import getSkyblockNews from './skyblock/getNews'; -import getSkyblockProfiles from './skyblock/getProfiles'; import getStatus from './getStatus'; import getWatchdogStats from './getWatchdogStats'; export default { @@ -39,18 +27,6 @@ export default { getPlayerHouses, getQuests, getRecentGames, - getSkyblockAuction, - getSkyblockAuctions, - getSkyblockAuctionsByPlayer, - getSkyblockBazaar, - getSkyblockBingo, - getSkyblockFireSales, - getSkyblockGarden, - getSkyblockGovernment, - getSkyblockMember, - getSkyblockMuseum, - getSkyblockNews, - getSkyblockProfiles, getStatus, getWatchdogStats -}; +}; \ No newline at end of file diff --git a/src/API/skyblock/getAuction.ts b/src/API/skyblock/getAuction.ts index e0665888..755ea054 100644 --- a/src/API/skyblock/getAuction.ts +++ b/src/API/skyblock/getAuction.ts @@ -3,7 +3,7 @@ import { AuctionRequestOptions } from '../API'; import Endpoint from '../../Private/Endpoint'; import Client from '../../Client'; -class getAction extends Endpoint { +class getAuction extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); @@ -33,4 +33,4 @@ class getAction extends Endpoint { } } -export default getSkyblockAction; +export default getAuction; \ No newline at end of file diff --git a/src/API/skyblock/getAuctions.ts b/src/API/skyblock/getAuctions.ts index e31dff2c..1f5bce2a 100644 --- a/src/API/skyblock/getAuctions.ts +++ b/src/API/skyblock/getAuctions.ts @@ -56,4 +56,4 @@ class getAuctions extends Endpoint { } } -export default getSkyblockAuctions; +export default getAuctions; \ No newline at end of file diff --git a/src/API/skyblock/getAuctionsByPlayer.ts b/src/API/skyblock/getAuctionsByPlayer.ts index 8ffd1a10..a7798164 100644 --- a/src/API/skyblock/getAuctionsByPlayer.ts +++ b/src/API/skyblock/getAuctionsByPlayer.ts @@ -3,7 +3,7 @@ import { AuctionRequestOptions } from '../API'; import Endpoint from '../../Private/Endpoint'; import Client from '../../Client'; -class getActionsByPlayer extends Endpoint { +class getAuctionsByPlayer extends Endpoint { readonly client: Client; constructor(client: Client) { super(client); @@ -19,4 +19,4 @@ class getActionsByPlayer extends Endpoint { } } -export default getSkyblockActionsByPlayer; +export default getAuctionsByPlayer; \ No newline at end of file diff --git a/src/API/skyblock/getBazaar.ts b/src/API/skyblock/getBazaar.ts index b1c00eb0..1398a0ed 100644 --- a/src/API/skyblock/getBazaar.ts +++ b/src/API/skyblock/getBazaar.ts @@ -17,4 +17,4 @@ class getBazaar extends Endpoint { } } -export default getSkyblockBazaar; +export default getBazaar; \ No newline at end of file diff --git a/src/API/skyblock/getBingo.ts b/src/API/skyblock/getBingo.ts index 75a8fea5..6f88801d 100644 --- a/src/API/skyblock/getBingo.ts +++ b/src/API/skyblock/getBingo.ts @@ -17,4 +17,4 @@ class getBingo extends Endpoint { } } -export default getSkyblockBingo; +export default getBingo; \ No newline at end of file diff --git a/src/API/skyblock/getFireSales.ts b/src/API/skyblock/getFireSales.ts index e9e98315..75ea2d6c 100644 --- a/src/API/skyblock/getFireSales.ts +++ b/src/API/skyblock/getFireSales.ts @@ -17,4 +17,4 @@ class getFireSales extends Endpoint { } } -export default getSkyblockFireSales; +export default getFireSales; \ No newline at end of file diff --git a/src/API/skyblock/getGarden.ts b/src/API/skyblock/getGarden.ts index 43df1b50..be070f91 100644 --- a/src/API/skyblock/getGarden.ts +++ b/src/API/skyblock/getGarden.ts @@ -18,4 +18,4 @@ class getGarden extends Endpoint { } } -export default getSkyblockGarden; +export default getGarden; \ No newline at end of file diff --git a/src/API/skyblock/getGovernment.ts b/src/API/skyblock/getGovernment.ts index a71e3784..0c0bc518 100644 --- a/src/API/skyblock/getGovernment.ts +++ b/src/API/skyblock/getGovernment.ts @@ -17,4 +17,4 @@ class getGovernment extends Endpoint { } } -export default getSkyblockGovernment; +export default getGovernment; \ No newline at end of file diff --git a/src/API/skyblock/getMember.ts b/src/API/skyblock/getMember.ts index ef29dc3b..20323413 100644 --- a/src/API/skyblock/getMember.ts +++ b/src/API/skyblock/getMember.ts @@ -23,12 +23,8 @@ class getMember extends Endpoint { new SkyblockMember({ uuid: query, profileId: profile.profile_id, - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error - garden: options?.garden ? await this.client.getSkyblockGarden(profile.profile_id) : null, - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error - museum: options?.garden ? await this.client.getSkyblockMuseum(query, profile.profile_id) : null, + garden: options?.garden ? await this.client.skyblock.getGarden(profile.profile_id) : null, + museum: options?.garden ? await this.client.skyblock.getMuseum(query, profile.profile_id) : null, profileName: profile.cute_name, gameMode: profile.game_mode || null, m: profile.members[query], @@ -42,4 +38,4 @@ class getMember extends Endpoint { } } -export default getSkyblockMember; +export default getMember; \ No newline at end of file diff --git a/src/API/skyblock/getMuseum.ts b/src/API/skyblock/getMuseum.ts index 535409db..ed646675 100644 --- a/src/API/skyblock/getMuseum.ts +++ b/src/API/skyblock/getMuseum.ts @@ -19,4 +19,4 @@ class getMuseum extends Endpoint { } } -export default getSkyblockMuseum; +export default getMuseum; \ No newline at end of file diff --git a/src/API/skyblock/getNews.ts b/src/API/skyblock/getNews.ts index b394fd9d..7225a46f 100644 --- a/src/API/skyblock/getNews.ts +++ b/src/API/skyblock/getNews.ts @@ -17,4 +17,4 @@ class getNews extends Endpoint { } } -export default getSkyblockNews; +export default getNews; \ No newline at end of file diff --git a/src/API/skyblock/getProfiles.ts b/src/API/skyblock/getProfiles.ts index 601fa345..ab0ae178 100644 --- a/src/API/skyblock/getProfiles.ts +++ b/src/API/skyblock/getProfiles.ts @@ -28,16 +28,12 @@ class getProfiles extends Endpoint { communityUpgrades: res.data.profiles[i].community_upgrades, selected: res.data.profiles[i].selected, members: res.data.profiles[i].members, - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error - garden: options?.garden ? await this.client.getSkyblockGarden(res.data.profiles[i].profile_id) : null, - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error - museum: options?.garden ? await this.client.getSkyblockMuseum(query, res.data.profiles[i].profile_id) : null + garden: options?.garden ? await this.client.skyblock.getGarden(res.data.profiles[i].profile_id) : null, + museum: options?.garden ? await this.client.skyblock.getMuseum(query, res.data.profiles[i].profile_id) : null }); } return profiles.map((p) => new SkyblockProfile(p)); } } -export default getSkyblockProfiles; +export default getProfiles; \ No newline at end of file diff --git a/src/API/skyblock/index.ts b/src/API/skyblock/index.ts new file mode 100644 index 00000000..7502dc06 --- /dev/null +++ b/src/API/skyblock/index.ts @@ -0,0 +1,27 @@ +import getAuction from './getAuction'; +import getAuctions from './getAuctions'; +import getAuctionsByPlayer from './getAuctionsByPlayer'; +import getBazaar from './getBazaar'; +import getBingo from './getBingo'; +import getFireSales from './getFireSales'; +import getGarden from './getGarden'; +import getGovernment from './getGovernment'; +import getMember from './getMember'; +import getMuseum from './getMuseum'; +import getNews from './getNews'; +import getProfiles from './getProfiles'; + +export default { + getAuction, + getAuctions, + getAuctionsByPlayer, + getBazaar, + getBingo, + getFireSales, + getGarden, + getGovernment, + getMember, + getMuseum, + getNews, + getProfiles +}; \ No newline at end of file diff --git a/src/Client.ts b/src/Client.ts index 8714cbb7..6d0c75e6 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -2,6 +2,7 @@ import CacheHandler from './Private/CacheHandler'; import { ClientOptions } from './typings/Client'; import RateLimit from './Private/RateLimit'; import Requests from './Private/Requests'; +import SkyblockAPI from './API/skyblock/'; import Updater from './Private/Updater'; import Errors from './Errors'; import API from './API'; @@ -17,6 +18,7 @@ class Client { declare rateLimit: RateLimit; readonly key: string; declare interval: NodeJS.Timeout; + declare skyblock: any; constructor(key: string, options?: ClientOptions) { this.key = key; this.errors = new Errors(); @@ -35,6 +37,13 @@ class Client { // @ts-expect-error this[func] = endpoint.execute.bind(endpoint); } + this.skyblock = {}; + for (const func in SkyblockAPI) { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error + const endpoint = new SkyblockAPI[func](this); + this.skyblock[func] = endpoint.execute.bind(endpoint); + } if (clients.find((x) => x.key === key)) { // eslint-disable-next-line no-console console.warn(this.errors.MULTIPLE_INSTANCES); @@ -78,4 +87,4 @@ class Client { } } -export default Client; +export default Client; \ No newline at end of file diff --git a/src/Errors.ts b/src/Errors.ts index 74ff6a92..53f37110 100644 --- a/src/Errors.ts +++ b/src/Errors.ts @@ -32,11 +32,11 @@ class Errors { "[Hypixel-API-Reborn] The rate limitations on your API Key has been exceeded. There might be an outage (Check Hypixel's status page), or you simply did too many requests in a short time. Hint: Enable rate limit options! They can help you avoid this error! For help join our Discord Server https://discord.gg/NSEBNMM"; NO_SKYBLOCK_PROFILES: string = '[Hypixel-API-Reborn] The player has no skyblock profiles.'; BAD_AUCTION_FILTER: string = - '[Hypixel-API-Reborn] Unexpected filter for Client#getSkyblockAuction. Expected one of "PLAYER", "AUCTION", "PROFILE", but got something else.'; + '[Hypixel-API-Reborn] Unexpected filter for Client#skyblock.getAuction. Expected one of "PLAYER", "AUCTION", "PROFILE", but got something else.'; NOT_IMPLEMENTED: string = '[Hypixel-API-Reborn] Endpoint execute method is not implemented yet! Please report this https://discord.gg/NSEBNMM'; RATE_LIMIT_INIT_ERROR: string = '[hypixel-api-reborn] An error happened whilst initializing rate limit. We strongly recommend restarting the code as this can lead to desynchronization.'; } -export default Errors; +export default Errors; \ No newline at end of file From cc329cbb338db80c0dd5c36822afc26c4746172f Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 23 Aug 2024 09:21:02 +0800 Subject: [PATCH 3/3] fix formatting --- src/API/index.ts | 2 +- src/API/skyblock/getAuction.test.ts | 12 ------------ src/API/skyblock/getAuction.ts | 2 +- src/API/skyblock/getAuctions.ts | 2 +- src/API/skyblock/getAuctionsByPlayer.ts | 2 +- src/API/skyblock/getBazaar.ts | 2 +- src/API/skyblock/getBingo.ts | 2 +- src/API/skyblock/getFireSales.ts | 2 +- src/API/skyblock/getGarden.ts | 2 +- src/API/skyblock/getGovernment.ts | 2 +- src/API/skyblock/getMember.ts | 2 +- src/API/skyblock/getMuseum.ts | 2 +- src/API/skyblock/getNews.ts | 2 +- src/API/skyblock/getProfiles.ts | 2 +- src/API/skyblock/index.ts | 2 +- src/Client.ts | 2 +- src/Errors.ts | 2 +- 17 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/API/index.ts b/src/API/index.ts index 0a77f604..76e74eae 100644 --- a/src/API/index.ts +++ b/src/API/index.ts @@ -29,4 +29,4 @@ export default { getRecentGames, getStatus, getWatchdogStats -}; \ No newline at end of file +}; diff --git a/src/API/skyblock/getAuction.test.ts b/src/API/skyblock/getAuction.test.ts index ad2b93b8..725feebe 100644 --- a/src/API/skyblock/getAuction.test.ts +++ b/src/API/skyblock/getAuction.test.ts @@ -7,11 +7,7 @@ import Client from '../../Client'; test('Client#skyblock.Auction (raw)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error const auctions = await client.skyblock.getAuctions(1); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error const data = await client.skyblock.getAuction('player', auctions.auctions[0].auctioneerUuid, { raw: true }); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); @@ -20,27 +16,19 @@ test('Client#skyblock.Auction (raw)', async () => { test('Client#skyblock.Auction (No Query)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error expect(() => client.skyblock.getAuction('player')).rejects.toThrowError(client.errors.NO_NICKNAME_UUID); client.destroy(); }); test('Client#skyblock.Auction (Bad Filter)', () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error expect(() => client.skyblock.getAuction('meow')).rejects.toThrowError(client.errors.BAD_AUCTION_FILTER); client.destroy(); }); test('Client#skyblock.Auction (Auction)', async () => { const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error const auctions = await client.skyblock.getAuctions(1); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error const data = await client.skyblock.getAuction('auction', auctions.auctions[0].auctioneerUuid); expect(data).toBeDefined(); expectTypeOf(data).toEqualTypeOf(); diff --git a/src/API/skyblock/getAuction.ts b/src/API/skyblock/getAuction.ts index 755ea054..460adbb5 100644 --- a/src/API/skyblock/getAuction.ts +++ b/src/API/skyblock/getAuction.ts @@ -33,4 +33,4 @@ class getAuction extends Endpoint { } } -export default getAuction; \ No newline at end of file +export default getAuction; diff --git a/src/API/skyblock/getAuctions.ts b/src/API/skyblock/getAuctions.ts index 1f5bce2a..3c5e772a 100644 --- a/src/API/skyblock/getAuctions.ts +++ b/src/API/skyblock/getAuctions.ts @@ -56,4 +56,4 @@ class getAuctions extends Endpoint { } } -export default getAuctions; \ No newline at end of file +export default getAuctions; diff --git a/src/API/skyblock/getAuctionsByPlayer.ts b/src/API/skyblock/getAuctionsByPlayer.ts index a7798164..8fae4729 100644 --- a/src/API/skyblock/getAuctionsByPlayer.ts +++ b/src/API/skyblock/getAuctionsByPlayer.ts @@ -19,4 +19,4 @@ class getAuctionsByPlayer extends Endpoint { } } -export default getAuctionsByPlayer; \ No newline at end of file +export default getAuctionsByPlayer; diff --git a/src/API/skyblock/getBazaar.ts b/src/API/skyblock/getBazaar.ts index 1398a0ed..fde4b549 100644 --- a/src/API/skyblock/getBazaar.ts +++ b/src/API/skyblock/getBazaar.ts @@ -17,4 +17,4 @@ class getBazaar extends Endpoint { } } -export default getBazaar; \ No newline at end of file +export default getBazaar; diff --git a/src/API/skyblock/getBingo.ts b/src/API/skyblock/getBingo.ts index 6f88801d..825b5e96 100644 --- a/src/API/skyblock/getBingo.ts +++ b/src/API/skyblock/getBingo.ts @@ -17,4 +17,4 @@ class getBingo extends Endpoint { } } -export default getBingo; \ No newline at end of file +export default getBingo; diff --git a/src/API/skyblock/getFireSales.ts b/src/API/skyblock/getFireSales.ts index 75ea2d6c..f4d80f8b 100644 --- a/src/API/skyblock/getFireSales.ts +++ b/src/API/skyblock/getFireSales.ts @@ -17,4 +17,4 @@ class getFireSales extends Endpoint { } } -export default getFireSales; \ No newline at end of file +export default getFireSales; diff --git a/src/API/skyblock/getGarden.ts b/src/API/skyblock/getGarden.ts index be070f91..63aa5206 100644 --- a/src/API/skyblock/getGarden.ts +++ b/src/API/skyblock/getGarden.ts @@ -18,4 +18,4 @@ class getGarden extends Endpoint { } } -export default getGarden; \ No newline at end of file +export default getGarden; diff --git a/src/API/skyblock/getGovernment.ts b/src/API/skyblock/getGovernment.ts index 0c0bc518..7bac85e1 100644 --- a/src/API/skyblock/getGovernment.ts +++ b/src/API/skyblock/getGovernment.ts @@ -17,4 +17,4 @@ class getGovernment extends Endpoint { } } -export default getGovernment; \ No newline at end of file +export default getGovernment; diff --git a/src/API/skyblock/getMember.ts b/src/API/skyblock/getMember.ts index 20323413..51a64153 100644 --- a/src/API/skyblock/getMember.ts +++ b/src/API/skyblock/getMember.ts @@ -38,4 +38,4 @@ class getMember extends Endpoint { } } -export default getMember; \ No newline at end of file +export default getMember; diff --git a/src/API/skyblock/getMuseum.ts b/src/API/skyblock/getMuseum.ts index ed646675..1b9a0abe 100644 --- a/src/API/skyblock/getMuseum.ts +++ b/src/API/skyblock/getMuseum.ts @@ -19,4 +19,4 @@ class getMuseum extends Endpoint { } } -export default getMuseum; \ No newline at end of file +export default getMuseum; diff --git a/src/API/skyblock/getNews.ts b/src/API/skyblock/getNews.ts index 7225a46f..dfe3aa23 100644 --- a/src/API/skyblock/getNews.ts +++ b/src/API/skyblock/getNews.ts @@ -17,4 +17,4 @@ class getNews extends Endpoint { } } -export default getNews; \ No newline at end of file +export default getNews; diff --git a/src/API/skyblock/getProfiles.ts b/src/API/skyblock/getProfiles.ts index ab0ae178..0d8d2469 100644 --- a/src/API/skyblock/getProfiles.ts +++ b/src/API/skyblock/getProfiles.ts @@ -36,4 +36,4 @@ class getProfiles extends Endpoint { } } -export default getProfiles; \ No newline at end of file +export default getProfiles; diff --git a/src/API/skyblock/index.ts b/src/API/skyblock/index.ts index 7502dc06..aa126a1f 100644 --- a/src/API/skyblock/index.ts +++ b/src/API/skyblock/index.ts @@ -24,4 +24,4 @@ export default { getMuseum, getNews, getProfiles -}; \ No newline at end of file +}; diff --git a/src/Client.ts b/src/Client.ts index 6d0c75e6..83ce516a 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -87,4 +87,4 @@ class Client { } } -export default Client; \ No newline at end of file +export default Client; diff --git a/src/Errors.ts b/src/Errors.ts index 53f37110..e4682453 100644 --- a/src/Errors.ts +++ b/src/Errors.ts @@ -39,4 +39,4 @@ class Errors { '[hypixel-api-reborn] An error happened whilst initializing rate limit. We strongly recommend restarting the code as this can lead to desynchronization.'; } -export default Errors; \ No newline at end of file +export default Errors;