aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-03-19 19:56:28 -0500
committermat <github@matdoes.dev>2022-03-19 19:56:28 -0500
commit5937ac8c91a15e6bc8daf8d259eb9cd842b86d86 (patch)
tree5a2cf508aab80e14849e08a01004a3874cb58f3f
parentd4fdbf639d28c1244eb4072584b7484b4eae3fec (diff)
downloadskyblock-stats-5937ac8c91a15e6bc8daf8d259eb9cd842b86d86.tar.gz
skyblock-stats-5937ac8c91a15e6bc8daf8d259eb9cd842b86d86.tar.bz2
skyblock-stats-5937ac8c91a15e6bc8daf8d259eb9cd842b86d86.zip
Squashed commit of the following:
commit 5edaa4376f37890fb1ddd6493b0ac778cebe927e Author: mat <github@matdoes.dev> Date: Sat Mar 19 19:55:56 2022 -0500 Change stuff to work with my breaking changes
-rw-r--r--src/lib/APITypes.d.ts48
-rw-r--r--src/lib/profile.ts10
-rw-r--r--src/lib/sections/Collections.svelte2
-rw-r--r--src/lib/sections/Minions.svelte2
-rw-r--r--src/lib/sections/Slayers.svelte2
-rw-r--r--src/lib/sections/Zones.svelte12
-rw-r--r--src/routes/election.svelte6
-rw-r--r--src/routes/leaderboards/[name].svelte2
-rw-r--r--src/routes/player/[player]/index.svelte4
-rw-r--r--tsconfig.json3
10 files changed, 48 insertions, 43 deletions
diff --git a/src/lib/APITypes.d.ts b/src/lib/APITypes.d.ts
index 70bab46..b8b0ed5 100644
--- a/src/lib/APITypes.d.ts
+++ b/src/lib/APITypes.d.ts
@@ -6,22 +6,21 @@ export interface CleanMemberProfile {
export interface CleanMemberProfilePlayer extends CleanPlayer {
profileName: string
- first_join: number
- last_save: number
- bank?: Bank
- purse?: number
- stats?: StatItem[]
- rawHypixelStats?: {
+ firstJoin: number
+ lastSave: number
+ purse: number
+ stats: StatItem[]
+ rawHypixelStats: {
[key: string]: number
}
- minions?: CleanMinion[]
- fairy_souls?: FairySouls
+ minions: CleanMinion[]
+ fairySouls: FairySouls
inventories?: Inventories
- objectives?: Objective[]
- skills?: Skill[]
- visited_zones?: Zone[]
- collections?: Collection[]
- slayers?: SlayerData
+ objectives: Objective[]
+ skills: Skill[]
+ zones: Zone[]
+ collections: Collection[]
+ slayers: SlayerData
}
export interface CleanBasicPlayer {
@@ -53,12 +52,12 @@ interface Item {
glint: boolean
}
reforge?: string
- anvil_uses?: number
+ anvilUses?: number
timestamp?: string
enchantments?: {
[name: string]: number
}
- head_texture?: string
+ headTexture?: string
}
export declare type Inventory = Item[]
export declare const INVENTORIES: {
@@ -113,14 +112,14 @@ export interface CleanFullProfile extends CleanProfile {
members: CleanMember[]
bank: Bank
minions: CleanMinion[]
- minion_count: number
+ minionCount: number
maxUniqueMinions: number
}
export interface CleanFullProfileBasicMembers extends CleanProfile {
members: CleanBasicMember[]
bank: Bank
minions: CleanMinion[]
- minion_count: number
+ minionCount: number
maxUniqueMinions: number
}
@@ -135,7 +134,7 @@ declare const COLLECTIONS: {
declare type CollectionCategory = keyof typeof COLLECTIONS
export interface Collection {
name: string
- xp: number
+ amount: number
level: number
category: CollectionCategory
}
@@ -153,7 +152,7 @@ export interface Candidate {
}
export interface ElectionData {
- last_updated: number
+ lastUpdated: number
previous: {
year: number
winner: string
@@ -200,16 +199,23 @@ export interface SlayerData {
}
interface SlayerTier {
- tier: number,
+ tier: number
kills: number
}
export interface Slayer {
name?: SlayerName
- raw_name: string
+ rawName: string
xp: number
level: number
kills: number
tiers: SlayerTier[]
}
+export interface CleanBasicMember {
+ uuid: string
+ username: string
+ lastSave: number
+ firstJoin: number
+ rank: CleanRank
+}
diff --git a/src/lib/profile.ts b/src/lib/profile.ts
index d2891ab..256dc24 100644
--- a/src/lib/profile.ts
+++ b/src/lib/profile.ts
@@ -14,14 +14,14 @@ export function prettyTimestamp(ms: number) {
export function generateInfobox(data: CleanMemberProfile): string[] {
const result: string[] = []
- result.push(`💾 Last save: ${prettyTimestamp(data.member.last_save * 1000)}`)
+ result.push(`💾 Last save: ${prettyTimestamp(data.member.lastSave * 1000)}`)
- result.push(`🚶 Profile created: ${prettyTimestamp(data.member.first_join * 1000)}`)
+ result.push(`🚶 Profile created: ${prettyTimestamp(data.member.firstJoin * 1000)}`)
- result.push(`✨ Fairy souls: ${data.member.fairy_souls.total}/${data.member.fairy_souls.max}`)
+ result.push(`✨ Fairy souls: ${data.member.fairySouls.total}/${data.member.fairySouls.max}`)
- if (data.profile.minion_count >= data.profile.maxUniqueMinions)
- result.push(`🤖 Minion count: ${data.profile.minion_count}`)
+ if (data.profile.minionCount >= data.profile.maxUniqueMinions)
+ result.push(`🤖 Minion count: ${data.profile.minionCount}`)
if (data.member.stats) {
let mostSignificantKillsStat: StatItem | null = null
diff --git a/src/lib/sections/Collections.svelte b/src/lib/sections/Collections.svelte
index a2bd124..8551bf4 100644
--- a/src/lib/sections/Collections.svelte
+++ b/src/lib/sections/Collections.svelte
@@ -29,7 +29,7 @@
>
<Tooltip>
<span slot="tooltip">
- Amount: {collection.xp.toLocaleString()}
+ Amount: {collection.amount.toLocaleString()}
</span>
{cleanId(collection.name)}
<span class="coll-level">{collection.level}</span>
diff --git a/src/lib/sections/Minions.svelte b/src/lib/sections/Minions.svelte
index 8fa5914..d9a49ab 100644
--- a/src/lib/sections/Minions.svelte
+++ b/src/lib/sections/Minions.svelte
@@ -8,7 +8,7 @@
<p class="unique-minions-text">
Unique minions:
<span class="minions-fraction">
- <b>{data.profile.minion_count}</b>/{data.profile.maxUniqueMinions}
+ <b>{data.profile.minionCount}</b>/{data.profile.maxUniqueMinions}
</span>
</p>
<table>
diff --git a/src/lib/sections/Slayers.svelte b/src/lib/sections/Slayers.svelte
index c5266df..19b9298 100644
--- a/src/lib/sections/Slayers.svelte
+++ b/src/lib/sections/Slayers.svelte
@@ -13,7 +13,7 @@
<div class="slayers-list">
{#each data.member.slayers.bosses as slayer}
<div class="individual-slayer-data">
- <h3>{slayer.name ? cleanId(slayer.name) : cleanId(slayer.raw_name)}</h3>
+ <h3>{slayer.name ? cleanId(slayer.name) : cleanId(slayer.rawName)}</h3>
<div class="slayer-info-text">
<p>Xp: <b>{slayer.xp.toLocaleString()}</b></p>
<p>Level: <b>{slayer.level}</b></p>
diff --git a/src/lib/sections/Zones.svelte b/src/lib/sections/Zones.svelte
index 428ab79..1ea3f0d 100644
--- a/src/lib/sections/Zones.svelte
+++ b/src/lib/sections/Zones.svelte
@@ -4,22 +4,20 @@
export let data: CleanMemberProfile
- let zonesVisitedCount = data.member.visited_zones
- ? data.member.visited_zones?.filter(z => z.visited).length
- : 0
+ let zonesVisitedCount = data.member.zones ? data.member.zones?.filter(z => z.visited).length : 0
</script>
-{#if data.member.visited_zones}
+{#if data.member.zones}
<p class="zones-visited-text">
<span class="zones-visited-number">
- <b>{zonesVisitedCount}</b>/{data.member.visited_zones.length} zones visited
+ <b>{zonesVisitedCount}</b>/{data.member.zones.length} zones visited
</span>
</p>
<ul>
- {#each data.member.visited_zones.filter(z => z.visited) as zone}
+ {#each data.member.zones.filter(z => z.visited) as zone}
<li>{cleanId(zone.name)}</li>
{/each}
- {#each data.member.visited_zones.filter(z => !z.visited) as zone}
+ {#each data.member.zones.filter(z => !z.visited) as zone}
<li class="unvisited-zone">{cleanId(zone.name)}</li>
{/each}
</ul>
diff --git a/src/routes/election.svelte b/src/routes/election.svelte
index a0c78ce..8504622 100644
--- a/src/routes/election.svelte
+++ b/src/routes/election.svelte
@@ -52,7 +52,7 @@
// don't invalidate the first time the function is called
if (!first) await invalidate('')
- const lastUpdatedAgo = Date.now() - data.last_updated * 1000
+ const lastUpdatedAgo = Date.now() - data.lastUpdated * 1000
autoInvalidateTimeout = setTimeout(() => autoInvalidate(false), lastUpdatedAgo + 10 * 60 * 1000)
}
@@ -76,14 +76,14 @@
<div class="next-mayor-update">
<p>
<b>Last API update:</b>
- {millisecondsToTime(currentTime - data.last_updated * 1000, {
+ {millisecondsToTime(currentTime - data.lastUpdated * 1000, {
smallestUnit: 1,
parts: 1,
})} ago
</p>
<p>
<b>Next API update:</b>
- {millisecondsToTime(10 * 60 * 1000 - (currentTime - data.last_updated * 1000), {
+ {millisecondsToTime(10 * 60 * 1000 - (currentTime - data.lastUpdated * 1000), {
smallestUnit: 1,
parts: 1,
})}
diff --git a/src/routes/leaderboards/[name].svelte b/src/routes/leaderboards/[name].svelte
index d4ef848..1c20b2c 100644
--- a/src/routes/leaderboards/[name].svelte
+++ b/src/routes/leaderboards/[name].svelte
@@ -3,7 +3,7 @@
import { API_URL } from '$lib/api'
export const load: Load = async ({ params, fetch }) => {
- const data = await fetch(`${API_URL}leaderboard/${params.name}`).then(r => r.json())
+ const data = await fetch(`${API_URL}leaderboards/${params.name}`).then(r => r.json())
if (data.list.length === 0) return { fallthrough: true } as unknown
diff --git a/src/routes/player/[player]/index.svelte b/src/routes/player/[player]/index.svelte
index 70ea2ff..7148f20 100644
--- a/src/routes/player/[player]/index.svelte
+++ b/src/routes/player/[player]/index.svelte
@@ -45,9 +45,9 @@
for (const profile of data.profiles) {
if (profile.members)
for (const member of profile.members) {
- if (member.uuid === data.player?.uuid && member.last_save > activeProfileLastSave) {
+ if (member.uuid === data.player?.uuid && member.lastSave > activeProfileLastSave) {
activeProfile = profile
- activeProfileLastSave = member.last_save
+ activeProfileLastSave = member.lastSave
}
}
}
diff --git a/tsconfig.json b/tsconfig.json
index 06496e5..fd1739c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -31,7 +31,8 @@
"$lib": ["src/lib"],
"$lib/*": ["src/lib/*"]
},
- "strictNullChecks": true
+ "strictNullChecks": true,
+ "outDir": "dist",
},
"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.svelte"],
"extends": "./.svelte-kit/tsconfig.json"