Merge branch 'main' into dev

dot-commands/spongebob.js

@@ -10,20 +10,33 @@ module.exports = {
 		// message.reply(fn.spongebob(commandData)).then(() => {
 		// 	message.delete();
 		// });
-		if (message.reference != undefined) {
+		if (message.reference != undefined) { // message.reference is undefined if the message isn't a reply to another message
-			const repliedMessageId = message.reference.messageId;
+			if (commandData.args !== "") { // If the replying message isn't just .sb
-			message.channel.messages.fetch(repliedMessageId)
+				const repliedMessageId = message.reference.messageId; // grab the message Id of the replied-to msg
-				.then(repliedMessage => {
+				message.channel.messages.fetch(repliedMessageId) // Fetch the message because with our luck it isn't in the cache
-					repliedMessage.reply(fn.spongebob({ args: repliedMessage.content })).then(() => {
+					.then(repliedMessage => {
-						if (message.deletable) message.delete();
+						repliedMessage.reply(fn.spongebob({ args: commandData.args })).then(() => { // Use the pre-command text of the replying message to sb-ify
+							if (message.deletable) message.delete(); // If the initiating message is deletable, delete it.
+						});
+					})
+					.catch(err => {
+						console.error(err);
 					});
-				})
+			} else { // We're working with a basic ".sb" and can proceed as we did before...
-				.catch(err => {
+				const repliedMessageId = message.reference.messageId; // grab the message Id of the replied-to msg
-					console.error(err);
+				message.channel.messages.fetch(repliedMessageId) // Fetch the message because with our luck it isn't in the cache
-				});
+					.then(repliedMessage => {
-		} else {
+						repliedMessage.reply(fn.spongebob({ args: repliedMessage.content })).then(() => {
+							if (message.deletable) message.delete();
+						});
+					})
+					.catch(err => {
+						console.error(err);
+					});
+			}
+		} else { // The message isn't a reply, so just sb it like we did from the very beginning
 			message.channel.send(fn.spongebob(commandData)).then(() => {
-				if (message.deletable) message.delete();
+				if (message.deletable) message.delete(); // If the initiating message is deletable, delete it.
 			});
 		}
 	}

functions.js

@@ -182,7 +182,7 @@ const functions = {
 			// Get the first part of the message, everything leading up to the final period
 			commandData.args = message.content.slice(0,finalPeriod).toLowerCase();
 			// Get the last part of the message, everything after the final period
-			commandData.command = message.content.slice(finalPeriod).replace('.','').toLowerCase();
+			commandData.command = message.content.slice(finalPeriod + 1).toLowerCase();
 			commandData.author = `${message.author.username}`;
 			return this.checkCommand(commandData);
 		},

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodbot",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Nods and Nod Accessories, now with ChatGPT!",
   "main": "main.js",
   "dependencies": {