From 9ead69429699921b66595c44f8f830a8ecc44277 Mon Sep 17 00:00:00 2001
From: mat
Date: Sun, 5 Jun 2022 17:56:53 -0500
Subject: Bump skyblock-assets
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index a2b2139..f7d9948 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"@sveltejs/kit": "^1.0.0-next.335",
"cookie": "^0.5.0",
"dotenv": "^16.0.0",
- "skyblock-assets": "^2.0.8",
+ "skyblock-assets": "^2.0.9",
"svelte": "^3.48.0",
"svelte-preprocess": "^4.10.6",
"typed-hypixel-api": "^1.1.0"
diff --git a/yarn.lock b/yarn.lock
index dad6890..25289a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1508,10 +1508,10 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-skyblock-assets@^2.0.8:
- version "2.0.8"
- resolved "https://registry.yarnpkg.com/skyblock-assets/-/skyblock-assets-2.0.8.tgz#9bc3881270407f651a0962f6423b6e3a1329d768"
- integrity sha512-NuCIOOdKLs5R85/PfiPMVg5Ij63A6sDMX0dRH698HjldltLcuZDWFJnOcoeaPESdDV0mqHOYUXs6toYgzOD7mw==
+skyblock-assets@^2.0.9:
+ version "2.0.9"
+ resolved "https://registry.yarnpkg.com/skyblock-assets/-/skyblock-assets-2.0.9.tgz#48411dec9f53ec9b3150f98abde7b9e8db57ad5d"
+ integrity sha512-m+FxwNYqfE+Xp+0D8MAwKbTTodDduevEkamGZFvH3J3VtSFZNEpE+Bsmv55mfpySaomTKwFqiXNbxrVxgQLKXA==
slash@^3.0.0:
version "3.0.0"
--
cgit
From d470d091a852e1325dde25f9827592ee681b9f81 Mon Sep 17 00:00:00 2001
From: mat
Date: Sun, 5 Jun 2022 17:58:19 -0500
Subject: fsr is actually the default pack
---
src/routes/index.svelte | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index d22f854..851f70e 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -79,9 +79,9 @@
discord.gg/KtscNUnh4f.
- Resource packs: PacksHQ (default),
+ Resource packs: Furfsky Reborn (default),
+ PacksHQ,
Furfsky,
- Furfsky Reborn,
Ectoplasm,
RNBW,
Hypixel+,
--
cgit
From 2558ece7847822d302bae78079629533b01dc177 Mon Sep 17 00:00:00 2001
From: mat
Date: Sun, 5 Jun 2022 20:17:32 -0500
Subject: Bump skyblock-assets again
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index f7d9948..960275c 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"@sveltejs/kit": "^1.0.0-next.335",
"cookie": "^0.5.0",
"dotenv": "^16.0.0",
- "skyblock-assets": "^2.0.9",
+ "skyblock-assets": "^2.0.10",
"svelte": "^3.48.0",
"svelte-preprocess": "^4.10.6",
"typed-hypixel-api": "^1.1.0"
diff --git a/yarn.lock b/yarn.lock
index 25289a8..b162de0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1508,10 +1508,10 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-skyblock-assets@^2.0.9:
- version "2.0.9"
- resolved "https://registry.yarnpkg.com/skyblock-assets/-/skyblock-assets-2.0.9.tgz#48411dec9f53ec9b3150f98abde7b9e8db57ad5d"
- integrity sha512-m+FxwNYqfE+Xp+0D8MAwKbTTodDduevEkamGZFvH3J3VtSFZNEpE+Bsmv55mfpySaomTKwFqiXNbxrVxgQLKXA==
+skyblock-assets@^2.0.10:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/skyblock-assets/-/skyblock-assets-2.0.10.tgz#14c31164b9999140cdc6a63ecc87c219c95c68f6"
+ integrity sha512-7gWF35Jmuw+1ZuHcRrVsxLbZG0xynCV3f3CxqwBO0ak6lq7g8TnuQB+PpsrSSXPdlHjID2mvedCOOe6ELz0OFQ==
slash@^3.0.0:
version "3.0.0"
--
cgit
From 997c591d77970387106ade2305822b2ec9f52006 Mon Sep 17 00:00:00 2001
From: mat
Date: Sun, 5 Jun 2022 20:33:53 -0500
Subject: ok this version of skyblock-assets works
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 960275c..be57989 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"@sveltejs/kit": "^1.0.0-next.335",
"cookie": "^0.5.0",
"dotenv": "^16.0.0",
- "skyblock-assets": "^2.0.10",
+ "skyblock-assets": "^2.0.11",
"svelte": "^3.48.0",
"svelte-preprocess": "^4.10.6",
"typed-hypixel-api": "^1.1.0"
diff --git a/yarn.lock b/yarn.lock
index b162de0..df9a8cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1508,10 +1508,10 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-skyblock-assets@^2.0.10:
- version "2.0.10"
- resolved "https://registry.yarnpkg.com/skyblock-assets/-/skyblock-assets-2.0.10.tgz#14c31164b9999140cdc6a63ecc87c219c95c68f6"
- integrity sha512-7gWF35Jmuw+1ZuHcRrVsxLbZG0xynCV3f3CxqwBO0ak6lq7g8TnuQB+PpsrSSXPdlHjID2mvedCOOe6ELz0OFQ==
+skyblock-assets@^2.0.11:
+ version "2.0.11"
+ resolved "https://registry.yarnpkg.com/skyblock-assets/-/skyblock-assets-2.0.11.tgz#69a30e859b76c653e368276a8d261672ce138ff5"
+ integrity sha512-hECWjZRWcrzymvRvf3lHfPP99EudGhFwQA9Hy7ZokiaDaWRwqvai1+EbUm9GBH6DIeKOMmL5CGFBXo6W8UsuPA==
slash@^3.0.0:
version "3.0.0"
--
cgit
From 573ffb17bdd6980532fff65987691f1d10b54189 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 12 Jun 2022 13:25:38 -0500
Subject: i forgot to delete this file lmao
it's from the sveltekit template
---
src/lib/Counter.svelte | 102 -------------------------------------------------
1 file changed, 102 deletions(-)
delete mode 100644 src/lib/Counter.svelte
diff --git a/src/lib/Counter.svelte b/src/lib/Counter.svelte
deleted file mode 100644
index 0df76f5..0000000
--- a/src/lib/Counter.svelte
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
- {Math.floor($displayed_count + 1)}
- {Math.floor($displayed_count)}
-
-
-
-
-
-
-
--
cgit
From b68a711c131d29a396440f2f76963ec5593aa3e7 Mon Sep 17 00:00:00 2001
From: mat
Date: Fri, 17 Jun 2022 14:02:20 -0500
Subject: Show entire JSON if failed to parse
---
src/routes/player/[player]/[profile].svelte | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/routes/player/[player]/[profile].svelte b/src/routes/player/[player]/[profile].svelte
index caf348b..bc6c18d 100644
--- a/src/routes/player/[player]/[profile].svelte
+++ b/src/routes/player/[player]/[profile].svelte
@@ -8,7 +8,14 @@
const profile: string = params.profile
const data: CleanMemberProfile = await fetch(
`${API_URL}player/${player}/${profile}?customization=true`
- ).then(r => r.json())
+ ).then(async r => {
+ const text = await r.text()
+ try {
+ return JSON.parse(text)
+ } catch (e) {
+ throw new Error(`Invalid JSON: ${text}`)
+ }
+ })
if (!data.member) {
return {
--
cgit
From 90f4b2c916cdd7f61843c7a2c7f4451d44e18367 Mon Sep 17 00:00:00 2001
From: mat
Date: Fri, 17 Jun 2022 14:55:34 -0500
Subject: Fix being ratelimited sometimes
---
src/lib/api.ts | 19 +++++++++++++++++--
src/lib/sections/Leaderboards.svelte | 4 ++--
src/lib/sections/Zones.svelte | 2 +-
src/routes/__error.svelte | 4 ++--
src/routes/auctionprices.svelte | 10 +++++-----
src/routes/election.svelte | 4 ++--
src/routes/items.svelte | 4 ++--
src/routes/leaderboards/[name].svelte | 4 ++--
src/routes/leaderboards/index.svelte | 6 +++---
src/routes/loggedin.ts | 4 ++--
src/routes/logout.ts | 4 ++--
src/routes/player/[player]/[profile].svelte | 7 ++++---
src/routes/player/[player]/index.svelte | 4 ++--
src/routes/profile/index.svelte | 6 +++---
src/routes/profile/update.ts | 6 +++---
src/routes/verify.ts | 8 ++++----
16 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/src/lib/api.ts b/src/lib/api.ts
index e3559e1..552607c 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -1,3 +1,18 @@
+import env from './env'
+
// the trailing slash is required
-export const API_URL = 'https://skyblock-api.matdoes.dev/'
-// export const API_URL = 'http://localhost:8080/'
\ No newline at end of file
+const API_URL = 'https://skyblock-api.matdoes.dev/'
+// export const API_URL = 'http://localhost:8080/'
+
+export async function fetchApi(path: string, fetch: (info: RequestInfo, init?: RequestInit | undefined) => Promise, init?: RequestInit | undefined) {
+ const { SKYBLOCK_STATS_API_KEY } = env()
+ if (SKYBLOCK_STATS_API_KEY) {
+ init = init || {}
+ if (!init.headers)
+ init.headers = {}
+ init.headers['key'] = SKYBLOCK_STATS_API_KEY
+ }
+
+ const response = await fetch(API_URL + path, init)
+ return response
+}
\ No newline at end of file
diff --git a/src/lib/sections/Leaderboards.svelte b/src/lib/sections/Leaderboards.svelte
index 7e32958..817f59a 100644
--- a/src/lib/sections/Leaderboards.svelte
+++ b/src/lib/sections/Leaderboards.svelte
@@ -1,5 +1,5 @@
-{#await fetch(`${API_URL}player/${data.member.uuid}/${data.profile.uuid}/leaderboards`).then( r => r.json() )}
+{#await fetchApi(`player/${data.member.uuid}/${data.profile.uuid}/leaderboards`, fetch).then( r => r.json() )}
Loading...
{:then leaderboards}
{#if leaderboards.length > 0}
diff --git a/src/lib/sections/Zones.svelte b/src/lib/sections/Zones.svelte
index ef96456..f7e993b 100644
--- a/src/lib/sections/Zones.svelte
+++ b/src/lib/sections/Zones.svelte
@@ -1,6 +1,6 @@