Change username -> uuid provider

- Experimental
slothpixel · Mar 23, 2021 · 39753d5 · 39753d5
1 parent c4b5d52
commit 39753d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/store/getUUID.js b/store/getUUID.js
@@ -18,15 +18,15 @@ async function getUUID(name) {
   }
 
   return cachedFunction(`uuid:${name.toLowerCase()}`, async () => {
-    const url = `https://api.ashcon.app/mojang/v1/user/${name}`;
+    const url = `https://playerdb.co/api/player/minecraft/${name}`;
 
-    const data = await getData(redis, url);
-    if (!data) {
+    const response = await getData(redis, url);
+    if (!response) {
       throw new Error('Invalid username!');
     }
 
-    const { uuid } = JSON.parse(data);
-    return removeDashes(uuid);
+    const { data } = response;
+    return data.player.raw_id;
   }, { cacheDuration: config.UUID_CACHE_SECONDS, shouldCache: config.ENABLE_UUID_CACHE });
 }
 

diff --git a/util/utility.js b/util/utility.js
@@ -320,15 +320,15 @@ const getData = fromPromise(async (redis, url) => {
 
   const urlData = urllib.parse(url.url, true);
   const isHypixelApi = urlData.host === 'api.hypixel.net';
-  const isMojangApi = urlData.host === 'api.mojang.com';
+  const isMojangApi = urlData.host === 'playerdb.co';
 
   const target = urllib.format(urlData);
 
   logger.info(`getData: ${target}`);
 
   try {
     const { body } = await got(target, {
-      responseType: isHypixelApi ? 'json' : 'text',
+      responseType: 'json',
       timeout: url.timeout,
       retry: url.retries,
       hooks: {
@@ -346,6 +346,9 @@ const getData = fromPromise(async (redis, url) => {
                 logger.error(error);
               }
             }
+            if (isMojangApi) {
+              throw new Error('Failed to get player uuid');
+            }
           },
         ],
       },
@@ -356,9 +359,6 @@ const getData = fromPromise(async (redis, url) => {
     if (url.noRetry) {
       throw new Error('Invalid response');
     }
-    if (isMojangApi) {
-      throw new Error('Failed to get player uuid');
-    }
     if (error.response && error.response.statusCode) {
       switch (error.response.statusCode) {
         case 404: