Commit fdf719a9 authored by nanahira's avatar nanahira

fix avatar loading

parent 01cf4d88
Pipeline #6727 failed with stages
in 1 minute and 43 seconds
...@@ -6,9 +6,9 @@ import { CutData } from "./utility"; ...@@ -6,9 +6,9 @@ import { CutData } from "./utility";
async function getRealUsername(originalUsername: string) { async function getRealUsername(originalUsername: string) {
try { try {
const { user: { name, username } } = (await axios.get(`https://ygobbs.com/users/${encodeURIComponent(originalUsername)}.json`, { const { data: {user: { name, username }} } = (await axios.get(`https://ygobbs.com/users/${encodeURIComponent(originalUsername)}.json`, {
responseType: "json" responseType: "json"
})).data; }));
return [name, username]; return [name, username];
} catch (e) { } catch (e) {
console.error(`User ${originalUsername} not found: ${e.toString()}`); console.error(`User ${originalUsername} not found: ${e.toString()}`);
...@@ -16,12 +16,12 @@ async function getRealUsername(originalUsername: string) { ...@@ -16,12 +16,12 @@ async function getRealUsername(originalUsername: string) {
} }
} }
async function getAvatarURL(usernames: string[]) { async function getAvatarURL(usernames: string[]): Promise<string> {
for (let username of usernames) { for (const username of usernames) {
try { try {
const { data: avatar } = (await axios.get(`https://api.moecube.com/accounts/users/${encodeURIComponent(username)}.json`, { const { data: { user: { avatar } } } = (await axios.get(`https://api.moecube.com/accounts/users/${encodeURIComponent(username)}.json`, {
responseType: "json" responseType: "json"
})).data; }));
if (avatar?.match(/^http(s)?:\/\//)) { if (avatar?.match(/^http(s)?:\/\//)) {
return avatar; return avatar;
} }
...@@ -33,8 +33,8 @@ async function getAvatarURL(usernames: string[]) { ...@@ -33,8 +33,8 @@ async function getAvatarURL(usernames: string[]) {
} }
async function getURLFromUsername(username: string) { async function getURLFromUsername(username: string) {
const possibleNames = await getRealUsername(username); //const possibleNames = await getRealUsername(username);
return await getAvatarURL(possibleNames); return await getAvatarURL([username]);
} }
interface QueryResult{ interface QueryResult{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment