Bugfixes, etc.

Author: fourkbomb

aucgbot.js

@@ -6,6 +6,7 @@
 /* globals: entities, aucgbot, encodeUTF8, decodeUTF8, writeln, println */
 "use strict";
 var net = require("net"),
+	url = require("url"),
 	util = require("util"),
 	fs = require("fs"),
 	http = require("httpsync"),
@@ -462,7 +463,7 @@ aucgbot.checkFlood = function checkFlood(e) {
 	}
 	if ((diff ? conn.flood_lines[nick] : conn.flood_lines) >= this.prefs.flood.lines && now - (diff ? conn.flood_lastTime[nick] : conn.flood_lastTime) <= this.prefs.flood.secs * 1000) {
 		var kb = this.okToKick(e);
-		if (difF)
+		if (diff)
 			conn.flood_lastTime[nick] = now;
 		else
 			conn.flood_lastTime = now;
@@ -578,7 +579,7 @@ aucgbot.parseCmd = function parseCmd(e) {
 			if (cmd.substr(0,4) == "cmd_") {
 				cmd = cmd.substr(4);
 			}
-			console.log(cmd, require('util').inspect(e));
+//			console.log(cmd, require('util').inspect(e));
 			this.modMethod("parseCmd", arguments) || this.modMethod("cmd_" + cmd, arguments);
 		} catch (ex) {
 			e.notice("Oops, I encountered an error.", ex);
@@ -609,15 +610,15 @@ aucgbot.getHTTP = function getHTTP(uri, modname, modver, headers) {
 		if (modver)
 			useragent += "/" + modver;
 	}
-	headers["User-Agent"] = useragent;
 	var req = http.request({
 		"url": uri,
 		"method": "GET",
-		"useragent": useragent,
-		"headers": headers
+		"headers": headers,
+		"useragent": useragent
 	});
 	var res = req.end();
-	if (res.status && res.status >= 300) {
+	if (res.statusCode && res.statusCode >= 300) {
+		console.log("the stuff", res.statusCode, res.data.toString());
 		throw new this.HTTPError(res, res.data.toString());
 	}
 	return res.data.toString();
@@ -693,14 +694,12 @@ aucgbot.loadModule = function loadModule(id) {
  * @return {boolean} Whether to stop processing the event.
  */
 aucgbot.modMethod = function modMethod(id, args) {
-	console.log(require('util').inspect(args));
 	if (args != null && typeof args.length !== "number")
 		args = Array.slice(arguments, 1);
 	try {
 		for (var m in this.modules) {
 			if (this.modules.hasOwnProperty(m)) {
 				module = this.modules[m];
-				console.log('try and run: ' + id + ' from ' + m);
 				if (typeof module === "object" && module && module.hasOwnProperty(id)) {
 					let method = module[id];
 					if (typeof method === "function" && method.apply(module, args))

bom.jsm

@@ -3,46 +3,46 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*global Record: false, module: false */
+(function(bom){
+bom.version = "0.9.3 (2014-01-21)";
 
-module.version = "0.9.3 (2014-01-21)";
-
-module.loadStateNames = function loadStateNames(state) {
+bom.loadStateNames = function loadStateNames(state) {
 	var names = new Record();
 	names.readINI(system.cwd + "/bom_names.ini", state);
 	return names;
 };
 
-module.idToFwoJsonUrl = function idToFwoJsonUrl(id) {
+bom.idToFwoJsonUrl = function idToFwoJsonUrl(id) {
 	// BoM's JSON seems to be a bit much for JSDB to handle correctly, i.e. not load entirely
 	var regionId = id.slice(0, id.indexOf("."));
 	return "http://www.bom.gov.au/fwo/ID{0}/ID{1}.json".format(regionId, id);
 };
 
-module.idToMinJsonUrl = function idToMinJsonUrl(id) {
+bom.idToMinJsonUrl = function idToMinJsonUrl(id) {
 	return String.format("http://vovo.id.au/scripts/bommin.php?id={0}&wmo={1}", id.split("."));
 };
 
-module.fullNameToName = function fullNameToName(name) {
+bom.fullNameToName = function fullNameToName(name) {
 	var station = name.split(" "), state = station.pop();
 	return [station.join(" ").replace(/,$/, ""), state];
 }
 
-module.nameToId = function nameToId(station, state) {
+bom.nameToId = function nameToId(station, state) {
 	var names = this.loadStateNames(state);
 	return names.get(station);
 };
 
-module.cmd_bom_id2fwo = function cmd_bom_id2fwo(e) {
+bom.cmd_bom_id2fwo = function cmd_bom_id2fwo(e) {
 	e.notice(this.idToFwoJsonUrl(e.args));
 	return true;
 };
 
-module.cmd_bom_name2id = function cmd_bom_name2id(e) {
+bom.cmd_bom_name2id = function cmd_bom_name2id(e) {
 	e.reply(this.nameToId.apply(this, this.fullNameToName(e.args)));
 	return true;
 };
 
-module.cmd_bom = function cmd_bom(e) {
+bom.cmd_bom = function cmd_bom(e) {
 	var args = e.args;
 	if (!args) {
 		e.reply(this.cmd_bom.help);
@@ -100,4 +100,5 @@ module.cmd_bom = function cmd_bom(e) {
 	e.nreply("Current weather for", data.name + ",", state.toUpperCase(), "from the Bureau of Meteorology (as of", data.local_date_time + "):", res.join(" - "));
 	return true;
 };
-module.cmd_bom.help = "Get current weather conditions from the Bureau of Meteorology. Usage: bom <station> <state>";
+bom.cmd_bom.help = "Get current weather conditions from the Bureau of Meteorology. Usage: bom <station> <state>";
+})(module.exports);

package.json

@@ -6,7 +6,8 @@
     "html-entities": "^1.1.1",
     "httpsync": "0.0.8",
     "moment": "^2.8.3",
-    "moment-timezone": "^0.2.2"
+    "moment-timezone": "^0.2.2",
+    "synchronize": "^0.9.9"
   },
   "scripts": {
     "start": "node --harmony --use-strict start-aucgbot"

start-aucgbot

@@ -24,7 +24,7 @@ for (let s = readln().trim().split(","); m=s.shift();) {
 {
 let servers = [
 	/*["Hostname", "Port", "Nickname", "Ident", "Pass", "Channels", "SASL user", "SASL pass"]*/
-	["chat.freenode.net", "6667", "aucgbot", "aucgbot", "", "", "", ""]
+	["chat.freenode.net", "6667", "treebot", "aucgbot", "", "##hypnotoad", "PaperBag", "uniqueradioactivelolly"]
 ];
 
 aucgbot.start.apply(aucgbot, servers);