gj-boomlings-api 1.4.2 → 1.4.4

package/README.md

@@ -1,6 +1,6 @@
 <div align="center">
   <h1>
-    <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://shikoshib.github.io/font1.png" width="576"></a>
+    <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://shikoshib.github.io/font1.png" width="500"></a>
   </h1>
   A light-weight Geometry Dash API wrapper<br><br><a href="https://github.com/shikoshib/gj-boomlings-api/wiki"><b>Documentation</b></a><br><br>
   <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://img.shields.io/npm/v/gj-boomlings-api.svg?maxAge=3600" alt="npm version" /></a>

package/config.json

@@ -5,6 +5,6 @@
         "Accept-Encoding":"*",
         "Accept":"*/*"
     },
-    "server":"https://www.boomlings.com/database/",
+    "server":"http://www.boomlings.com/database/",
     "secret":"Wmfd2893gb7"
 }

package/functions/blockUser.js

@@ -1,11 +1,12 @@
 module.exports = {
     blockUser:
         async function(target, username, password) {
-            if(!target || target == "") throw new Error("Please provide a target's player ID or username!");
-            if(!username || username == "") throw new Error("Please provide your player ID or username!");
-            if(!password || password == "") throw new Error("Please provide your password!");
+            if(!target) throw new Error("Please provide a target's player ID or username!");
+            if(!username) throw new Error("Please provide your player ID or username!");
+            if(!password) throw new Error("Please provide your password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(username);
@@ -14,9 +15,6 @@ module.exports = {
             const {gjp} = require("../misc/gjp.js");
 
             const data = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 secret: "Wmfd2893gb7",
                 targetAccountID: targetObj.accountID,
                 accountID: user.accountID,
@@ -26,6 +24,9 @@ module.exports = {
             let res = await gjReq("blockGJUser20", data);
             if(res.data == -1) throw new Error(-1);
 
+            if(res.data.startsWith("error code")) res = await gjWReq("blockUser", `${target}?user=${username}&password=${password}`);
+            if(res.status == 403) throw new Error(res.data.error);
+
             return 1;
         }
 }

package/functions/deleteAccountPost.js

@@ -1,11 +1,12 @@
 module.exports = {
     deleteAccountPost:
         async function(id, str, password) {
-            if(!id || id == "") throw new Error("Please provide an account post ID!");
-            if(!str || str == "") throw new Error("Please provide a user ID or name!");
-            if(!password || password == "") throw new Error("Please provide a password!");
+            if(!id) throw new Error("Please provide an account post ID!");
+            if(!str) throw new Error("Please provide a user ID or name!");
+            if(!password) throw new Error("Please provide a password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(str);
@@ -14,9 +15,6 @@ module.exports = {
             const xor = new XOR();
 
             let data = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 accountID: user.accountID,
                 secret: "Wmfd2893gb7",
                 gjp: xor.encrypt(password, 37526),
@@ -26,6 +24,9 @@ module.exports = {
             let res = await gjReq("deleteGJAccComment20", data);
             if(res.data == -1) throw new Error(-1);
 
+            if(res.data.startsWith("error code")) res = await gjWReq("deleteAccountPost", `?id=${id}&user=${str}&password=${password}`);
+            if(res.status == 403) throw new Error(res.data.error);
+
             return 1;
         }
 }

package/functions/deleteComment.js

@@ -1,12 +1,13 @@
 module.exports = {
     deleteComment:
         async function(id, lvl, str, password) {
-            if(!id || id == "") throw new Error("Please provide a comment ID!");
-            if(!lvl || lvl == "") throw new Error("Please provide a level ID!");
-            if(!str || str == "") throw new Error("Please provide a user ID or name!");
-            if(!password || password == "") throw new Error("Please provide a password!");
+            if(!id) throw new Error("Please provide a comment ID!");
+            if(!lvl) throw new Error("Please provide a level ID!");
+            if(!str) throw new Error("Please provide a user ID or name!");
+            if(!password) throw new Error("Please provide a password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(str);

package/functions/deleteLevel.js

@@ -1,11 +1,12 @@
 module.exports = {
     deleteLevel:
         async function(lvl, str, password) {
-            if(!lvl || lvl == "") throw new Error("Please provide a level ID!");
-            if(!str || str == "") throw new Error("Please provide a user ID or name!");
-            if(!password || password == "") throw new Error("Please provide a password!");
+            if(!lvl) throw new Error("Please provide a level ID!");
+            if(!str) throw new Error("Please provide a user ID or name!");
+            if(!password) throw new Error("Please provide a password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
             const {gjp} = require("../misc/gjp.js");
 
@@ -21,6 +22,9 @@ module.exports = {
             let res = await gjReq("deleteGJLevelUser20", data);
             if(res.data == -1) throw new Error(-1);
 
-            return 1;
+            if(res.data.startsWith("error code")) res = await gjWReq("deleteLevel", `${lvl}?user=${str}&password=${password}`);
+            if(res.status == 403) throw new Error(res.data.error);
+
+            return res.data;
         }
 }

package/functions/dlLevel.js

@@ -3,19 +3,17 @@ module.exports = {
         async function(level) {
             const {decB64} = require("../misc/decB64.js");
             const zlib = require("zlib");
-            if(!level || level == "") throw new Error("Please provide a level ID.");
+            if(!level) throw new Error("Please provide a level ID.");
             if(isNaN(level)) throw new Error("The level parameter should be a number.");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { server } = require("../config.json");
 
             const XOR = require("../misc/xor.js");
             let xor = new XOR()
 
             const data = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 levelID: level.toString().trim(),
                 secret: "Wmfd2893gb7"
             }
@@ -23,6 +21,12 @@ module.exports = {
             let res = await gjReq('downloadGJLevel22', data);
             if(res.data == -1) throw new Error("-1 This level is not found.");
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("dlLevel", level);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             let spl = res.data.split(":");
             let levelInfo = [];
             for(let i =0;i<spl.length;i++) {
@@ -60,23 +64,7 @@ module.exports = {
 
             let disliked = likes.includes("-") ? true : false;
 
-            if(verifiedCoins == "0") verifiedCoins = false;
-            if(verifiedCoins == "1") verifiedCoins = true;
-
-            let demonBoolDecoding = {
-                '1': true,
-                '': false,
-                '0': false
-            }
-
-            let featuredDecoding = {
-                "0": false,
-                "1": true,
-                undefined: true
-            }
-
-            let featured = featuredDecoding[ftrd];
-            if(featured == undefined) featured = true;
+            let featured = Boolean(Number(ftrd));
 
             let difficultyDecoding = {
                 "-10": "Auto",
@@ -88,7 +76,7 @@ module.exports = {
                 "50": "Insane"
             }
 
-            if(demonBoolDecoding[demonBool] == true) {
+            if(Boolean(Number(demonBool))) {
                 difficultyDecoding = {
                     "10": "Easy Demon",
                     "20": "Medium Demon",
@@ -147,20 +135,20 @@ module.exports = {
                 disliked: disliked,
                 length: lengthDecoding[length],
                 password: password, 
-                demon: demonBoolDecoding[demonBool],
+                demon: Boolean(Number(demonBool)),
                 featured: featured,
-                epic: demonBoolDecoding[epic],
+                epic: Boolean(Number(epic)),
                 objects: objects,
                 uploaded: uploaded,
                 updated: updated,
                 stars_requested: Number(starsRequested),
                 game_version: decodeGameVersion[gameVersion],
-                ldm: demonBoolDecoding[ldm],
+                ldm: Boolean(Number(ldm)),
                 copied: Number(copiedID),
                 large: Number(objs) > 40000 ? true : false,
-                two_p: demonBoolDecoding[twoPlayer],
+                two_p: Boolean(Number(twoPlayer)),
                 coins: Number(coins),
-                verified_coins: verifiedCoins,
+                verified_coins: Boolean(Number(verifiedCoins)),
                 song: getLvl.song,
             }
             

package/functions/dlMessage.js

@@ -1,12 +1,13 @@
 module.exports = {
     dlMessage: 
         async function(id, user, pass) {
-            if(!id || id == "") throw new Error("Please provide a message ID!");
+            if(!id) throw new Error("Please provide a message ID!");
             if(Number(id) == NaN) throw new Error("The message ID should be a number!");
-            if(!user || user == "") throw new Error("Please provide your player ID or username!");
-            if(!pass || pass == "") throw new Error("Please provide your password!");
+            if(!user) throw new Error("Please provide your player ID or username!");
+            if(!pass) throw new Error("Please provide your password!");
             
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const {secret} = require("../config.json");
             const { searchUsers } = require("./searchUsers.js");
             const {gjp} = require("../misc/gjp.js");
@@ -24,6 +25,12 @@ module.exports = {
             let res = await gjReq("downloadGJMessage20", data);
             if(res.data == -1) throw new Error(-1);
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("dlMessage", `${id}?user=${user}&password=${pass}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             return decMessage(res.data);
         }
 }

package/functions/getAccountPosts.js

@@ -1,17 +1,15 @@
 module.exports = {
     getAccountPosts:
         async function(str, page = 1) {
-            if(!str || str == "") throw new Error("Please provide a user ID or name!");
+            if(!str) throw new Error("Please provide a user ID or name!");
             const { decodeAccountPost } = require("../misc/decodeAccountPost.js");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(str);
 
             let ACdata = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 accountID: user.accountID,
                 secret: "Wmfd2893gb7",
                 page: page - 1
@@ -20,6 +18,12 @@ module.exports = {
             let res = await gjReq("getGJAccountComments20", ACdata);
             if(res.data == -1) throw new Error("-1 Not found.");
             if(res.data.startsWith("#")) throw new Error("Whoops! Couldn't find anything!");
+
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getAccountPosts", `${str}?page=${page}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
             
             let accPosts = res.data.split("|");
             let result = [];

package/functions/getBlockedList.js

@@ -1,10 +1,11 @@
 module.exports = {
     getBlockedList:
         async function(str, pass) {
-            if(!str || str == "") throw new Error("Please provide your player ID or username!");
-            if(!pass || pass == "") throw new Error("Please provide your password!");
+            if(!str) throw new Error("Please provide your player ID or username!");
+            if(!pass) throw new Error("Please provide your password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const {gjp} = require("../misc/gjp.js");
             const { searchUsers } = require("./searchUsers.js");
 
@@ -20,6 +21,12 @@ module.exports = {
             let res = await gjReq("getGJUserList20", data);
             if(res.data == -1) throw new Error(-1);
             if(res.data == -2) throw new Error("No players have been found in the blocklist.");
+
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getBlockedList", `${str}?password=${pass}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
             
             let players = res.data.split("|");
             let result = [];

package/functions/getCommentHistory.js

@@ -1,11 +1,12 @@
 module.exports = {
     getCommentHistory:
         async function(str, page = 1, mode = 1) {
-            if(!str || str == "") throw new Error("Please provide a player ID or name!");
+            if(!str) throw new Error("Please provide a player ID or name!");
             if(page && isNaN(page)) throw new Error("Please provide a page!");
             if(mode && isNaN(mode)) throw new Error("Please provide a mode ID! 0 for recent, 1 for most liked.");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const {decCommentFromHistory} = require("../misc/decCommentFromHistory.js");
             const {getProfile} = require("./getProfile.js");
             
@@ -13,9 +14,6 @@ module.exports = {
             if(user.commentHistory != "all") throw new Error("Whoops! This user has disabled viewing his comment history!");
 
             const CHData = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 secret: "Wmfd2893gb7",
                 userID: user.playerID,
                 page: Number(page) - 1,
@@ -24,6 +22,12 @@ module.exports = {
 
             let res = await gjReq("getGJCommentHistory", CHData);
             if(res.data == -1) throw new Error("-1 Not found.");
+
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getCommentHistory", `${str}?page=${page}&mode=${mode}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
             
             let comments = res.data.split("|");
             let result = [];

package/functions/getComments.js

@@ -1,11 +1,12 @@
 module.exports = {
     getComments:
         async function(level, page = 1, mode = 1) {
-            if(!level || level == "") throw new Error("Please provide a level ID!");
+            if(!level) throw new Error("Please provide a level ID!");
             if(isNaN(level)) throw new Error("A level ID should be a number.");
             if(mode && isNaN(mode)) throw new Error("Please provide a mode ID! 0 for recent, 1 for most liked.");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { decodeGJComment } = require("../misc/decodeGJComment.js");
 
             const data = {
@@ -13,13 +14,16 @@ module.exports = {
                 page: Number(page) - 1,
                 mode: Number(mode),
                 secret: "Wmfd2893gb7",
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0
             }
 
             let res = await gjReq("getGJComments21", data);
             if(res.data.startsWith("#")) throw new Error("-1 No comments have been found.");
+
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getComments", `${level}?page=${page}&mode=${mode}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
             
             let comments = res.data.split("|");
             let result = [];

package/functions/getCreatorScores.js

@@ -3,6 +3,7 @@ module.exports = {
         async function() {
             const { decScoresUser } = require("../misc/decScoresUser.js");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { secret } = require("../config.json");
 
             const data = {
@@ -12,9 +13,13 @@ module.exports = {
             }
 
             let res = await gjReq("getGJScores20", data);
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getCreatorScores");
+                return res.data;
+            }
 
             let players = res.data.split("|");
-            let emptyElem = players.indexOf(100);
+            let emptyElem = players[100];
 
             players.splice(emptyElem, 1);
 

package/functions/getFriendsList.js

@@ -1,10 +1,11 @@
 module.exports = {
     getFriendsList:
         async function(str, pass) {
-            if(!str || str == "") throw new Error("Please provide your player ID or username!");
-            if(!pass || pass == "") throw new Error("Please provide your password!");
+            if(!str) throw new Error("Please provide your player ID or username!");
+            if(!pass) throw new Error("Please provide your password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const {gjp} = require("../misc/gjp.js");
             const { searchUsers } = require("./searchUsers.js");
 
@@ -17,6 +18,15 @@ module.exports = {
             }
 
             let res = await gjReq("getGJUserList20", data);
+            if(res.data == -1) throw new Error(-1);
+            if(res.data == -2) throw new Error("No players have been found in the friends list.");
+
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getFriendsList", `${str}?password=${pass}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+            
             let players = res.data.split("|");
             let result = [];
 

package/functions/getGauntlets.js

@@ -2,16 +2,18 @@ module.exports = {
     getGauntlets: 
         async function() {
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { decodeGJGauntlet } = require("../misc/decodeGJGauntlet.js")
 
             const data = {
-                secret: "Wmfd2893gb7",
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0
+                secret: "Wmfd2893gb7"
             }
 
             let res = await gjReq("getGJGauntlets21", data)
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getGauntlets");
+                return res.data;
+            }
 
             let gauntlets = res.data.split("|");
             let result = [];

package/functions/getLevelByID.js

@@ -1,25 +1,29 @@
 module.exports = {
     getLevelByID:
         async function(id) {
-            if(!id || id == "") throw new Error("Please provide a level ID!");
+            if(!id) throw new Error("Please provide a level ID!");
             if(isNaN(id)) throw new Error("The level ID should be a number!");
 
             const {decodeLevel} = require("../misc/decodeLevel.js");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const {secret} = require("../config.json");
 
             const data = {
                 secret: secret,
                 str: id,
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 type: 0
             }
 
             let res = await gjReq("getGJLevels21", data);
             if(res.data == -1) throw new Error("-1 Not found.");
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getLevelByID", id);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             return await decodeLevel(res.data);
         }
 }

package/functions/getMapPacks.js

@@ -4,6 +4,7 @@ module.exports = {
             const { decodeMapPack } = require("../misc/decodeMapPack.js");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const data = {
                 secret: "Wmfd2893gb7",
                 page: Number(page) - 1
@@ -12,6 +13,12 @@ module.exports = {
             let res = await gjReq("getGJMapPacks21", data);
             if(res.data.startsWith("#")) throw new Error("-1 Not found.");
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getMapPacks", page);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             let packs = res.data.split("|");
             let result = [];
             packs.forEach(p => {

package/functions/getMessages.js

@@ -1,11 +1,12 @@
 module.exports = {
     getMessages: 
         async function(user, pass, page = 1) {
-            if(!user || user == "") throw new Error("Please provide your player ID or username!");
-            if(!pass || pass == "") throw new Error("Please provide your password!");
+            if(!user) throw new Error("Please provide your player ID or username!");
+            if(!pass) throw new Error("Please provide your password!");
             if(Number(page) == NaN) throw new Error("The page should be a number!");
             
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const {secret} = require("../config.json");
             const {gjp} = require("../misc/gjp.js");
             const {decMsg} = require("../misc/decMsg.js");
@@ -23,6 +24,12 @@ module.exports = {
             let res = await gjReq("getGJMessages20", data);
             if(res.data == -1) throw new Error(-1);
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getMessages", `${user}?password=${pass}&page=${page}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             let msgs = res.data.split("|");
             let result = [];
             msgs.forEach(m => {

package/functions/getOfficialSongInfo.js

@@ -1,7 +1,7 @@
 module.exports = {
     getOfficialSongInfo:
         function(song) {
-            if(!song || song == "") throw new Error("Please provide a song ID.");
+            if(!song) throw new Error("Please provide a song ID.");
             if(isNaN(song)) throw new Error("A song ID must be a number.");
                 const {
                     sm,

package/functions/getProfile.js

@@ -1,16 +1,14 @@
 module.exports = {
     getProfile:
         async function(str) {
-            if(!str || str == "") throw new Error("Please provide a user ID or name!");
+            if(!str) throw new Error("Please provide a user ID or name!");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(str);
 
             let data = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 targetAccountID: user.accountID,
                 secret: "Wmfd2893gb7"
             };
@@ -18,6 +16,12 @@ module.exports = {
             let res = await gjReq("getGJUserInfo20", data);
             if(res.data == -1) throw new Error("-1 This user is not found.");
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getProfile", str);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             let spl = res.data.split(':');
             let userInfo = [];
             for(let i =0;i<spl.length;i++) {

package/functions/getSongInfo.js

@@ -1,9 +1,10 @@
 module.exports = {
     getSongInfo:
         async function(song) {
-            if(!song || song == "") throw new Error("Please provide a song ID.");
+            if(!song) throw new Error("Please provide a song ID.");
             if(isNaN(song)) throw new Error("A song ID must be a number.")
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
 
             const data = {
                 songID: song,
@@ -13,6 +14,12 @@ module.exports = {
             let res = await gjReq('getGJSongInfo', data);
             if(res.data == -2) throw new Error(`-2. Couldn't find a song with ID ${song}.`)
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getSongInfo", song);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             const result = {
                 "name": res.data.split("|~2~|~")[1].split("~|~3~|~")[0],
                 "id": Number(res.data.split("1~|~")[1].split("~|~2~|")[0]),

package/functions/getTop100.js

@@ -3,6 +3,7 @@ module.exports = {
         async function() {
             const { decScoresUser } = require("../misc/decScoresUser.js");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { secret } = require("../config.json");
 
             const data = {
@@ -12,6 +13,7 @@ module.exports = {
             }
 
             let res = await gjReq("getGJScores20", data);
+            if(res.data.startsWith("error code")) res = await gjWReq("getTop100");
 
             let players = res.data.split("|");
             let emptyElem = players.indexOf(100);

package/functions/getUserLevels.js

@@ -1,9 +1,10 @@
 module.exports = {
     getUserLevels:
         async function(str, page = 1) {
-            if(!str || str == "") throw new Error("Please provide a username or player ID!");
+            if(!str) throw new Error("Please provide a username or player ID!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { secret } = require("../config.json");
             const { decodeLevelRes } = require("../misc/decodeLevelRes.js");
             const { searchUsers } = require("./searchUsers.js");
@@ -18,7 +19,13 @@ module.exports = {
                 page: Number(page) - 1
             }
 
-            let res = await gjReq("getGJLevels21", data)
+            let res = await gjReq("getGJLevels21", data);
+
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("getUserLevels", `${str}?page=${page}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
 
             let levels = res.data.split("#")[0].split("|");
             let creators = res.data.split("#")[1].split("|");

package/functions/reportLevel.js

@@ -1,10 +1,11 @@
 module.exports = {
     reportLevel:
         async function(level) {
-            if(!level || level == "") throw new Error("Please provide a level ID.");
+            if(!level) throw new Error("Please provide a level ID.");
             if(isNaN(Number(level))) throw new Error("The level ID should be a number.");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
 
             const data = {
                 levelID: level.toString().trim(),
@@ -12,6 +13,7 @@ module.exports = {
             }
 
             let res = await gjReq("reportGJLevel", data);
+            if(res.data.startsWith("error code")) res = await gjWReq("reportLevel", id);
 
             return res.data;
         }

package/functions/searchLevels.js

@@ -2,6 +2,7 @@ module.exports = {
     searchLevels:
         async function(query, page = 1) {
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { secret } = require("../config.json");
 
             const { decodeLevelRes } = require("../misc/decodeLevelRes.js");
@@ -15,6 +16,12 @@ module.exports = {
 
             let res = await gjReq("getGJLevels21", data)
 
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("searchLevels", `${query}?page=${page}`);
+                if(res.status == 403) throw new Error(res.data.error);
+                return res.data;
+            }
+
             let levels = res.data.split("#")[0].split("|");
             let creators = res.data.split("#")[1].split("|");
             let songs = res.data.split("#")[2].split(":");

package/functions/searchUsers.js

@@ -1,9 +1,9 @@
 module.exports = {
     searchUsers:
         async function(str) {
-            if(!str || str == '') throw new Error("Please provide a query!");
-
+            if(!str) throw new Error("Please provide a query!");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { decodeUserResult } = require("../misc/decodeUserResult.js");
 
             let res = await gjReq("getGJUsers20", {
@@ -11,7 +11,11 @@ module.exports = {
                 secret: "Wmfd2893gb7"
             })
 
-            if(res.data == -1) throw new Error(`Couldn't find a "${str}" user.`)
+            if(res.data == -1) throw new Error(`Couldn't find a "${str}" user.`);
+            if(res.data.startsWith("error code")) {
+                res = await gjWReq("searchUsers", str);
+                if(res.status == 403) throw new Error(res.data.error);
+            }
 
             return decodeUserResult(res.data);
         }

package/functions/unblockUser.js

@@ -1,11 +1,12 @@
 module.exports = {
     unblockUser:
         async function(target, username, password) {
-            if(!target || target == "") throw new Error("Please provide a target's player ID or username!");
-            if(!username || username == "") throw new Error("Please provide your player ID or username!");
-            if(!password || password == "") throw new Error("Please provide your password!");
+            if(!target) throw new Error("Please provide a target's player ID or username!");
+            if(!username) throw new Error("Please provide your player ID or username!");
+            if(!password) throw new Error("Please provide your password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(username);
@@ -14,9 +15,6 @@ module.exports = {
             const {gjp} = require("../misc/gjp.js");
 
             const data = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 secret: "Wmfd2893gb7",
                 targetAccountID: targetObj.accountID,
                 accountID: user.accountID,
@@ -26,6 +24,9 @@ module.exports = {
             let res = await gjReq("unblockGJUser20", data)
             if(res.data == -1) throw new Error(-1);
 
+            if(res.data.startsWith("error code")) res = await gjWReq("unblockUser", `${target}?user=${username}&password=${password}`);
+            if(res.status == 403) throw new Error(res.data.error);
+
             return 1;
         }
 }

package/functions/updateLevelDesc.js

@@ -3,13 +3,14 @@ module.exports = {
         async function(level, d, user, password) {
             let desc = d;
 
-            if(!level || level == "") throw new Error("Please provide a level ID!");
+            if(!level) throw new Error("Please provide a level ID!");
             if(Number(level) == NaN) throw new Error("A level ID must be a number!");
             if(!desc) desc = "(No description provided)";
-            if(!user || user == "") throw new Error("Please provide a user ID or name!");
-            if(!password || password == "") throw new Error("Please provide a password!");
+            if(!user) throw new Error("Please provide a user ID or name!");
+            if(!password) throw new Error("Please provide a password!");
 
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { secret } = require("../config.json");
             const { searchUsers } = require("./searchUsers.js");
 
@@ -29,6 +30,9 @@ module.exports = {
             let res = await gjReq("updateGJDesc20", uLDdata);
             if(res.data == -1) throw new Error("-1 Failed to update the description.");
 
-            return 1;
+            if(res.data.startsWith("error code")) res = await gjWReq("updateLevelDesc", `${level}?content=${encB64(desc)}&user=${user}&password=${password}`);
+            if(res.status == 403) throw new Error(res.data.error);
+
+            return res.data;
         }
 }

package/functions/uploadAccountPost.js

@@ -2,11 +2,12 @@ module.exports = {
     uploadAccountPost:
         async function(content, str, password) {
             const {encB64} = require("../misc/encB64.js");
-            if(!content || content == "") throw new Error("Please provide an account post content!");
-            if(!str || str == "") throw new Error("Please provide a user ID or name!");
-            if(!password || password == "") throw new Error("Please provide a password!");
+            if(!content) throw new Error("Please provide an account post content!");
+            if(!str) throw new Error("Please provide a user ID or name!");
+            if(!password) throw new Error("Please provide a password!");
             
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { searchUsers } = require("./searchUsers.js");
 
             let user = await searchUsers(str);
@@ -17,9 +18,6 @@ module.exports = {
             const comment = encB64(content);
 
             let uACdata = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
                 accountID: user.accountID,
                 secret: "Wmfd2893gb7",
                 gjp: xor.encrypt(password, 37526),
@@ -30,6 +28,9 @@ module.exports = {
             let res = await gjReq("uploadGJAccComment20", uACdata);
             if(res.status == 500) throw new Error("500 Error: couldn't post!");
 
+            if(res.data.startsWith("error code")) res = await gjWReq("uploadAccountPost", `?content=${encB64(content)}&user=${str}&password=${password}`);
+            if(res.status == 403) throw new Error(res.data.error);
+
             return res.data;
         }
 }

package/functions/uploadComment.js

@@ -1,15 +1,16 @@
 module.exports = {
     uploadComment:
         async function(comment, id, user, password, percent = 0) {
-            if(!comment || comment == "") throw new Error("Please provide a comment!");
-            if(!id || id == "") throw new Error("Please provide a level ID!");
-            if(!user || user == "") throw new Error("Please provide a username or a player ID!");
-            if(!password || password == "") throw new Error("Please provide a password!");
+            if(!comment) throw new Error("Please provide a comment!");
+            if(!id) throw new Error("Please provide a level ID!");
+            if(!user) throw new Error("Please provide a username or a player ID!");
+            if(!password) throw new Error("Please provide a password!");
             if(Number(percent) > 100) throw new Error("The percentage cannot be more than 100!");
 
             const { gjp } = require("../misc/gjp.js");
             const { encB64 } = require("../misc/encB64.js");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const crypto = require('crypto')
             const { searchUsers } = require("./searchUsers.js");
 
@@ -22,13 +23,13 @@ module.exports = {
             const XOR = require("../misc/xor.js");
             const xor = new XOR();
 
-            let chkStr = userObj.username + encB64(comment) + Number(id) + Number(percent) + "0xPT6iUrtws0J";
+            let chkStr = userObj.username.toLowerCase() + encB64(comment) + Number(id) + Number(percent) + "0xPT6iUrtws0J";
             let chk = xor.encrypt(sha1(chkStr), 29481);
 
             const uCdata = {
                 accountID: userObj.accountID,
                 gjp: gjp(password),
-                userName: userObj.username,
+                userName: userObj.username.toLowerCase(),
                 comment: encB64(comment),
                 levelID: id,
                 percent: percent,
@@ -42,6 +43,9 @@ module.exports = {
             if(res.data == -10) throw new Error("You're permanently banned from commenting!");
             if(res.data.startsWith("temp_")) throw new Error(`You're temporarily banned from commenting!\nRemaining duration: ${edata.split("_")[1]} seconds\nReason: ${edata.split("_")[2]}`);
 
+            if(res.data.startsWith("error code")) res = await gjWReq("uploadComment", `${id}?comment=${encB64(comment)}&user=${user}&password=${password}&percent=${percent}`)
+            if(res.status == 403) throw new Error(res.data.error)
+
             return res.data;
         }
 }

package/functions/uploadMessage.js

@@ -1,15 +1,16 @@
 module.exports = {
     uploadMessage:
         async function(receiver, subj, content, user, pass) {
-            if(!receiver || receiver == "") throw new Error("Please specify a message receiver!");
-            if(!subj || subj == "") throw new Error("Please specify a message subject!");
-            if(!content || content == "") throw new Error("Please specify a message content!");
-            if(!user || user == "") throw new Error("Please provide a username or a player ID!");
-            if(!pass || pass == "") throw new Error("Please provide a password!");
+            if(!receiver) throw new Error("Please specify a message receiver!");
+            if(!subj) throw new Error("Please specify a message subject!");
+            if(!content) throw new Error("Please specify a message content!");
+            if(!user) throw new Error("Please provide a username or a player ID!");
+            if(!pass) throw new Error("Please provide a password!");
 
             const { gjp } = require("../misc/gjp.js");
             const { encB64 } = require("../misc/encB64.js");
             const {gjReq} = require("../misc/gjReq.js");
+            const {gjWReq} = require("../misc/gjWReq.js");
             const { secret } = require("../config.json");
             const { searchUsers } = require("./searchUsers.js");
             
@@ -31,6 +32,9 @@ module.exports = {
             let res = await gjReq("uploadGJMessage20", data);
             if(res.data == -1) throw new Error(-1);
 
-            return 1;
+            if(res.data.startsWith("error code")) res = await gjWReq("uploadMessage", `?receiver=${receiver}&subject=${encB64(subj)}&content=${encB64(content)}&user=${user}&password=${pass}`)
+            if(res.status == 403) throw new Error(res.data.error)
+
+            return res.data;
         }
 }

package/index.js

@@ -1,6 +1,3 @@
-console.log('\x1b[32m%s\x1b[40m', 'Thanks for using gj-boomlings-api!\nhttps://github.com/shikoshib/gj-boomlings-api');
-console.log('\x1b[37m%s\x1b[0m', '');
-
 const { dlLevel } = require("./functions/dlLevel.js");
 const { getSongInfo } = require("./functions/getSongInfo.js");
 const { getOfficialSongInfo } = require("./functions/getOfficialSongInfo.js");
@@ -32,6 +29,7 @@ const { searchUsers } = require("./functions/searchUsers.js");
 const { getFriendsList } = require("./functions/getFriendsList.js");
 const { getBlockedList } = require("./functions/getBlockedList.js");
 const { deleteLevel } = require("./functions/deleteLevel.js");
+const { gjReq } = require("./misc/gjReq.js");
 
 module.exports.dlLevel = dlLevel;
 module.exports.getSongInfo = getSongInfo;
@@ -63,4 +61,5 @@ module.exports.uploadMessage = uploadMessage;
 module.exports.searchUsers = searchUsers;
 module.exports.getFriendsList = getFriendsList;
 module.exports.getBlockedList = getBlockedList;
-module.exports.deleteLevel = deleteLevel;
+module.exports.deleteLevel = deleteLevel;
+module.exports.gjReq = gjReq;

package/misc/decCommentFromHistory.js

@@ -19,6 +19,8 @@ module.exports = {
             let age = cmnt[5].split("~")[1];
             let messageID = cmnt[6].split("~")[1].split(":")[0];
             let username = cmnt[7].split("~")[0];
+
+            if(Number(cmnt[7].split("~")[0]) != NaN) username = cmnt[9].split("~")[0];
             
             const res = {
                 username: username,

package/misc/decodeGJGauntlet.js

@@ -2,44 +2,39 @@ module.exports = {
     decodeGJGauntlet:
         function(gauntlet) {
             let spl = gauntlet.split(':');
-            let glInfo = [];
-            for(let i =0;i<spl.length;i++) {
-              if(i%2!=0) {
-                glInfo.push(spl[i-1]+`:`+spl[i]);
-              }
-            }
             
-            let id = glInfo[0].split(":")[1];
-            let levelList = glInfo[1].split(":")[1];
+            let id = spl[1];
+            let lvlList = spl[3];
 
-            let firstLvl = levelList.split(",")[0];
-            let secondLvl = levelList.split(",")[1].split(",")[0];
-            let thirdLvl = levelList.split(",")[2].split(",")[0];
-            let fourthLvl = levelList.split(",")[3].split(",")[0];
-            let fifthLvl = levelList.split(",")[4].split("#")[0];
+            let arr = lvlList.split(",");
+            let Lvl1 = arr[0];
+            let Lvl2 = arr[1]
+            let Lvl3 = arr[2];
+            let Lvl4 = arr[3];
+            let Lvl5 = arr[4].split("#")[0];
 
             const glIDs = {
-                "1": "Fire Gauntlet",
-                "2": "Ice Gauntlet",
-                "3": "Poison Gauntlet",
-                "4": "Shadow Gauntlet",
-                "5": "Lava Gauntlet",
-                "6": "Bonus Gauntlet",
-                "7": "Chaos Gauntlet",
-                "8": "Demon Gauntlet",
-                "9": "Time Gauntlet",
-                "10": "Crystal Gauntlet",
-                "11": "Magic Gauntlet",
-                "12": "spike Gauntlet",
-                "13": "Monster Gauntlet",
-                "14": "Doom Gauntlet",
-                "15": "Death Gauntlet"
+                "1": "Fire",
+                "2": "Ice",
+                "3": "Poison",
+                "4": "Shadow",
+                "5": "Lava",
+                "6": "Bonus",
+                "7": "Chaos",
+                "8": "Demon",
+                "9": "Time",
+                "10": "Crystal",
+                "11": "Magic",
+                "12": "spike",
+                "13": "Monster",
+                "14": "Doom",
+                "15": "Death"
             }
 
-            const list = [firstLvl,secondLvl,thirdLvl,fourthLvl,fifthLvl]
+            let list = [Number(Lvl1),Number(Lvl2),Number(Lvl3),Number(Lvl4),Number(Lvl5)]
 
             const result = {
-                "name": glIDs[id],
+                "name": `${glIDs[id]} Gauntlet`,
                 "levels": list
             }
 

package/misc/decodeLevel.js

@@ -38,29 +38,12 @@ module.exports = {
                 author = levelInfo[27].split(":")[0];
             }
 
-            let disliked = false;
-            if(likes.includes("-")) disliked = true;
+            let disliked = likes.includes("-") ? true : false;
 
             if(desc.includes("/")) desc = desc.split("/")[0];
             if(decB64(desc) == '') desc = "KE5vIGRlc2NyaXB0aW9uIHByb3ZpZGVkKQ=="
 
-            if(verifiedCoins == "0") verifiedCoins = false;
-            if(verifiedCoins == "1") verifiedCoins = true;
-
-            let demonBoolDecoding = {
-                '1': true,
-                '': false,
-                '0': false
-            }
-
-            let featuredDecoding = {
-                "0": false,
-                "1": true,
-                undefined: true
-            }
-
-            let featured = featuredDecoding[ftrd];
-            if(featured == undefined) featured = true;
+            let featured = Boolean(Number(ftrd));
 
             let difficultyDecoding = {
                 "-10": "Auto",
@@ -72,7 +55,7 @@ module.exports = {
                 "50": "Insane"
             }
 
-            if(demonBoolDecoding[demonBool] == true) {
+            if(Boolean(Number(demonBool))) {
                 difficultyDecoding = {
                     "10": "Easy Demon",
                     "20": "Medium Demon",
@@ -91,18 +74,12 @@ module.exports = {
             }
 
             const decodeGameVersion = {
-                "1": "Pre-1.7",
-                "2": "Pre-1.7",
-                "3": "Pre-1.7",
-                "4": "Pre-1.7",
-                "5": "Pre-1.7",
-                "6": "Pre-1.7",
-                "7": "Pre-1.7",
                 "10": "1.7",
                 "18": "1.8",
                 "19": "1.9",
                 "20": "2.0",
-                "21": "2.1"
+                "21": "2.1",
+                undefined: "Pre-1.7"
             }
             
             const { getOfficialSongInfo } = require("../functions/getOfficialSongInfo.js");
@@ -142,17 +119,17 @@ module.exports = {
                 likes: Number(likes),
                 disliked: disliked,
                 length: lengthDecoding[length],
-                demon: demonBoolDecoding[demonBool],
+                demon: Boolean(Number(demonBool)),
                 featured: featured,
-                epic: demonBoolDecoding[epic],
+                epic: Boolean(Number(epic)),
                 objects: Number(objs),
                 stars_requested: Number(starsRequested),
                 game_version: decodeGameVersion[gameVersion],
                 copied: Number(copiedID),
                 large: Number(objs) > 40000 ? true : false,
-                two_p: demonBoolDecoding[twoPlayer],
+                two_p: Boolean(Number(twoPlayer)),
                 coins: Number(coins),
-                verified_coins: verifiedCoins,
+                verified_coins: Boolean(Number(verifiedCoins)),
                 song: song
             }
 

package/misc/decodeLevelRes.js

@@ -2,7 +2,7 @@ module.exports = {
     decodeLevelRes:
         function(level){
             const {decB64} = require("./decB64.js");
-            
+
             let spl = level.split(':');
             let levelInfo = [];
             for(let i =0;i<spl.length;i++) {
@@ -10,7 +10,7 @@ module.exports = {
                 levelInfo.push(spl[i-1]+`:`+spl[i]);
               }
             }
-            
+
             let id = levelInfo[0].split("1:")[1];
             let name = levelInfo[1].split("2:")[1];
             let version = levelInfo[2].split("5:")[1];
@@ -34,29 +34,12 @@ module.exports = {
             let starsRequested = levelInfo[23].split("39:")[1];
             let customSong = levelInfo[26].split("35:")[1].split("#")[0];
 
-            let disliked = false;
-            if(likes.includes("-")) disliked = true;
+            let disliked = likes.includes("-") ? true : false;
 
             if(desc.includes("/")) desc = desc.split("/")[0];
             if(decB64(desc) == '') desc = "KE5vIGRlc2NyaXB0aW9uIHByb3ZpZGVkKQ=="
 
-            if(verifiedCoins == "0") verifiedCoins = false;
-            if(verifiedCoins == "1") verifiedCoins = true;
-
-            let demonBoolDecoding = {
-                '1': true,
-                '': false,
-                '0': false
-            }
-
-            let featuredDecoding = {
-                "0": false,
-                "1": true,
-                undefined: true
-            }
-
-            let featured = featuredDecoding[ftrd];
-            if(featured == undefined) featured = true;
+            let featured = Boolean(Number(ftrd));
 
             let difficultyDecoding = {
                 "-10": "Auto",
@@ -68,7 +51,7 @@ module.exports = {
                 "50": "Insane"
             }
 
-            if(demonBoolDecoding[demonBool] == true) {
+            if(Boolean(Number(demonBool))) {
                 difficultyDecoding = {
                     "10": "Easy Demon",
                     "20": "Medium Demon",
@@ -77,7 +60,7 @@ module.exports = {
                     "50": "Extreme Demon"
                 }
             }
-            
+
             const lengthDecoding = {
                 "0": "Tiny",
                 "1": "Short",
@@ -112,17 +95,17 @@ module.exports = {
                 likes: Number(likes),
                 disliked: disliked,
                 length: lengthDecoding[length],
-                demon: demonBoolDecoding[demonBool],
+                demon: Boolean(Number(demonBool)),
                 featured: featured,
-                epic: demonBoolDecoding[epic],
+                epic: Boolean(Number(epic)),
                 objects: Number(objs),
                 stars_requested: Number(starsRequested),
                 game_version: decodeGameVersion[gameVersion],
                 copied: Number(copiedID),
                 large: Number(objs) > 40000 ? true : false,
-                two_p: demonBoolDecoding[twoPlayer],
+                two_p: Boolean(Number(twoPlayer)),
                 coins: Number(coins),
-                verified_coins: verifiedCoins
+                verified_coins: Boolean(Number(verifiedCoins))
             }
 
             return {

package/misc/gjReq.js

@@ -11,13 +11,11 @@ module.exports = {
             
             let r = await fetch(`${server}${endpoint.endsWith(".php") ? endpoint.split(".php")[0] : endpoint}.php`, {
                 method: 'POST',
-                mode: "no-cors",
                 headers: headers,
                 body: new URLSearchParams(data)
             })
 
             let res = await r.text()
-            if(res.toLowerCase() == "error code: 1005") throw new Error("1005 Error: Your IP is banned from making requests to this server.");
             
             return {
                 data: res,

package/misc/gjWReq.js

@@ -0,0 +1,10 @@
+module.exports = {
+    gjWReq:
+        async function(endpoint, data = "") {
+            let r = await fetch(`https://gbaweb.vercel.app/${endpoint}/${data}`)
+            let res = await r.text()
+            if(res.includes("{") || res.includes("[")) res = JSON.parse(res);
+            
+            return {data: res, status: r.status};
+    }
+}

package/misc/rgbToHEX.js

@@ -2,7 +2,7 @@ module.exports = {
     rgbToHEX:
         function(color) {
             let r = color.split(",")[0];
-            let g = color.split(",")[1].split(",")[0];
+            let g = color.split(",")[1];
             let b = color.split(",")[2];
 
             if(b.includes("#")) b = b.split("#")[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gj-boomlings-api",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "A light-weight Geometry Dash API wrapper",
   "main": "index.js",
   "scripts": {