Merge pull request #41 from nuclearace/s1.0

S1.0
nuclearace · Oct 25, 2014 · 63773d3 · 63773d3
2 parents ae77b01 + d709cbf
commit 63773d3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/lib/cytubebot.js b/lib/cytubebot.js
@@ -4,7 +4,6 @@ var commands = require("./chatcommands")
 var Database = require("./database")
 var fs = require("fs")
 var botHandlers = require("./bothandlers")
-var io = require("socket.io-client")
 var IOServer = require("./ioserver")
 var IRC = require("./ircclient")
 var logger = require("./logger")
@@ -467,12 +466,12 @@ CytubeBot.prototype.getSocketURL = function(server) {
 
 	if (server.match(defaultReg)) {
 		this.logger.syslog.log("!~~~! Found socketIO info in config")
-		return io.connect(server)
+		return require('socket.io-client')(server)
 	} else {
 		this.logger.syslog.log("!~~~! Looking up socketIO info from server")
 		api.APICall(server, "socketlookup", null, function(data) {
 			if (data.match(defaultReg)) {
-				bot.socket = io.connect(data)
+				bot.socket = require('socket.io-client')(data)
 				botHandlers.addHandlers(bot)
 				bot.start()
 			}

diff --git a/lib/ioserver.js b/lib/ioserver.js
@@ -34,7 +34,6 @@ function IOServer(srv, bot) {
 			})
 		})
 	})
-	io.set("log level", 1)
 };
 
 IOServer.prototype.getEmotes = function(callback) {

diff --git a/package.json b/package.json
@@ -6,13 +6,13 @@
   },
   "dependencies": {
     "async": "~0.9.0",
-    "socket.io-client": "<1.0.0",
+    "socket.io-client": "^1.1.0",
     "libxmljs": "~0.11.0",
     "sqlite3": "~2.2.3",
     "cleverbot-node": "",
     "mstranslator": "",
     "express": "~4.4.1",
-    "socket.io": "<1.0.0",
+    "socket.io": "^1.1.0",
     "jade": "~1.3.1",
     "forever-monitor": "~1.2.3",
     "irc": "~0.3.7",

diff --git a/www/js/bot.js b/www/js/bot.js
@@ -1,4 +1,4 @@
-socket = io.connect(IO_URL)
+socket = io(IO_URL)
 setTimeout(function() {
     socket.emit("getStats")
 }, 1000)

diff --git a/www/js/emotes.js b/www/js/emotes.js
@@ -1,4 +1,4 @@
-socket = io.connect(IO_URL)
+socket = io(IO_URL)
 setTimeout(function() {
 	socket.emit("getRoom")
 	socket.emit("getEmotes")

diff --git a/www/js/internals.js b/www/js/internals.js
@@ -1,4 +1,4 @@
-socket = io.connect(IO_URL)
+socket = io(IO_URL)
 
 socket.on("connect", function() {
 	socket.emit("getInternals")
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ function IOServer(srv, bot) { @@
     			})
     		})
     	})
-    	io.set("log level", 1)
     };
     IOServer.prototype.getEmotes = function(callback) {
@@ Expand Down @@