fix username loading

src/avatar.ts

@@ -3,13 +3,14 @@ import mysql, { ConnectionConfig } from "promise-mysql";
 import axios from "axios";
 import { Processor } from "./processor";
 import { CutData } from "./utility";
+import _ from 'underscore';
 
 async function getRealUsername(originalUsername: string) {
 	try {
 		const { data: {user: { name, username }} } = (await axios.get(`https://ygobbs.com/users/${encodeURIComponent(originalUsername)}.json`, {
 			responseType: "json"
 		}));
-		return [name, username];
+		return _.uniq([originalUsername, username, name]);
 	} catch (e) {
 		console.error(`User ${originalUsername} not found: ${e.toString()}`);
 		return [originalUsername];
@@ -19,10 +20,11 @@ async function getRealUsername(originalUsername: string) {
 async function getAvatarURL(usernames: string[]): Promise<string> {
 	for (const username of usernames) {
 		try {
-			const { data: { user: { avatar } } } = (await axios.get(`https://api.moecube.com/accounts/users/${encodeURIComponent(username)}.json`, {
+			const { data: { user: { avatar: _avatar } } } = (await axios.get(`https://api.moecube.com/accounts/users/${encodeURIComponent(username)}.json`, {
 				responseType: "json"
 			}));
-			if (avatar?.match(/^http(s)?:\/\//)) {
+			const avatar = _avatar as string;
+			if (avatar?.match(/^http(s)?:\/\//) && !avatar.endsWith('default_avatar.jpg')) {
 				return avatar;
 			}
 		} catch (e) { 
@@ -33,8 +35,8 @@ async function getAvatarURL(usernames: string[]): Promise<string> {
 }
 
 async function getURLFromUsername(username: string) {
-	//const possibleNames = await getRealUsername(username);
-	return getAvatarURL([username]);
+	const possibleNames = await getRealUsername(username);
+	return getAvatarURL(possibleNames);
 }
 
 interface QueryResult{