Merge pull request #809 from alanbixby/getCurrentUserRedirect

Fix getCurrentUser redirect error for localized languages
noblox · Jun 14, 2024 · 1e0ba5d · 1e0ba5d
2 parents 5546771 + 5b8a3a9
commit 1e0ba5d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/lib/games/publishToTopic.js b/lib/games/publishToTopic.js
@@ -20,35 +20,34 @@ exports.optional = ['jar']
 
 function publishToTopic (universeId, topic, data, jar) {
   return new Promise((resolve, reject) => {
-
     const httpOpt = {
       url: `//apis.roblox.com/messaging-service/v1/universes/${universeId}/topics/${topic}`,
-        options: {
-          json: true,
-          resolveWithFullResponse: true,
-          jar,
-          method: 'POST',
-          body: { message: JSON.stringify(data) },
-          headers: {
-            'Content-Type': 'application/json'
-          }
+      options: {
+        json: true,
+        resolveWithFullResponse: true,
+        jar,
+        method: 'POST',
+        body: { message: JSON.stringify(data) },
+        headers: {
+          'Content-Type': 'application/json'
         }
+      }
     }
 
-  return http(httpOpt)
-    .then(function (res) {
-      if (res.statusCode === 200) {
-        resolve(true)
-      } else {
-        if (typeof(res.body) === "string") {
-          reject(new Error(`[${res.statusCode}] ${res.statusMessage} ${res.body}`))
+    return http(httpOpt)
+      .then(function (res) {
+        if (res.statusCode === 200) {
+          resolve(true)
         } else {
-          const data = Object.assign(res.body)
-          reject(new Error(`[${res.statusCode}] ${data.Error} ${data.Message}`))
+          if (typeof (res.body) === 'string') {
+            reject(new Error(`[${res.statusCode}] ${res.statusMessage} ${res.body}`))
+          } else {
+            const data = Object.assign(res.body)
+            reject(new Error(`[${res.statusCode}] ${data.Error} ${data.Message}`))
+          }
         }
-      }
-    })
-    .catch(reject)
+      })
+      .catch(reject)
   })
 }
 

diff --git a/lib/util/getCurrentUser.js b/lib/util/getCurrentUser.js
@@ -25,7 +25,7 @@ exports.func = async function (args) {
     options: {
       resolveWithFullResponse: true,
       method: 'GET',
-      followRedirect: false,
+      followRedirect: true,
       jar
     }
   }