1 files changed, 19 insertions, 45 deletions

diff --git a/src/mojang.ts b/src/mojang.ts
index 61e5b55..ce5b0bb 100644
--- a/src/mojang.ts
+++ b/src/mojang.ts
@@ -21,7 +21,7 @@ interface MojangApiResponse {
 /**
  * Get mojang api data from the session server
  */
-export async function mojangDataFromUuid(uuid: string): Promise<MojangApiResponse> {
+export async function profileFromUuid(uuid: string): Promise<MojangApiResponse> {
 	const fetchResponse = await fetch(
 		// using mojang directly is faster than ashcon lol, also mojang removed the ratelimits from here
 		`https://sessionserver.mojang.com/session/minecraft/profile/${undashUuid(uuid)}`,
@@ -32,10 +32,7 @@ export async function mojangDataFromUuid(uuid: string): Promise<MojangApiRespons
 		data = await fetchResponse.json()
 	} catch {
 		// if it errors, just return null
-		return {
-			uuid: null,
-			username: null
-		}
+		return { uuid: null, username: null }
 	}
 	return {
 		uuid: data.id,
@@ -44,51 +41,28 @@ export async function mojangDataFromUuid(uuid: string): Promise<MojangApiRespons
 }
 
 
-export async function uuidFromUsername(username: string): Promise<string> {
+export async function profileFromUsername(username: string): Promise<MojangApiResponse> {
 	// since we don't care about anything other than the uuid, we can use /uuid/ instead of /user/
 	const fetchResponse = await fetch(
-		`https://api.ashcon.app/mojang/v2/uuid/${username}`,
+		`https://api.mojang.com/users/profiles/minecraft/${username}`,
 		{ agent: () => httpsAgent }
 	)
-	const userUuid = await fetchResponse.text()
-	return userUuid.replace(/-/g, '')
-}
-
-export async function usernameFromUuid(uuid: string): Promise<string> {
-	const userJson = await mojangDataFromUuid(uuid)
-	return userJson.username
-}
-
-
-
-
-/**
- * Fetch the uuid from a user
- * @param user A user can be either a uuid or a username 
- */
-export async function uuidFromUser(user: string): Promise<string> {
-	if (isUuid(user))
-		// already a uuid, just return it undashed
-		return undashUuid(user)
-	else
-		return await uuidFromUsername(user)
+	let data
+	try {
+		data = await fetchResponse.json()
+	} catch {
+		return { uuid: null, username: null }
+	}
+	return {
+		uuid: data.id,
+		username: data.name
+	}
 }
 
 
-export async function mojangDataFromUser(user: string): Promise<MojangApiResponse> {
-	if (!isUuid(user))
-		return await mojangDataFromUuid(await uuidFromUsername(user))
-	else
-		return await mojangDataFromUuid(user)
+export async function profileFromUser(user: string): Promise<MojangApiResponse> {
+	if (isUuid(user)) {
+		return await profileFromUuid(user)
+	} else
+		return await profileFromUsername(user)
 }
-
-/**
- * Fetch the username from a user
- * @param user A user can be either a uuid or a username 
- */
-export async function usernameFromUser(user: string): Promise<string> {
-	// we do this to fix the capitalization
-	const data = await mojangDataFromUser(user)
-	return data.username
-}
-