Changes to parser and fixes commands (removed unused node mods)

Ducky.js

@@ -94,9 +94,9 @@ bot.on("message", function(message) {
 	if(stopMyself(message.author.id)) {
 		return;
 	}
-	if(!isMaster(message.author.id)) {
+	/*if(!isMaster(message.author.id)) {
 		return;
-	}
+	}*/
 	// TODO: Notify logger (need to figure out how to not spam users...)
 	/*if(message.mentions.length > 0) {
 		for(var i = 0; i < message.mentions.length; i++) {
@@ -108,66 +108,64 @@ bot.on("message", function(message) {
 			}
 		}
 	}*/
+	var msg = message.content.toLowerCase();
+
 	for (var i in exports.triggers) {
 		var trigger = exports.triggers[i];
-		bot.sendMessage(message, trigger);
-	}
-	var msg = message.content.toLowerCase();
-	for(var i = 0; i < exports.triggers.length; i++) {
-		if(exports.triggers[i] == msg) {
+		if(trigger == msg) {
 			var callback_function = exports.callbacks[i];
  			callback_function(bot, message, msg);
  			return;
 		}
 	}
-	return;
 
+	for (var i in exports.triggers) {
+		var trigger = exports.triggers[i];
 
-
-
-	for(var i = 0; i < exports.triggers.length; i++) {
-		var ts = exports.triggers[i].split(" ");
-		bot.sendMessage(message, ts[c] + " -> " + ms[c]);
+		var ts = trigger.split(" ");
 		var ms = msg.split(" ");
-		var nm = [];
 		var inMentions = false;
-		if(message.mentions.length > 0) {
-			var mentions = message.mentions.join(", ");
-		}
-		for(var c = 0; c < ms.length; c++) {
-
-			if(ts[c] == "%arg%") {
-				nm.push(ts[c]);
-			} else if (ts[c] == "%args%") {
-				nm.push(ts[c]);
-				break;
-			} else if (ts[c] == "%mention%") {
-				if(contains(mentions, ms[c])) {
-					nm.push(ts[c]);
+		var nm = [];
+		for (var t in ts) {
+			if(ts[t] == ms[t]) {
+				if(inMentions) {
+					/*if(!message.mentions.indexOf(ms[t]) > 0) {
+						nm.push(ts[t]);
+					}*/
+					continue;
 				} else {
-					bot.sendMessage(message, "Parse error! Arg type: \"mention\", got type: \"String\"");
-					break;
+					nm.push(ts[t]);
 				}
-			} else if (ts[c] == "%mentions%") {
-				nm.push("%mentions%")
+			} else if (ts[t] == "%arg%") {
+				nm.push(ts[t]);
+			} else if (ts[t] == "%args%") {
+				nm.push(ts[t]);
+				break;
+			} else if (ts[t] == "%mention%") {
+				/*if(message.mentions.indexOf(ms[t]) > 0) {
+					nm.push(ts[t]);
+				}*/
+				// Just going to push it straight up
+				nm.push(ts[t]);
+			} else if (ts[t] == "%mentions%") {
+				/*if(message.mentions.indexOf(ms[t]) > 0) {
+					nm.push(ts[t]);
+				}*/
 				inMentions = true;
-			} else if (inMentions) {
-				if(!ms[c].startsWith("@")) {
-					inMentions = false;
-				}
-			} else {
-				nm.push(ms[c]);
+				// Just going to push it straight up
+				nm.push(ts[t]);
 			}
 		}
-
-		msg = nm.join(" ");
-		return;
-		if(exports.triggers[i] == msg) {
+		var newmsg = nm.join(" ");
+		if(trigger == newmsg) {
 			var callback_function = exports.callbacks[i];
  			callback_function(bot, message, msg);
  			return;
-		}
+ 		}
 	}
+
+	return;
 });
+
 var auth = require("./data/auth.json");
 bot.login(auth.email, auth.password);

commands/ducky_management.js

@@ -69,7 +69,12 @@ Ducky.registerCommand("about you", function(bot, message, msg) {
 	duckyinfo.push("Channels monitoring: " + bot.channels.length);
 	duckyinfo.push("Users found: " + bot.users.length);
 	duckyinfo.push("Private chats: " + bot.privateChannels.length);
-	duckyinfo.push("Uptime: " + bot.uptime/60 + " seconds");
+	var date1 = new Date(bot.uptime);
+	var date2 = new Date();
+	var timeDiff = Math.abs(date2.getTime() - date1.getTime());
+	var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24)); 
+	//duckyinfo.push("Uptime: " + duckydate.getDay() + " days, " + duckydate.getHours() + " hours, " + duckydate.getMinutes() + " minutes and " + duckydate.getSeconds() + " seconds");
+	duckyinfo.push("Uptime: " + diffDays);
 	duckyinfo.push("ID: " + bot.user.id);
 	var duckyout = duckyinfo.join("\n");
 	bot.sendMessage(message, duckyout);

commands/misc.js

@@ -29,7 +29,43 @@ Ducky.registerCommand("/help", function(bot, message, msg) {
 });
 
 Ducky.registerCommand("penis length of %mention%", function(bot, message, msg) {
-	bot.sendMessage(message, "Coming soon");
+	var file = require('/root/ducky/data/penis_lengths.json');
+	var fpath = '/root/ducky/data/penis_lengths.json';
+
+	var fs = require('fs');
+
+	//try {
+	    //fs.accessSync(file, fs.F_OK);
+	    var jsonF = require("jsonfile");
+	    if(file[message.mentions[0].id]) {
+	    	var full = file[message.mentions[0].id];
+	    	var penis = [];
+	    	penis.push("8")
+	    	for(var i = 0; i < full; i++) {
+	    		penis.push("=");
+	    	}
+	    	penis.push("D");
+	    	var pout = penis.join("");
+	    	bot.sendMessage(message, "Penis length of " + message.mentions[0] + " is " + pout);
+	    } else {
+	    	var full = ((Math.random() * 10) + 1);
+	    	var penis = [];
+	    	penis.push("8")
+	    	for(var i = 0; i < full; i++) {
+	    		penis.push("=");
+	    	}
+	    	penis.push("D");
+	    	var pout = penis.join("");
+	    	bot.sendMessage(message, "Penis length of " + message.mentions[0] + " is " + pout);
+	    	var jsonString = '{\"' + message.mentions[0].id + '\":\"' + full + '\"}';
+	    	var jsonObj = JSON.parse(jsonString);
+			jsonF.writeFileSync(fpath, jsonObj);
+	    }
+	/*} catch (e) {
+	    fs.closeSync(fs.openSync(file, 'w'));
+	    bot.sendMessage(message, "Oh no! Something went wrong getting the girth of " + message.mentions[0]);
+	    console.log(e);
+	}*/
 });
 
 Ducky.registerCommand("monitor me", function(bot, message, msg) {

data/auth.json

@@ -1 +1 @@
-{"email":"example@ducky.com","password":"duckyisbae"}
+{"email":"example@domain.com","password":"duckyisbae"}

data/penis_lengths.json

@@ -0,0 +1 @@
+{"128194687801622528":"7.047292856965214"}