Bug fixes, writing an entire API client for GD, removal of gd.js

Fixes the info command, brevity cleanup, as well as username fixes and etcetera

Signed-off-by: SuperDev <supernova@supers0ft.us>

Author: Supernova3339

commands/queue/info.js

@@ -1,6 +1,8 @@
 const {searchQueue} = require("../../utils/queue");
 const modes = require("../../modes.json");
-const GD = require('gd.js');
+const logConsole = require("../../logger");
+const {getGJLevels21, getGJUsers20} = require("../../utils/gd");
+const axios = require('axios');
 
 module.exports = {
     name: '!info',
@@ -9,9 +11,9 @@ module.exports = {
     tags: [],
     params: true,
     async execute(client, channel, tags, username, message, parameters) {
-        console.log("message params: " + message)
-        const result = searchQueue(parameters);  // Assuming `parameters` is an array and levelId is the first element.
-        const gd = new GD();
+        const levelId = extractLevelId(message);
+        const result = searchQueue(levelId);  // Assuming `parameters` is an array and levelId is the first element.
+        console.log("level id: " + levelId);
 
         if (typeof result === 'string') {
             // If `searchQueue` returned a string (levelId not found), pass it directly to the `client.say()` function.
@@ -20,10 +22,37 @@ module.exports = {
             if (modes.gd === false) {
                 client.say(channel, `Level: ${result.levelId}, User: ${result.username}, found in queue.`);
             } else if (modes.gd === true) {
-                const level = await gd.levels.search({query: parameters});
-                const creator = await gd.users.get(level.creator.accountID);
-                client.say(channel, `${level.name} | ${creator.username} | ${result.levelId}, Requested by: ${result.username}`);
+                const levelData = await getGJLevels21(`${levelId}`, 1, 0); // Replace 'str', 0, 1 with actual values
+                const levelName = levelData[0].levelName; // access the levelName property of the returned object
+                const levelAuthorPlayerID = levelData[0].playerID
+
+                const userData = await getGJUsers20(levelAuthorPlayerID);
+                const userName = userData[0].userName;
+
+                // console.log(`creator: ${userName}`);
+                // console.log(`level name: ${levelName}`);
+
+                // console.log(`Level data: ${JSON.stringify(levelData)}`);
+
+                client.say(channel, `${levelName} | ${userName} | ${result.levelId}, Requested by: ${result.username}`);
             }
         }
     },
-};
+};
+
+// Extract the level ID from the command message
+/**
+ * Extracts the level ID from a given message.
+ *
+ * @param {string} message - The message containing the level ID.
+ * @return {number|null} - The extracted level ID, or null if it doesn't meet the criteria.
+ */
+function extractLevelId(message) {
+    const levelId = message.match(/\d+/); // Match the first group of digits
+
+    if (levelId && levelId[0].length >= 3 && levelId[0].length <= 9) {
+        return parseInt(levelId[0], 10);
+    }
+
+    return null;
+}

commands/queue/request.js

@@ -13,7 +13,7 @@ module.exports = {
             if (hasReachedRequestLimit(username, isSubscriber)) {
                 client.say(channel, `Sorry, you have reached your request limit of ${isSubscriber ? limits.subscriberRequestLimit : limits.viewerRequestLimit} level(s).`);
             } else {
-                addLevelToQueue(levelId, isSubscriber, username, client);
+                addLevelToQueue(levelId, isSubscriber, tags.username, client);
             }
         } else {
             client.say(channel, 'Invalid level ID. Please provide a level ID between 3 and 9 characters.');
@@ -29,11 +29,10 @@ module.exports = {
  * @return {number|null} - The extracted level ID, or null if it doesn't meet the criteria.
  */
 function extractLevelId(message) {
-    const levelId = message;
-    const isNumeric = /^\d+$/.test(levelId); // Check if levelId is numeric
+    const levelId = message.match(/\d+/); // Match the first group of digits
 
-    if (levelId && levelId.length >= 3 && levelId.length <= 9 && isNumeric) {
-        return parseInt(levelId, 10);
+    if (levelId && levelId[0].length >= 3 && levelId[0].length <= 9) {
+        return parseInt(levelId[0], 10);
     }
 
     return null;

handlers/messageHandler.js

@@ -1,5 +1,3 @@
-const logConsole = require("../logger");
-
 function handleMessage(client) {
     return (channel, tags, message, self) => {
         // Ignore echoed messages.
@@ -10,16 +8,12 @@ function handleMessage(client) {
         const commandName = splitMessage[0].trim();
         const parameters = message.substr(commandName.length).trim();
 
-        // console.log('User tags:', tags);
-
         // If this command exists:
         if (client.commands.has(commandName)) {
             const command = client.commands.get(commandName);
 
             if(command.tags && command.tags.length > 0) {
-
                 const hasPermission = command.tags.some(tag => tags.badges && tag in tags.badges);
-
                 if (!hasPermission) {
                     return;
                 }
@@ -28,7 +22,7 @@ function handleMessage(client) {
             if (command.params && parameters.length > 0) {
                 command.execute(client, channel, tags, message, parameters);
             } else if (!command.params) {
-                command.execute(client, channel, tags, message);
+                command.execute(client, channel, tags, message, parameters);
             }
         } else {
             logConsole(`Command not found: ${commandName}`);

package-lock.json

@@ -2,12 +2,11 @@
   "name": "gd-levelreqbot",
   "author": "Supernova3339",
   "main": "main.js",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "dependencies": {
     "axios": "^1.7.2",
     "figlet": "^1.7.0",
     "fs": "^0.0.1-security",
-    "gd.js": "^0.2.13",
     "node-fetch": "^3.3.2",
     "tmi.js": "^1.8.5"
   },