[+] Show aqua net pfp instead of in-game pfp

This commit is contained in:
Azalea
2024-03-06 00:37:35 -05:00
parent 2a10471e0b
commit 52ec890e2c
9 changed files with 22 additions and 21 deletions

View File

@@ -4,13 +4,13 @@
import SetupInstructions from "./Home/SetupInstructions.svelte";
import { DISCORD_INVITE, FADE_IN, FADE_OUT } from "../libs/config";
import { USER } from "../libs/sdk.js";
import type { UserMe } from "../libs/generalTypes";
import type { AquaNetUser } from "../libs/generalTypes";
import StatusOverlays from "../components/StatusOverlays.svelte";
import ActionCard from "../components/ActionCard.svelte";
USER.ensureLoggedIn();
let me: UserMe
let me: AquaNetUser
let error = ""
let tab = 0;

View File

@@ -2,7 +2,7 @@
<script lang="ts">
import { fade, slide } from "svelte/transition"
import type { Card, CardSummary, CardSummaryGame, ConfirmProps, UserMe } from "../../libs/generalTypes";
import type { Card, CardSummary, CardSummaryGame, ConfirmProps, AquaNetUser } from "../../libs/generalTypes";
import { CARD, USER } from "../../libs/sdk";
import moment from "moment"
import Icon from "@iconify/svelte";
@@ -13,7 +13,7 @@
let showConfirm: ConfirmProps | null = null
let error: string = ""
let me: UserMe | null = null
let me: AquaNetUser | null = null
let accountCardSummary: CardSummary | null = null
// Fetch data for current user

View File

@@ -3,11 +3,11 @@
<script lang="ts">
import { fade, slide } from "svelte/transition";
import { USER } from "../../libs/sdk";
import type { UserMe } from "../../libs/generalTypes";
import type { AquaNetUser } from "../../libs/generalTypes";
import { codeToHtml } from 'shiki'
import { AQUA_CONNECTION, DISCORD_INVITE, FADE_IN, FADE_OUT } from "../../libs/config";
let user: UserMe
let user: AquaNetUser
let keychip: string;
let keychipCode: string;
let getStartedRequesting = false;

View File

@@ -2,7 +2,7 @@
<script lang="ts">
import { slide } from "svelte/transition";
import type { UserMe } from "../../libs/generalTypes";
import type { AquaNetUser } from "../../libs/generalTypes";
import { USER } from "../../libs/sdk";
import StatusOverlays from "../../components/StatusOverlays.svelte";
import Icon from "@iconify/svelte";
@@ -10,7 +10,7 @@
USER.ensureLoggedIn()
let me: UserMe;
let me: AquaNetUser;
let error: string;
let submitting = ""
@@ -25,7 +25,7 @@
// Fetch user data
const getMe = () => USER.me().then(m => {
me = m
values = fields.map(([field]) => me[field as keyof UserMe])
values = fields.map(([field]) => me[field as keyof AquaNetUser])
}).catch(e => error = e.message)
getMe()

View File

@@ -1,6 +1,6 @@
<script lang="ts">
import { CHARTJS_OPT, coverNotFound, pfpNotFound, registerChart, renderCal, title, tooltip } from "../libs/ui";
import type { GenericGamePlaylog, GenericGameSummary, MusicMeta, TrendEntry, UserMe } from "../libs/generalTypes";
import { CHARTJS_OPT, coverNotFound, pfpNotFound, registerChart, renderCal, title, tooltip, pfp } from "../libs/ui";
import type { GenericGamePlaylog, GenericGameSummary, MusicMeta, TrendEntry, AquaNetUser } from "../libs/generalTypes";
import { DATA_HOST } from "../libs/config";
import 'cal-heatmap/cal-heatmap.css';
import { Line } from 'svelte-chartjs';
@@ -17,7 +17,7 @@
export let game: GameName = "mai2"
let calElement: HTMLElement
let error: string;
let me: UserMe
let me: AquaNetUser
title(`User ${username}`)
interface MusicAndPlay extends MusicMeta, GenericGamePlaylog {}
@@ -56,7 +56,7 @@
<main id="user-home" class="content">
{#if d}
<div class="user-pfp">
<img src={`${DATA_HOST}/d/${game}/assetbundle/icon/${d.user.iconId.toString().padStart(6, "0")}.png`} alt="" class="pfp" on:error={pfpNotFound}>
<img use:pfp={d.user.aquaUser} alt="" class="pfp" on:error={pfpNotFound}>
<div class="name-box">
<h2>{d.user.name}</h2>
{#if me && me.username === username}