Skip to content

Commit d195ae3

Browse files
committed
fix: mojang username not modrinth username
1 parent 3bd63d5 commit d195ae3

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

apps/app-frontend/src/components/ui/skin/EditSkinModal.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ async function save() {
211211
blob = new Uint8Array(buf)
212212
}
213213
214+
await unequip_skin();
215+
214216
if (mode.value === 'new') {
215217
await add_and_equip_custom_skin(blob, variant.value, selectedCape.value)
216218
emit('saved')

apps/app-frontend/src/pages/Skins.vue

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { UpdatedIcon, PlusIcon } from '@modrinth/assets'
33
import { ButtonStyled, SkinPreviewRenderer } from '@modrinth/ui'
4-
import { ref, computed, useTemplateRef } from 'vue'
4+
import {ref, computed, useTemplateRef, onMounted} from 'vue'
55
import SkinButton from '@/components/ui/skin/SkinButton.vue'
66
import EditSkinModal from '@/components/ui/skin/EditSkinModal.vue'
77
import SelectCapeModal from '@/components/ui/skin/SelectCapeModal.vue'
@@ -16,14 +16,15 @@ import { get as getSettings } from '@/helpers/settings.ts'
1616
import { get as getCreds } from '@/helpers/mr_auth'
1717
import { get_user } from '@/helpers/cache'
1818
import type { Cape, Skin } from '@/helpers/skins.ts'
19+
import {get_default_user, users} from "@/helpers/auth";
1920
2021
const editSkinModal = useTemplateRef('editSkinModal')
2122
const selectCapeModal = useTemplateRef('selectCapeModal')
2223
2324
const settings = ref(await getSettings())
24-
const credentials = ref()
2525
const skins = ref<Skin[]>([])
2626
const capes = ref<Cape[]>([])
27+
const username = ref<string | undefined>(undefined)
2728
2829
const selectedSkin = ref<Skin | null>(null)
2930
@@ -36,31 +37,22 @@ const defaultSkins = computed(() => filterDefaultSkins(skins.value))
3637
3738
const currentCape = ref<Cape>()
3839
39-
await Promise.all([fetchCredentials(), loadCapes(), loadSkins()])
40-
41-
async function fetchCredentials() {
42-
const creds = await getCreds().catch(handleError)
43-
if (creds?.user_id) {
44-
creds.user = await get_user(creds.user_id).catch(handleError)
45-
}
46-
credentials.value = creds
47-
}
40+
await Promise.all([loadCapes(), loadSkins(), loadUsername()])
4841
4942
async function loadCapes() {
5043
capes.value = (await get_available_capes().catch(handleError)) ?? []
5144
currentCape.value = capes.value.find((c) => c.is_equipped)
5245
}
5346
5447
async function loadSkins() {
55-
skins.value = [];
48+
console.log(skins.value)
5649
skins.value = (await get_available_skins().catch(handleError)) ?? []
50+
console.log(skins.value)
5751
selectedSkin.value = skins.value.find((s) => s.is_equipped) ?? null;
5852
}
5953
6054
async function changeSkin(newSkin: Skin) {
61-
console.log(newSkin);
62-
selectedSkin.value = newSkin;
63-
await equip_skin(selectedSkin.value).catch(handleError);
55+
await equip_skin(newSkin).catch(handleError);
6456
await loadSkins();
6557
}
6658
@@ -70,6 +62,18 @@ async function handleCapeSelected(cape: Cape | undefined) {
7062
await loadSkins();
7163
await loadCapes();
7264
}
65+
66+
async function loadUsername() {
67+
try {
68+
const defaultId = await get_default_user()
69+
const allAccounts = await users();
70+
const current = allAccounts.find(acc => acc.profile.id === defaultId)
71+
username.value = current?.profile.name ?? null
72+
} catch (e) {
73+
handleError(e)
74+
username.value = null
75+
}
76+
}
7377
</script>
7478

7579
<template>
@@ -98,7 +102,7 @@ async function handleCapeSelected(cape: Cape | undefined) {
98102
<SkinPreviewRenderer
99103
wide-model-src="/src/assets/models/classic_player.gltf"
100104
slim-model-src="/src/assets/models/slim_player.gltf"
101-
:nametag="settings.hide_nametag_skins_page ? undefined : credentials?.user?.username"
105+
:nametag="settings.hide_nametag_skins_page ? undefined : username"
102106
:texture-src="previewSkin"
103107
:variant="selectedSkin?.variant"
104108
/>

0 commit comments

Comments
 (0)