implement better mii fetching using now defunct mii clicker as a reference (thanks dwyazzo90)!
This commit is contained in:
parent
219c875d47
commit
98b83003a1
4 changed files with 140 additions and 24 deletions
|
|
@ -9,6 +9,32 @@ window.loadHeader(function(headerContainer) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const extractMiiName = (miiDataB64) => {
|
||||||
|
try {
|
||||||
|
const binaryString = atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/'));
|
||||||
|
const data = new Uint8Array(binaryString.length);
|
||||||
|
for (let i = 0; i < binaryString.length; i++) {
|
||||||
|
data[i] = binaryString.charCodeAt(i);
|
||||||
|
}
|
||||||
|
const size = data.length;
|
||||||
|
let offset = -1;
|
||||||
|
let isBE = false;
|
||||||
|
if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A;
|
||||||
|
else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; }
|
||||||
|
else if (size === 88) offset = 0x10;
|
||||||
|
else if ([48, 68].includes(size)) offset = 0x1C;
|
||||||
|
if (offset === -1) return null;
|
||||||
|
const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le');
|
||||||
|
let end = offset;
|
||||||
|
while (end < offset + 20 && end + 1 < data.length && (data[end] !== 0 || data[end + 1] !== 0)) {
|
||||||
|
end += 2;
|
||||||
|
}
|
||||||
|
return decoder.decode(data.slice(offset, end));
|
||||||
|
} catch (e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const udemaeMap = {
|
const udemaeMap = {
|
||||||
"0": "C-", "1": "C", "2": "C+", "3": "B-", "4": "B",
|
"0": "C-", "1": "C", "2": "C+", "3": "B-", "4": "B",
|
||||||
"5": "B+", "6": "A-", "7": "A", "8": "A+", "9": "S", "10": "S+"
|
"5": "B+", "6": "A-", "7": "A", "8": "A+", "9": "S", "10": "S+"
|
||||||
|
|
@ -42,9 +68,12 @@ window.loadHeader(function(headerContainer) {
|
||||||
combinedData = { ...combinedData, ...data };
|
combinedData = { ...combinedData, ...data };
|
||||||
const finalData = combinedData;
|
const finalData = combinedData;
|
||||||
const equipped = finalData.last_equipped || {};
|
const equipped = finalData.last_equipped || {};
|
||||||
const name = (finalData.mii && finalData.mii.name) || finalData.user_id || finalData.mii_name || "User";
|
|
||||||
const miiBlob = (finalData.mii && finalData.mii.data) || finalData.mii_data;
|
const miiBlob = (finalData.mii && finalData.mii.data) || finalData.mii_data;
|
||||||
const miiImgUrl = miiBlob ? `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(miiBlob)}&type=face&width=270` : "";
|
const parsedName = miiBlob ? extractMiiName(miiBlob) : null;
|
||||||
|
const name = parsedName || (finalData.mii && finalData.mii.name) || finalData.nickname || finalData.user_id || finalData.mii_name || "User";
|
||||||
|
|
||||||
|
const miiImgUrl = miiBlob ? `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(miiBlob)}&type=face&width=270` : "";
|
||||||
|
|
||||||
const sidebarName = document.getElementById('mii-name');
|
const sidebarName = document.getElementById('mii-name');
|
||||||
const sidebarImg = document.getElementById('mii-img');
|
const sidebarImg = document.getElementById('mii-img');
|
||||||
|
|
@ -124,7 +153,7 @@ window.loadHeader(function(headerContainer) {
|
||||||
<img class="gear-icon" src="${headImg}" />
|
<img class="gear-icon" src="${headImg}" />
|
||||||
</div>
|
</div>
|
||||||
<div class="abilities mid">
|
<div class="abilities mid">
|
||||||
<img src="${clothesSub1}" /><img src="${clothesSub2}" />" />
|
<img src="${clothesSub1}" /><img src="${clothesSub2}" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="gear-slot-small body-slot">
|
<div class="gear-slot-small body-slot">
|
||||||
|
|
@ -132,7 +161,7 @@ window.loadHeader(function(headerContainer) {
|
||||||
<img class="gear-icon" src="${clothesImg}" />
|
<img class="gear-icon" src="${clothesImg}" />
|
||||||
</div>
|
</div>
|
||||||
<div class="abilities bottom">
|
<div class="abilities bottom">
|
||||||
<img src="${headSub1}" /><img src="${headSub2}" />" />
|
<img src="${headSub1}" /><img src="${headSub2}" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="gear-slot-small shoes-slot">
|
<div class="gear-slot-small shoes-slot">
|
||||||
|
|
@ -140,7 +169,7 @@ window.loadHeader(function(headerContainer) {
|
||||||
<img class="gear-icon" src="${shoesImg}" />
|
<img class="gear-icon" src="${shoesImg}" />
|
||||||
</div>
|
</div>
|
||||||
<div class="abilities bottom-right">
|
<div class="abilities bottom-right">
|
||||||
<img src="${shoesSub1}" /><img src="${shoesSub2}" />" />
|
<img src="${shoesSub1}" /><img src="${shoesSub2}" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -16,15 +16,47 @@ window.loadHeader(function(headerContainer) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const extractMiiName = (miiDataB64) => {
|
||||||
|
try {
|
||||||
|
const binaryString = atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/'));
|
||||||
|
const data = new Uint8Array(binaryString.length);
|
||||||
|
for (let i = 0; i < binaryString.length; i++) {
|
||||||
|
data[i] = binaryString.charCodeAt(i);
|
||||||
|
}
|
||||||
|
const size = data.length;
|
||||||
|
let offset = -1;
|
||||||
|
let isBE = false;
|
||||||
|
if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A;
|
||||||
|
else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; }
|
||||||
|
else if (size === 88) offset = 0x10;
|
||||||
|
else if ([48, 68].includes(size)) offset = 0x1C;
|
||||||
|
if (offset === -1) return null;
|
||||||
|
const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le');
|
||||||
|
let end = offset;
|
||||||
|
while (end < offset + 20 && end + 1 < data.length && (data[end] !== 0 || data[end + 1] !== 0)) {
|
||||||
|
end += 2;
|
||||||
|
}
|
||||||
|
return decoder.decode(data.slice(offset, end));
|
||||||
|
} catch (e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const renderData = (data) => {
|
const renderData = (data) => {
|
||||||
if (typeof data === 'string') {
|
if (typeof data === 'string') {
|
||||||
try { data = JSON.parse(data); } catch (e) {}
|
try { data = JSON.parse(data); } catch (e) {}
|
||||||
}
|
}
|
||||||
const nameEl = document.getElementById('mii-name');
|
const nameEl = document.getElementById('mii-name');
|
||||||
const imgEl = document.getElementById('mii-img');
|
const imgEl = document.getElementById('mii-img');
|
||||||
if (nameEl) nameEl.textContent = data.nickname || data.mii.name || "User";
|
const miiBlob = (data.mii && data.mii.data) || data.mii_data;
|
||||||
if (imgEl && (data.mii && data.mii.data)) {
|
|
||||||
imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(data.mii.data)}&type=face&width=270`;
|
if (nameEl) {
|
||||||
|
const parsedName = miiBlob ? extractMiiName(miiBlob) : null;
|
||||||
|
nameEl.textContent = parsedName || (data.mii && data.mii.name) || data.nickname || data.username || "User";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (imgEl && miiBlob) {
|
||||||
|
imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(miiBlob)}&type=face&width=270`;
|
||||||
imgEl.style.display = 'block';
|
imgEl.style.display = 'block';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -39,7 +71,10 @@ window.loadHeader(function(headerContainer) {
|
||||||
renderData(data);
|
renderData(data);
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
if (!cached) document.getElementById('mii-name').textContent = "Guest";
|
if (!cached) {
|
||||||
|
const nameEl = document.getElementById('mii-name');
|
||||||
|
if (nameEl) nameEl.textContent = "Guest";
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const loadingOverlay = document.getElementById("loading-overlay");
|
const loadingOverlay = document.getElementById("loading-overlay");
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ window.loadHeader(function(headerContainer) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const logoutForm = document.getElementById("logout-form");
|
const logoutForm = document.getElementById("logout-form");
|
||||||
|
|
||||||
if (logoutForm) {
|
if (logoutForm) {
|
||||||
logoutForm.action = "/api/v1/spfn/logout";
|
logoutForm.action = "/api/v1/spfn/logout";
|
||||||
const originInput = document.getElementById("logout_frontend_origin");
|
const originInput = document.getElementById("logout_frontend_origin");
|
||||||
|
|
@ -16,6 +15,33 @@ window.loadHeader(function(headerContainer) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const extractMiiName = (miiDataB64) => {
|
||||||
|
try {
|
||||||
|
const data = Uint8Array.from(atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/')), c => c.charCodeAt(0));
|
||||||
|
const size = data.length;
|
||||||
|
let offset = -1;
|
||||||
|
let isBE = false;
|
||||||
|
|
||||||
|
if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A; // 3DS/WiiU
|
||||||
|
else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; } // Wii
|
||||||
|
else if (size === 88) offset = 0x10; // Switch CharInfo
|
||||||
|
else if ([48, 68].includes(size)) offset = 0x1C; // Switch CoreData
|
||||||
|
|
||||||
|
if (offset === -1) return null;
|
||||||
|
|
||||||
|
const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le');
|
||||||
|
let end = offset;
|
||||||
|
while (end < offset + 20 && (data[end] !== 0 || data[end + 1] !== 0)) end += 2;
|
||||||
|
return decoder.decode(data.slice(offset, end));
|
||||||
|
} catch (e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getMiiRenderUrl = (data) => {
|
||||||
|
return `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(data)}&type=face&width=270&resourceType=very_high`;
|
||||||
|
};
|
||||||
|
|
||||||
const renderData = (data) => {
|
const renderData = (data) => {
|
||||||
if (typeof data === 'string') {
|
if (typeof data === 'string') {
|
||||||
try { data = JSON.parse(data); } catch (e) { console.error(e); }
|
try { data = JSON.parse(data); } catch (e) { console.error(e); }
|
||||||
|
|
@ -23,17 +49,16 @@ window.loadHeader(function(headerContainer) {
|
||||||
|
|
||||||
const nameEl = document.getElementById('mii-name');
|
const nameEl = document.getElementById('mii-name');
|
||||||
const imgEl = document.getElementById('mii-img');
|
const imgEl = document.getElementById('mii-img');
|
||||||
|
const miiBlob = (data.mii && data.mii.data) || data.mii_data;
|
||||||
|
|
||||||
if (nameEl) {
|
if (nameEl) {
|
||||||
nameEl.textContent = (data.mii && data.mii.name) || data.nickname || data.user_id || data.username || "User";
|
const parsedName = miiBlob ? extractMiiName(miiBlob) : null;
|
||||||
|
nameEl.textContent = parsedName || (data.mii && data.mii.name) || data.nickname || data.username || "User";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (imgEl) {
|
if (imgEl && miiBlob) {
|
||||||
const miiBlob = (data.mii && data.mii.data) || data.mii_data;
|
imgEl.src = getMiiRenderUrl(miiBlob);
|
||||||
if (miiBlob) {
|
imgEl.style.display = 'block';
|
||||||
imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(miiBlob)}&type=face&width=270`;
|
|
||||||
imgEl.style.display = 'block';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,21 +21,48 @@ window.loadHeader(function(headerContainer) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const extractMiiName = (miiDataB64) => {
|
||||||
|
try {
|
||||||
|
const binaryString = atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/'));
|
||||||
|
const data = new Uint8Array(binaryString.length);
|
||||||
|
for (let i = 0; i < binaryString.length; i++) {
|
||||||
|
data[i] = binaryString.charCodeAt(i);
|
||||||
|
}
|
||||||
|
const size = data.length;
|
||||||
|
let offset = -1;
|
||||||
|
let isBE = false;
|
||||||
|
if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A;
|
||||||
|
else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; }
|
||||||
|
else if (size === 88) offset = 0x10;
|
||||||
|
else if ([48, 68].includes(size)) offset = 0x1C;
|
||||||
|
if (offset === -1) return null;
|
||||||
|
const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le');
|
||||||
|
let end = offset;
|
||||||
|
while (end < offset + 20 && end + 1 < data.length && (data[end] !== 0 || data[end + 1] !== 0)) {
|
||||||
|
end += 2;
|
||||||
|
}
|
||||||
|
return decoder.decode(data.slice(offset, end));
|
||||||
|
} catch (e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const renderData = (data) => {
|
const renderData = (data) => {
|
||||||
if (typeof data === 'string') {
|
if (typeof data === 'string') {
|
||||||
try { data = JSON.parse(data); } catch (e) { console.error(e); }
|
try { data = JSON.parse(data); } catch (e) { console.error(e); }
|
||||||
}
|
}
|
||||||
const nameEl = document.getElementById('mii-name');
|
const nameEl = document.getElementById('mii-name');
|
||||||
const imgEl = document.getElementById('mii-img');
|
const imgEl = document.getElementById('mii-img');
|
||||||
|
const miiBlob = (data.mii && data.mii.data) || data.mii_data;
|
||||||
|
|
||||||
if (nameEl) {
|
if (nameEl) {
|
||||||
nameEl.textContent = (data.mii && data.mii.name) || data.nickname || data.user_id || data.username || "User";
|
const parsedName = miiBlob ? extractMiiName(miiBlob) : null;
|
||||||
|
nameEl.textContent = parsedName || (data.mii && data.mii.name) || data.nickname || data.user_id || data.username || "User";
|
||||||
}
|
}
|
||||||
if (imgEl) {
|
|
||||||
const miiBlob = (data.mii && data.mii.data) || data.mii_data;
|
if (imgEl && miiBlob) {
|
||||||
if (miiBlob) {
|
imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(miiBlob)}&type=face&width=270`;
|
||||||
imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(miiBlob)}&type=face&width=270`;
|
imgEl.style.display = 'block';
|
||||||
imgEl.style.display = 'block';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue