gj-boomlings-api 1.0.2 → 1.1.0

package/README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://shikoshib.github.io/font1.png" width="600"></a><hr>
   <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>
-  <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://img.shields.io/npm/dt/gj-boomlings-api.svg?maxAge=3600" alt="npm downloads" /></a>
+  <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://img.shields.io/npm/dm/gj-boomlings-api.svg?maxAge=2592000" /></a>
   <a href="https://snyk.io/test/github/shikoshib/gj-boomlings-api"><img src="https://snyk.io/test/github/shikoshib/gj-boomlings-api/badge.svg" alt="Known Vulnerabilities" /></a>
   <a href="https://packagequality.com/#?package=gj-boomlings-api"><img src="https://packagequality.com/shield/gj-boomlings-api.svg"/></a>
 </div>

package/functions/blockUser.js

@@ -1,7 +1,7 @@
 module.exports = {
     blockUser:
         async function(target, username, password) {
-            if(!target || target == "") throw new Error("Please provide a player ID or username!");
+            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!");
             const axios = require("axios");

package/functions/deleteComment.js

@@ -0,0 +1,53 @@
+module.exports = {
+    deleteComment:
+        async function(id, lvl, str, password) {
+            const {encURLSafeBase64} = require("./encURLSafeBase64.js");
+            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!");
+
+            const axios = require("axios");
+            const { headers, server } = require("../config.json");
+
+            const data = {
+                gameVersion: 21,
+                binaryVersion: 35,
+                gdw: 0,
+                str: str,
+                secret: "Wmfd2893gb7"
+            };
+
+            let r = await axios.post(server + "getGJUsers20.php", data, {
+                headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
+            })
+
+            let accId = r.data.split(":16:")[1].split(":3:")[0];
+            if(Number(accId) < 71 || accId.includes(":")) accId = r.data.split(":16:")[2].split(":3:")[0];
+
+            const XOR = require("../misc/xor.js");
+            const xor = new XOR();
+
+            let dACdata = {
+                gameVersion: 21,
+                binaryVersion: 35,
+                gdw: 0,
+                accountID: accId,
+                secret: "Wmfd2893gb7",
+                levelID: lvl,
+                gjp: xor.encrypt(password, 37526),
+                commentID: id,
+            };
+
+            let res = await axios.post(server + "deleteGJComment20.php", dACdata, {
+                headers: headers
+            }).catch(e => {
+                throw new Error(e.response.data);
+            })
+
+            return 1;
+        }
+}

package/functions/dlLevel.js

@@ -21,6 +21,9 @@ module.exports = {
 
             let res = await axios.post(server + 'downloadGJLevel22.php', data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
 
             let spl = res.data.split(":");

package/functions/encURLSafeBase64.js

@@ -3,7 +3,7 @@ module.exports = {
         function(string) {
             const bs = require("js-base64");
             if(!string || string == "") throw new Error("No string provided!")
-            let str = bs.encode(string).replace(/\//g, '_').replace(/w+/g, '-');
+            let str = bs.encode(string).replace(/\//g, '_').replace(/\+/g, '-');
             return str;
         }
 }

package/functions/getProfile.js

@@ -15,6 +15,9 @@ module.exports = {
 
             let r = await axios.post(server + "getGJUsers20.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
 
             let id = r.data.split(":16:")[1].split(":3:")[0];
@@ -30,58 +33,38 @@ module.exports = {
 
             let res = await axios.post(server + "getGJUserInfo20.php", GJUI20data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
-            
-            if(res.data == -1) throw new Error("-1 Not found.")
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-
-            let dataWoSkins = `${res.data.split("21:")[0]}${res.data.split(":48:")[1]}`;
 
-            let username = dataWoSkins.split("1:")[1].split(":2:")[0];
-            let playerID = dataWoSkins.split(":2:")[1].split(":13:")[0];
-            let goldCoins = dataWoSkins.split(":13:")[1].split(":17:")[0];
-            let silverCoins = dataWoSkins.split(":17:")[1].split(":10:")[0];
-            let stars = dataWoSkins.split(":3:")[1].split(":46:")[0];
-            let diamonds = dataWoSkins.split(":46:")[1].split(":4:")[0];
-            let demons = dataWoSkins.split(":4:")[1].split(":8:")[0];
-            let cps = dataWoSkins.split(":8:")[1].split(":18:")[0];         // clicks per second lmao
-            let msgState = dataWoSkins.split(":18:")[1].split(":19:")[0];
-            let friendsState = dataWoSkins.split(":19:")[1].split(":50:")[0];
-            let commentHistoryState = dataWoSkins.split(":50:")[1].split(":20:")[0];
-            let youtube = dataWoSkins.split(":20:")[1].split(":")[0];
-            let rank = dataWoSkins.split(":30:")[1].split(":16:")[0];
-            let accountID = dataWoSkins.split(":16:")[1].split(":31:")[0];
-            let twitter = dataWoSkins.split(":44:")[1].split(":45:")[0];
-            let twitch = dataWoSkins.split(":45:")[1].split(":49:")[0];
-            let modState = dataWoSkins.split(":49:")[1].split(":29:")[0];
-
-            if(youtube.includes(":")) youtube = dataWoSkins.split(":20:")[1].split(":")[0];
-            if(twitter.includes(":")) twitter = dataWoSkins.split(":44:")[2].split(":45:")[0];
-            if(twitch.includes(":")) twitch = dataWoSkins.split(":45:")[2].split(":49:")[0];
-            if(goldCoins.includes(":")) goldCoins = dataWoSkins.split(":13:")[2].split(":17:")[0];
-            if(goldCoins == "") goldCoins = dataWoSkins.split(":13:")[1].split(":17:")[1];
-            if(silverCoins.includes(":")) silverCoins = dataWoSkins.split("17:")[2].split(":10:")[0];
-            if(rank.includes(":")) rank = dataWoSkins.split(":30:")[2].split(":16:")[0];
-            if(accountID.includes(":")) accountID = dataWoSkins.split(":16:")[2].split(":31:")[0];
-            if(demons.includes(":")) demons = dataWoSkins.split(":4:")[2].split(":8:")[0];
-            if(msgState.includes(":")) msgState = dataWoSkins.split(":18:")[2].split(":19:")[0];
-            if(stars.includes(":")) stars = dataWoSkins.split("3:")[2].split(":46:")[0];
-            if(modState.includes(":")) modState = dataWoSkins.split(":49:")[2].split(":29:")[0];
-            if(dataWoSkins.split(":3:")[1].split(":46:")[0].startsWith("3:")) stars = dataWoSkins.split(":3:")[1].split("3:")[1].split(":46:")[0];
-            if(dataWoSkins.split("3:")[2].split(":46:")[0].includes(":")) {
-                stars = dataWoSkins.split("3:")[3].split(":46:")[0];
-            } else {
-                stars = stars;
+            let spl = res.data.split(':');
+            let userInfo = [];
+            for(let i =0;i<spl.length;i++) {
+              if(i%2!=0) {
+                userInfo.push(spl[i-1]+`:`+spl[i]);
+              }
             }
 
-            if(dataWoSkins.split("3:")[3] !== undefined) {
-                if(dataWoSkins.split("3:")[3].split(":46:")[0] == "") {
-                    stars = dataWoSkins.split("3:")[4].split(":46:")[0];
-                } else {
-                    stars = stars;
-                }
-            } 
+            let username = userInfo[0].split("1:")[1];
+            let playerID = userInfo[1].split("2:")[1];
+            let goldCoins = userInfo[2].split("13:")[1];
+            let silverCoins = userInfo[3].split("17:")[1];
+            let p1col = userInfo[4].split("10:")[1];
+            let p2col = userInfo[5].split("11:")[1];
+            let stars = userInfo[6].split("3:")[1];
+            let diamonds = userInfo[7].split("46:")[1];
+            let demons = userInfo[8].split("4:")[1];
+            let cps = userInfo[9].split("8:")[1];         // clicks per second lmao
+            let msgState = userInfo[10].split("18:")[1];
+            let friendsState = userInfo[11].split("19:")[1];
+            let commentHistoryState = userInfo[12].split("50:")[1];
+            let youtube = userInfo[13].split("20:")[1];
+            let rank = userInfo[23].split("30:")[1];
+            let accountID = userInfo[24].split("16:")[1];
+            let twitter = userInfo[26].split("44:")[1];
+            let twitch = userInfo[27].split("45:")[1];
+            let modState = userInfo[28].split("49:")[1];
 
             let ytLnk = `htps://youtube.com/channel/${youtube}`;
             let twitterLnk = `https://twitter.com/${twitter}`;
@@ -116,6 +99,8 @@ module.exports = {
                 playerID: Number(playerID),
                 accountID: Number(accountID),
                 rank: Number(rank),
+                color1: Number(p1col),
+                color2: Number(p2col),
                 stars: Number(stars),
                 diamonds: Number(diamonds),
                 secretCoins: Number(goldCoins),
@@ -130,6 +115,7 @@ module.exports = {
                 twitter: twitterLnk,
                 twitch: twitchLnk
             }
+            
             return result;
         }
 }

package/functions/unblockUser.js

@@ -0,0 +1,62 @@
+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!");
+            const axios = require("axios");
+            const {headers, server} = require("../config.json");
+            
+            let resp = await axios.post(server + "getGJUsers20.php", {
+                gameVersion: 21,
+                binaryVersion: 35,
+                gdw: 0,
+                str: username,
+                secret: "Wmfd2893gb7"
+            }, {
+                headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error(`Couldn't find a "${username}" user.`)
+                throw new Error(e.response.data)
+            })
+
+            let accID = resp.data.split(":16:")[1].split(":3:")[0];
+
+            const userData = {
+                gameVersion: 21,
+                binaryVersion: 35,
+                gdw: 0,
+                str: target,
+                secret: "Wmfd2893gb7"
+            }
+
+            let r = await axios.post(server + "getGJUsers20.php", userData, {
+                headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error(`Couldn't find a "${username}" user.`)
+                throw new Error(e.response.data)
+            })
+            let targetId = r.data.split(":16:")[1].split(":3:")[0];
+
+            const {gjp} = require("../misc/gjp.js");
+            
+            const blockData = {
+                gameVersion: 21,
+                binaryVersion: 35,
+                gdw: 0,
+                secret: "Wmfd2893gb7",
+                targetAccountID: targetId,
+                accountID: accID,
+                gjp: gjp(password)
+            }
+
+            let res = await axios.post(server + "unblockGJUser20.php", blockData, {
+                headers: headers
+            }).catch(e => {
+                if(res.data.toString().toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
+                throw new Error(e)
+            })
+
+            return 1;
+        }
+}

package/functions/uploadComment.js

@@ -60,8 +60,6 @@ module.exports = {
                 if(edata == '') edata = "Whoops, the servers have rejected your request!"
                 throw new Error(edata)
             })
-            
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
 
             return 1;
         }

package/index.js

@@ -25,6 +25,8 @@ const { updateLevelDesc } = require("./functions/updateLevelDesc.js");
 const { deleteAccountPost } = require("./functions/deleteAccountPost.js");
 const { getUserLevels } = require("./functions/getUserLevels.js");
 const { searchLevels } = require("./functions/searchLevels.js");
+const { deleteComment } = require("./functions/deleteComment.js");
+const { unblockUser } = require("./functions/unblockUser.js");
 
 module.exports.dlLevel = dlLevel;
 module.exports.getSongInfo = getSongInfo;
@@ -33,7 +35,7 @@ module.exports.decURLSafeBase64 = decURLSafeBase64;
 module.exports.encURLSafeBase64 = encURLSafeBase64;
 module.exports.getDailyLevel = getDailyLevel;
 module.exports.getWeeklyDemon = getWeeklyDemon;
-module.exports.getProfile = getProfile; // to fix
+module.exports.getProfile = getProfile;
 module.exports.reportLevel = reportLevel;
 module.exports.getComments = getComments;
 module.exports.getCommentHistory = getCommentHistory;
@@ -49,4 +51,6 @@ module.exports.getCreatorScores = getCreatorScores;
 module.exports.updateLevelDesc = updateLevelDesc;
 module.exports.deleteAccountPost = deleteAccountPost;
 module.exports.getUserLevels = getUserLevels;
-module.exports.searchLevels = searchLevels;
+module.exports.searchLevels = searchLevels;
+module.exports.deleteComment = deleteComment;
+module.exports.unblockUser = unblockUser;

package/misc/decodeUserResult.js

@@ -1,45 +1,34 @@
 module.exports = {
     decodeUserResult:
         function(user) {
-            let sec = user.split(":16:")[1]
-            if(user.split(":16:")[2] != undefined) sec = user.split(":16:")[2]
-            let userWoSkins = `${user.split(":9:")[0]}:16:${sec}`
-            
-            let name = userWoSkins.split(":")[1].split(":2:")[0];
-            let playerID = userWoSkins.split(":2:")[1].split(":13:")[0];
-            let coins = userWoSkins.split(":13:")[1].split(":17:")[0];
-            let userCoins = userWoSkins.split(":17:")[1].split(":6:")[0];
-            let rank = userWoSkins.split(":6:")[1].split(":9:")[0];
-            let accID = userWoSkins.split(":16:")[1].split(":3:")[0];
-            let stars = userWoSkins.split(":3:")[1].split(":8:")[0];
-            let cp = userWoSkins.split(":8:")[1].split(":46:")[0];
-            let diamonds = userWoSkins.split(":46:")[1].split(":4:")[0];
-            let demons = userWoSkins.split(":4:")[1]
-            
-            if(userWoSkins.split(":3:")[1] != undefined) {
-                if(userWoSkins.split(":3:")[1].split(":").length < 6) stars = userWoSkins.split(":2:")[1].split(":8:")[0];
-            }
-            if(rank.includes(":16:")) rank = rank.split(":16:")[0];
-            if(userWoSkins.split(":6:")[2] != undefined) {
-                if(rank.includes(":")) rank = userWoSkins.split(":6:")[2].split(":9:")[0];
+          let spl = user.split(':');
+            let userInfo = [];
+            for(let i =0;i<spl.length;i++) {
+              if(i%2!=0) {
+                userInfo.push(spl[i-1]+`:`+spl[i]);
+              }
             }
             
-            if(demons.includes(":")) demons = userWoSkins.split(":4:")[2]
-            if(userCoins.includes(":6")) userCoins = userCoins.split(":6")[0];
-            if(accID.startsWith("16:")) accID = accID.split("16:")[1];
-            if(stars.includes(":3:")) stars = stars.split(":3:")[1];
-            if(stars.includes("16:")) stars = userWoSkins.split(":3:")[2].split(":8:")[0];
-            if(diamonds.includes(":")) diamonds = userWoSkins.split(":46:")[2].split(":4:")[0];
-            if(cp.includes(":")) cp = userWoSkins.split(":8:")[2].split(":46:")[0];
-            if(rank.startsWith("16:")) rank = "9"
-            if(rank.includes(":16:")) rank = rank.split(":16:")[0];
-            if(accID.includes(":")) accID = userWoSkins.split(":16:")[2].split(":3:")[0];
+            let name = userInfo[0].split("1:")[1];
+            let playerID = userInfo[1].split("2:")[1];
+            let coins = userInfo[2].split("13:")[1];
+            let userCoins = userInfo[3].split("17:")[1];
+            let p1col = userInfo[6].split("10:")[1];
+            let p2col = userInfo[7].split("11:")[1];
+            let rank = userInfo[4].split("6:")[1];
+            let accID = userInfo[10].split("16:")[1];
+            let stars = userInfo[11].split("3:")[1];
+            let cp = userInfo[12].split("8:")[1];
+            let diamonds = userInfo[13].split("46:")[1];
+            let demons = userInfo[14].split("4:")[1];
 
             const result = {
                 username: name.trim(),
                 playerID: Number(playerID),
                 accountID: Number(accID),
                 rank: Number(rank),
+                color1: Number(p1col),
+                color2: Number(p2col),
                 stars: Number(stars),
                 diamonds: Number(diamonds),
                 secretCoins: Number(coins),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gj-boomlings-api",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A Node.js module that allows you to fetch boomlings.com easily",
   "main": "index.js",
   "scripts": {