Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,522 changes: 2,522 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/routes/v1/GetProfileWithStrategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default asyncWrap(async (request: Request, response: Response) => {
case 'last_saved':
case 'last_save_at':
profile = selectProfile(profiles, (profile: SkyBlockProfileStats) => {
return profile.last_save_at.time
return profile.selected
})
break

Expand Down
3 changes: 3 additions & 0 deletions src/types/hypixel/Leveing.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default interface Leveling {
experience: number
}
5 changes: 4 additions & 1 deletion src/types/hypixel/SkyBlockProfile.d.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import DungeonGroups from './DungeonGroups'
import SlayerBosses from './SlayerBosses'
import PetGroups from './PetGroups'
import Leveling from './Leveing'

export default interface SkyBlockProfile {
last_save: number
first_join: number

fairy_souls_collected: number


experience_skill_mining?: number
experience_skill_foraging?: number
experience_skill_enchanting?: number
Expand All @@ -21,6 +22,8 @@ export default interface SkyBlockProfile {

slayer_bosses?: SlayerBosses

leveling?: Leveling

dungeons?: DungeonGroups

pets?: PetGroups[]
Expand Down
6 changes: 2 additions & 4 deletions src/types/hypixel/SkyBlockProfilePlayerStats.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ export default interface SkyBlockProfilePlayerStats {
id: string
name: string
username: string
last_save_at: {
time: number
date: Date
}
selected: boolean
level: number
weight: number
weight_overflow: number
fairy_souls: number
Expand Down
6 changes: 2 additions & 4 deletions src/types/hypixel/SkyBlockProfileStats.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import { PetItem } from './PetItems'
export default interface SkyBlockProfileStats {
id: string
name: string
last_save_at: {
time: number
date: Date
}
selected: boolean
level: number
weight: number
weight_overflow: number
fairy_souls: number
Expand Down
2 changes: 2 additions & 0 deletions src/types/hypixel/SlayerBosses.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ export default interface SlayerBosses {
zombie: Slayer
spider: Slayer
wolf: Slayer
enderman: Slayer
blaze: Slayer
}
13 changes: 7 additions & 6 deletions src/utils/Hypixel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export function mergeSkyBlockProfileAndPlayer(profile: SkyBlockProfileStats, pla
id: profile.id,
name: profile.name,
username: player.username,
last_save_at: profile.last_save_at,
selected: profile.selected,
level: profile.level,
weight: profile.weight,
weight_overflow: profile.weight_overflow,
fairy_souls: profile.fairy_souls,
Expand Down Expand Up @@ -91,14 +92,13 @@ export function parseSkyBlockProfiles(player: PlayerStats, profiles: AxiosRespon
}

const profile: SkyBlockProfile = profileData.members[minifiedUuid]
console.log(profile.leveling?.experience);

result.push({
id: profileData.profile_id,
name: profileData.cute_name,
last_save_at: {
time: profile.last_save,
date: new Date(profile.last_save),
},
selected: profileData.selected,
level: profile.leveling?.experience || 0,
weight: 0,
weight_overflow: 0,
fairy_souls: profile.fairy_souls_collected,
Expand All @@ -123,6 +123,7 @@ export function parseSkyBlockProfiles(player: PlayerStats, profiles: AxiosRespon
for (let stats of result) {
stats.weight = sumWeight(stats, 'weight')
stats.weight_overflow = sumWeight(stats, 'weight_overflow')
stats.level = stats.level / 100
}

return result
Expand All @@ -136,7 +137,7 @@ export function parseSkyBlockProfiles(player: PlayerStats, profiles: AxiosRespon
* @param minifiedUuid The minified UUID for the player
*/
function isValidProfile(profileMembers: SkyBlockProfileMembersResponse, minifiedUuid: string) {
return profileMembers.hasOwnProperty(minifiedUuid) && profileMembers[minifiedUuid].last_save != undefined
return profileMembers.hasOwnProperty(minifiedUuid) && profileMembers[minifiedUuid].pets != undefined
}

/**
Expand Down
Loading