From 5937ac8c91a15e6bc8daf8d259eb9cd842b86d86 Mon Sep 17 00:00:00 2001 From: mat Date: Sat, 19 Mar 2022 19:56:28 -0500 Subject: Squashed commit of the following: commit 5edaa4376f37890fb1ddd6493b0ac778cebe927e Author: mat Date: Sat Mar 19 19:55:56 2022 -0500 Change stuff to work with my breaking changes --- src/lib/APITypes.d.ts | 48 +++++++++++++++++++++---------------- src/lib/profile.ts | 10 ++++---- src/lib/sections/Collections.svelte | 2 +- src/lib/sections/Minions.svelte | 2 +- src/lib/sections/Slayers.svelte | 2 +- src/lib/sections/Zones.svelte | 12 ++++------ 6 files changed, 40 insertions(+), 36 deletions(-) (limited to 'src/lib') 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 @@ > - Amount: {collection.xp.toLocaleString()} + Amount: {collection.amount.toLocaleString()} {cleanId(collection.name)} {collection.level} 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 @@

Unique minions: - {data.profile.minion_count}/{data.profile.maxUniqueMinions} + {data.profile.minionCount}/{data.profile.maxUniqueMinions}

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 @@
{#each data.member.slayers.bosses as slayer}
-

{slayer.name ? cleanId(slayer.name) : cleanId(slayer.raw_name)}

+

{slayer.name ? cleanId(slayer.name) : cleanId(slayer.rawName)}

Xp: {slayer.xp.toLocaleString()}

Level: {slayer.level}

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 -{#if data.member.visited_zones} +{#if data.member.zones}

- {zonesVisitedCount}/{data.member.visited_zones.length} zones visited + {zonesVisitedCount}/{data.member.zones.length} zones visited

    - {#each data.member.visited_zones.filter(z => z.visited) as zone} + {#each data.member.zones.filter(z => z.visited) as zone}
  • {cleanId(zone.name)}
    • {/each} - {#each data.member.visited_zones.filter(z => !z.visited) as zone} + {#each data.member.zones.filter(z => !z.visited) as zone}
  • {cleanId(zone.name)}
    • {/each}
-- cgit