From 9eafc53c91eb9b3972cb0cd938991a1fec3f92b4 Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Mon, 3 Jun 2013 23:56:06 -0400
Subject: [PATCH 01/18] start experimenting with a fallback layer

---
 channel.js                    |   2 +
 notwebsocket.js               | 118 ++++++++++++++++++++++++++++++++++
 server.js                     |  48 ++++++++++++++
 www/assets/js/callbacks.js    |   7 ++
 www/assets/js/notwebsocket.js |  50 ++++++++++++++
 www/channel.html              |   1 +
 6 files changed, 226 insertions(+)
 create mode 100644 notwebsocket.js
 create mode 100644 www/assets/js/notwebsocket.js

diff --git a/channel.js b/channel.js
index 9aad63a6..af565ed4 100644
--- a/channel.js
+++ b/channel.js
@@ -19,6 +19,7 @@ var Logger = require("./logger.js");
 var InfoGetter = require("./get-info.js");
 var Server = require("./server.js");
 var io = Server.io;
+var NWS = require("./notwebsocket");
 var Rank = require("./rank.js");
 var Auth = require("./auth.js");
 var ChatCommand = require("./chatcommand.js");
@@ -760,6 +761,7 @@ Channel.prototype.sendRecentChat = function(user) {
 
 Channel.prototype.sendAll = function(message, data) {
     io.sockets.in(this.name).emit(message, data);
+    NWS.inRoom(this.name).emit(message, data);
 }
 
 Channel.prototype.broadcastPlaylistMeta = function() {
diff --git a/notwebsocket.js b/notwebsocket.js
new file mode 100644
index 00000000..8cee92f0
--- /dev/null
+++ b/notwebsocket.js
@@ -0,0 +1,118 @@
+const chars = "abcdefghijklmnopqsrtuvwxyz" +
+              "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+              "0123456789";
+
+
+var NotWebsocket = function() {
+    this.hash = "";
+    for(var i = 0; i < 30; i++) {
+        this.hash += chars[parseInt(Math.random() * (chars.length - 1))];
+    }
+
+    this.pktqueue = [];
+    this.handlers = {};
+    this.room = "";
+}
+
+NotWebsocket.prototype.emit = function(msg, data) {
+    //hack because something fishy is going on
+    if(typeof msg === "object") {
+        data = msg["1"];
+        msg = msg["0"];
+    }
+    var pkt = [msg, data];
+    this.pktqueue.push(pkt);
+}
+
+NotWebsocket.prototype.poll = function() {
+    var q = this.pktqueue;
+    this.pktqueue = [];
+    return q;
+}
+
+NotWebsocket.prototype.on = function(msg, callback) {
+    if(!(msg in this.handlers))
+        this.handlers[msg] = [];
+    this.handlers[msg].push(callback);
+}
+
+NotWebsocket.prototype.recv = function(urlstr) {
+    var msg, data;
+    try {
+        var js = JSON.parse(urlstr);
+        msg = js[0];
+        data = js[1];
+    }
+    catch(e) {
+        console.log("Failed to parse NWS string");
+    }
+    if(!msg)
+        return;
+    if(!(msg in this.handlers))
+        return;
+    for(var i = 0; i < this.handlers[msg].length; i++) {
+        this.handlers[msg][i](data);
+    }
+}
+
+NotWebsocket.prototype.join = function(rm) {
+    this.room = rm;
+}
+
+NotWebsocket.prototype.disconnect = function() {
+    
+}
+
+function sendJSON(res, obj) {
+    var response = JSON.stringify(obj, null, 4);
+    if(res.callback) {
+        response = res.callback + "(" + response + ")";
+    }
+    var len = unescape(encodeURIComponent(response)).length;
+
+    res.setHeader("Content-Type", "application/json");
+    res.setHeader("Content-Length", len);
+    res.end(response);
+}
+
+var clients = {};
+function newConnection(req, res) {
+    var nws = new NotWebsocket();
+    clients[nws.hash] = nws;
+    sendJSON(res, nws.hash);
+    return nws;
+}
+exports.newConnection = newConnection;
+
+function msgReceived(req, res) {
+    var h = req.params.hash;
+    if(h in clients) {
+        if(req.params.str == "poll") {
+            sendJSON(res, clients[h].poll());
+        }
+        else {
+            clients[h].recv(unescape(req.params.str));
+            sendJSON(res, "");
+        }
+    }
+}
+exports.msgReceived = msgReceived;
+
+function inRoom(rm) {
+    var cl = [];
+    for(var h in clients) {
+        if(clients[h].room == rm) {
+            cl.push(clients[h]);
+        }
+    }
+
+    return {
+        emit: function() {
+            for(var i = 0; i < this.cl.length; i++) {
+                this.cl[i].emit(arguments);
+            }
+        },
+        cl: cl
+    };
+}
+exports.inRoom = inRoom;
diff --git a/server.js b/server.js
index 1676ad3a..5362237a 100644
--- a/server.js
+++ b/server.js
@@ -18,6 +18,7 @@ Logger.syslog.log("Starting CyTube v" + VERSION);
 var Config = require("./config.js");
 var express = require("express");
 var API = require("./api.js");
+var NWS = require("./notwebsocket");
 
 var app = express();
 app.get("/r/:channel(*)", function(req, res, next) {
@@ -34,6 +35,53 @@ app.get("/api/:apireq(*)", function(req, res, next) {
     API.handle(req.url.substring(5), req, res);
 });
 
+function getClientIP(req) {
+    var ip;
+    var forward = req.header("x-forwarded-for");
+    if(forward) {
+        ip = forward.split(",")[0];
+    }
+    if(!ip) {
+        ip = req.connection.remoteAddress;
+    }
+    return ip;
+}
+
+app.get("/nws/connect", function(req, res, next) {
+    var socket = NWS.newConnection(req, res);
+    var ip = getClientIP(req);
+    if(Database.checkGlobalBan(ip)) {
+        Logger.syslog.log("Disconnecting " + ip + " - bant");
+        socket.emit("kick", {
+            reason: "You're globally banned!"
+        });
+        socket.disconnect(true);
+        return;
+    }
+    socket.on("disconnect", function() {
+        exports.clients[ip]--;
+    });
+    if(!(ip in exports.clients)) {
+        exports.clients[ip] = 1;
+    }
+    else {
+        exports.clients[ip]++;
+    }
+    if(exports.clients[ip] > Config.MAX_PER_IP) {
+        socket.emit("kick", {
+            reason: "Too many connections from your IP address"
+        });
+        socket.disconnect(true);
+        return;
+    }
+    var user = new User(socket, ip);
+    Logger.syslog.log("Accepted connection from /" + user.ip);
+});
+
+app.get("/nws/:hash/:str", function(req, res, next) {
+    NWS.msgReceived(req, res);
+});
+
 app.get("/:thing(*)", function(req, res, next) {
     res.sendfile(__dirname + "/www/" + req.params.thing);
 });
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 2c2201b5..b2f36ec1 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -835,6 +835,7 @@ Callbacks = {
     }
 }
 
+/*
 $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
     try {
         socket = io.connect(IO_URL);
@@ -846,3 +847,9 @@ $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
         Callbacks.disconnect();
     }
 });
+*/
+
+socket = new NotWebsocket();
+for(var key in Callbacks) {
+    socket.on(key, Callbacks[key]);
+}
diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
new file mode 100644
index 00000000..2add0ade
--- /dev/null
+++ b/www/assets/js/notwebsocket.js
@@ -0,0 +1,50 @@
+var NotWebsocket = function() {
+    this.connected = false;
+    $.getJSON(WEB_URL + "/nws/connect", function(data) {
+        this.hash = data;
+        this.connected = true;
+        this.recv(["connect", undefined]);
+        this.pollint = setInterval(function() {
+            this.poll();
+        }.bind(this), 100);
+    }.bind(this));
+
+    this.handlers = {};
+}
+
+NotWebsocket.prototype.emit = function(msg, data) {
+    if(!this.connected) {
+        setTimeout(function() {
+            this.emit(msg, data);
+        }.bind(this), 100);
+    }
+    var pkt = [msg, data];
+    var str = escape(JSON.stringify(pkt));
+    $.getJSON(WEB_URL+"/nws/"+this.hash+"/"+str, function(){});
+}
+
+NotWebsocket.prototype.on = function(msg, callback) {
+    if(!(msg in this.handlers))
+        this.handlers[msg] = [];
+    this.handlers[msg].push(callback);
+}
+
+NotWebsocket.prototype.poll = function() {
+    if(!this.connected)
+        return;
+    $.getJSON(WEB_URL+"/nws/"+this.hash+"/poll", function(data) {
+        for(var i = 0; i < data.length; i++) {
+            console.log("DBG", data[i]);
+            this.recv(data[i]);
+        }
+    }.bind(this));
+}
+
+NotWebsocket.prototype.recv = function(pkt) {
+    var msg = pkt[0], data = pkt[1];
+    if(!(msg in this.handlers))
+        return;
+    for(var i = 0; i < this.handlers[msg].length; i++) {
+        this.handlers[msg][i](data);
+    }
+}
diff --git a/www/channel.html b/www/channel.html
index a1977ff2..c3413473 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -313,6 +313,7 @@
     <script src="./assets/js/media.js"></script>
     <script src="./assets/js/functions.js"></script>
     <script src="./assets/js/client.js"></script>
+    <script src="./assets/js/notwebsocket.js"></script>
     <script src="./assets/js/callbacks.js"></script>
     <!-- APIs -->
     <script src="http://api.dmcdn.net/all.js"></script>

From 44fa360c600d3772cbd2a7ca45e11e1abbe0ea79 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 11:46:06 -0400
Subject: [PATCH 02/18] Continue working on NWS

---
 notwebsocket.js               | 84 ++++++++++++++++++++++++++---------
 www/assets/js/notwebsocket.js | 48 +++++++++++++++++---
 2 files changed, 104 insertions(+), 28 deletions(-)

diff --git a/notwebsocket.js b/notwebsocket.js
index 8cee92f0..ca2c72bb 100644
--- a/notwebsocket.js
+++ b/notwebsocket.js
@@ -1,8 +1,9 @@
+var Logger = require("./logger");
+
 const chars = "abcdefghijklmnopqsrtuvwxyz" +
               "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
               "0123456789";
 
-
 var NotWebsocket = function() {
     this.hash = "";
     for(var i = 0; i < 30; i++) {
@@ -12,21 +13,23 @@ var NotWebsocket = function() {
     this.pktqueue = [];
     this.handlers = {};
     this.room = "";
+    this.lastpoll = Date.now();
 }
 
 NotWebsocket.prototype.emit = function(msg, data) {
-    //hack because something fishy is going on
-    if(typeof msg === "object") {
-        data = msg["1"];
-        msg = msg["0"];
-    }
     var pkt = [msg, data];
     this.pktqueue.push(pkt);
 }
 
 NotWebsocket.prototype.poll = function() {
-    var q = this.pktqueue;
-    this.pktqueue = [];
+    this.lastpoll = Date.now();
+    var q = [];
+    for(var i = 0; i < this.pktqueue.length; i++) {
+        q.push(this.pktqueue[i]);
+    }
+    this.pktqueue.length = 0;
+    if(q.length > 0)
+        console.log("sending", q.length);
     return q;
 }
 
@@ -44,7 +47,8 @@ NotWebsocket.prototype.recv = function(urlstr) {
         data = js[1];
     }
     catch(e) {
-        console.log("Failed to parse NWS string");
+        Logger.errlog.log("Failed to parse NWS string");
+        Logger.errlog.log(urlstr);
     }
     if(!msg)
         return;
@@ -56,11 +60,32 @@ NotWebsocket.prototype.recv = function(urlstr) {
 }
 
 NotWebsocket.prototype.join = function(rm) {
-    this.room = rm;
+    if(!(rm in rooms)) {
+        rooms[rm] = [];
+    }
+
+    rooms[rm].push(this);
+}
+
+NotWebsocket.prototype.leave = function(rm) {
+    if(rm in rooms) {
+        var idx = rooms[rm].indexOf(this);
+        if(idx >= 0) {
+            rooms[rm].splice(idx, 1);
+        }
+    }
 }
 
 NotWebsocket.prototype.disconnect = function() {
-    
+    for(var rm in rooms) {
+        this.leave(rm);
+    }
+
+    this.recv(JSON.stringify(["disconnect", undefined]));
+    this.emit("disconnect");
+
+    clients[this.hash] = null;
+    delete clients[this.hash];
 }
 
 function sendJSON(res, obj) {
@@ -76,6 +101,8 @@ function sendJSON(res, obj) {
 }
 
 var clients = {};
+var rooms = {};
+
 function newConnection(req, res) {
     var nws = new NotWebsocket();
     clients[nws.hash] = nws;
@@ -86,7 +113,7 @@ exports.newConnection = newConnection;
 
 function msgReceived(req, res) {
     var h = req.params.hash;
-    if(h in clients) {
+    if(h in clients && clients[h] != null) {
         if(req.params.str == "poll") {
             sendJSON(res, clients[h].poll());
         }
@@ -95,24 +122,37 @@ function msgReceived(req, res) {
             sendJSON(res, "");
         }
     }
+    else {
+        res.send(404);
+    }
 }
 exports.msgReceived = msgReceived;
 
 function inRoom(rm) {
     var cl = [];
-    for(var h in clients) {
-        if(clients[h].room == rm) {
-            cl.push(clients[h]);
+
+    if(rm in rooms) {
+        for(var i = 0; i < rooms[rm].length; i++) {
+            cl.push(rooms[rm][i]);
         }
     }
 
-    return {
-        emit: function() {
-            for(var i = 0; i < this.cl.length; i++) {
-                this.cl[i].emit(arguments);
-            }
-        },
-        cl: cl
+    cl.emit = function(msg, data) {
+        for(var i = 0; i < this.length; i++) {
+            this[i].emit(msg, data);
+        }
     };
+
+    return cl;
 }
 exports.inRoom = inRoom;
+
+function checkDeadSockets() {
+    for(var h in clients) {
+        if(Date.now() - clients[h].lastpoll >= 2000) {
+            clients[h].disconnect();
+        }
+    }
+}
+
+setInterval(checkDeadSockets, 2000);
diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
index 2add0ade..59d3ae1e 100644
--- a/www/assets/js/notwebsocket.js
+++ b/www/assets/js/notwebsocket.js
@@ -1,5 +1,19 @@
 var NotWebsocket = function() {
     this.connected = false;
+    $.getJSON(WEB_URL + "/nws/connect", function(data) {
+        console.log(data);
+        this.hash = data;
+        this.connected = true;
+        this.recv(["connect", undefined]);
+        this.pollint = setInterval(function() {
+            this.poll();
+        }.bind(this), 500);
+    }.bind(this));
+
+    this.handlers = {};
+}
+
+NotWebsocket.prototype.reconnect = function() {
     $.getJSON(WEB_URL + "/nws/connect", function(data) {
         this.hash = data;
         this.connected = true;
@@ -7,9 +21,14 @@ var NotWebsocket = function() {
         this.pollint = setInterval(function() {
             this.poll();
         }.bind(this), 100);
+    }.bind(this))
+    .fail(function() {
+        if(this.reconndelay < 10000)
+            this.reconndelay += 100;
+        setTimeout(function() {
+            this.reconnect();
+        }.bind(this), this.reconndelay);
     }.bind(this));
-
-    this.handlers = {};
 }
 
 NotWebsocket.prototype.emit = function(msg, data) {
@@ -17,9 +36,10 @@ NotWebsocket.prototype.emit = function(msg, data) {
         setTimeout(function() {
             this.emit(msg, data);
         }.bind(this), 100);
+        return;
     }
     var pkt = [msg, data];
-    var str = escape(JSON.stringify(pkt));
+    var str = escape(JSON.stringify(pkt)).replace(/\//g, "%2F");
     $.getJSON(WEB_URL+"/nws/"+this.hash+"/"+str, function(){});
 }
 
@@ -33,18 +53,34 @@ NotWebsocket.prototype.poll = function() {
     if(!this.connected)
         return;
     $.getJSON(WEB_URL+"/nws/"+this.hash+"/poll", function(data) {
+        if(data.length > 0)
+            console.log("receiving", data.length);
         for(var i = 0; i < data.length; i++) {
-            console.log("DBG", data[i]);
-            this.recv(data[i]);
+            try {
+                this.recv(data[i]);
+            }
+            catch(e) { }
         }
+    }.bind(this))
+    .fail(function() {
+        this.disconnect();
     }.bind(this));
 }
 
 NotWebsocket.prototype.recv = function(pkt) {
     var msg = pkt[0], data = pkt[1];
-    if(!(msg in this.handlers))
+    if(!(msg in this.handlers)) {
         return;
+    }
     for(var i = 0; i < this.handlers[msg].length; i++) {
         this.handlers[msg][i](data);
     }
 }
+
+NotWebsocket.prototype.disconnect = function() {
+    this.recv(["disconnect", undefined]);
+    clearInterval(this.pollint);
+    this.connected = false;
+    this.reconndelay = 100;
+    this.reconnect();
+}

From cc1b378c3d1f7a230c33607eeaa7a48f8a2a0798 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 12:11:16 -0400
Subject: [PATCH 03/18] NWS fixes

---
 notwebsocket.js               |  9 +++++----
 www/assets/js/notwebsocket.js | 17 +++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/notwebsocket.js b/notwebsocket.js
index ca2c72bb..f1b65f91 100644
--- a/notwebsocket.js
+++ b/notwebsocket.js
@@ -28,8 +28,6 @@ NotWebsocket.prototype.poll = function() {
         q.push(this.pktqueue[i]);
     }
     this.pktqueue.length = 0;
-    if(q.length > 0)
-        console.log("sending", q.length);
     return q;
 }
 
@@ -106,6 +104,7 @@ var rooms = {};
 function newConnection(req, res) {
     var nws = new NotWebsocket();
     clients[nws.hash] = nws;
+    res.callback = req.query.callback;
     sendJSON(res, nws.hash);
     return nws;
 }
@@ -114,11 +113,13 @@ exports.newConnection = newConnection;
 function msgReceived(req, res) {
     var h = req.params.hash;
     if(h in clients && clients[h] != null) {
-        if(req.params.str == "poll") {
+        var str = req.params.str;
+        res.callback = req.query.callback;
+        if(str == "poll") {
             sendJSON(res, clients[h].poll());
         }
         else {
-            clients[h].recv(unescape(req.params.str));
+            clients[h].recv(unescape(str));
             sendJSON(res, "");
         }
     }
diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
index 59d3ae1e..67d6765a 100644
--- a/www/assets/js/notwebsocket.js
+++ b/www/assets/js/notwebsocket.js
@@ -7,7 +7,7 @@ var NotWebsocket = function() {
         this.recv(["connect", undefined]);
         this.pollint = setInterval(function() {
             this.poll();
-        }.bind(this), 500);
+        }.bind(this), 100);
     }.bind(this));
 
     this.handlers = {};
@@ -52,17 +52,20 @@ NotWebsocket.prototype.on = function(msg, callback) {
 NotWebsocket.prototype.poll = function() {
     if(!this.connected)
         return;
-    $.getJSON(WEB_URL+"/nws/"+this.hash+"/poll", function(data) {
-        if(data.length > 0)
-            console.log("receiving", data.length);
+    if(this.polling)
+        return false;
+    $.getJSON(WEB_URL+"/nws/"+this.hash+"/poll?callback=?", function(data) {
+        this.polling = true;
         for(var i = 0; i < data.length; i++) {
             try {
                 this.recv(data[i]);
             }
             catch(e) { }
         }
+        this.polling = false;
     }.bind(this))
     .fail(function() {
+        console.log(arguments);
         this.disconnect();
     }.bind(this));
 }
@@ -81,6 +84,8 @@ NotWebsocket.prototype.disconnect = function() {
     this.recv(["disconnect", undefined]);
     clearInterval(this.pollint);
     this.connected = false;
-    this.reconndelay = 100;
-    this.reconnect();
+    this.reconndelay = 1000;
+    setTimeout(function() {
+        this.reconnect();
+    }.bind(this), this.reconndelay);
 }

From ddc1c56986a05dd5a4d324f39e761ff978140406 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 15:28:54 -0400
Subject: [PATCH 04/18] Adaptive poll rate for NWS

---
 www/assets/js/notwebsocket.js | 106 ++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 38 deletions(-)

diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
index 67d6765a..fcdf7677 100644
--- a/www/assets/js/notwebsocket.js
+++ b/www/assets/js/notwebsocket.js
@@ -1,18 +1,79 @@
 var NotWebsocket = function() {
     this.connected = false;
+    this.polltmr = false;
     $.getJSON(WEB_URL + "/nws/connect", function(data) {
         console.log(data);
         this.hash = data;
         this.connected = true;
         this.recv(["connect", undefined]);
-        this.pollint = setInterval(function() {
-            this.poll();
-        }.bind(this), 100);
+        this.pollint = 100;
+        this.pollonce();
     }.bind(this));
 
     this.handlers = {};
 }
 
+NotWebsocket.prototype.pollonce = function() {
+    if(this.polltmr !== false)
+        clearTimeout(this.polltmr);
+    if(!this.connected)
+        return;
+    this.poll();
+    this.polltmr = setTimeout(function() {
+        this.pollonce();
+    }.bind(this), this.pollint);
+}
+
+NotWebsocket.prototype.poll = function() {
+    if(!this.connected)
+        return;
+    if(this.polling)
+        return;
+    $.getJSON(WEB_URL+"/nws/"+this.hash+"/poll?callback=?", function(data) {
+        this.polling = true;
+        // Adaptive polling rate
+        // Poll every 1000ms if no activity
+        //      every 500ms if minor activity
+        //      every 100ms is very active
+        if(data.length == 0) {
+            this.pollint = 1000;
+        }
+        else if(data.length < 10 && this.pollint < 500) {
+            this.pollint += 100;
+        }
+        else if(data.length > 10) {
+            this.pollint = 100;
+        }
+        for(var i = 0; i < data.length; i++) {
+            try {
+                this.recv(data[i]);
+            }
+            catch(e) { }
+        }
+        this.polling = false;
+    }.bind(this))
+    .fail(function() {
+        this.disconnect();
+    }.bind(this));
+}
+
+NotWebsocket.prototype.emit = function(msg, data) {
+    if(!this.connected) {
+        setTimeout(function() {
+            this.emit(msg, data);
+        }.bind(this), 100);
+        return;
+    }
+    var pkt = [msg, data];
+    var str = escape(JSON.stringify(pkt)).replace(/\//g, "%2F");
+    $.getJSON(WEB_URL+"/nws/"+this.hash+"/"+str, function() {
+        // Poll more quickly because sending a packet usually means
+        // expecting some data to come back
+        this.pollint = 100;
+        this.pollonce();
+    }.bind(this));
+}
+
 NotWebsocket.prototype.reconnect = function() {
     $.getJSON(WEB_URL + "/nws/connect", function(data) {
         this.hash = data;
@@ -24,52 +85,19 @@ NotWebsocket.prototype.reconnect = function() {
     }.bind(this))
     .fail(function() {
         if(this.reconndelay < 10000)
-            this.reconndelay += 100;
+            this.reconndelay += 500;
         setTimeout(function() {
             this.reconnect();
         }.bind(this), this.reconndelay);
     }.bind(this));
 }
 
-NotWebsocket.prototype.emit = function(msg, data) {
-    if(!this.connected) {
-        setTimeout(function() {
-            this.emit(msg, data);
-        }.bind(this), 100);
-        return;
-    }
-    var pkt = [msg, data];
-    var str = escape(JSON.stringify(pkt)).replace(/\//g, "%2F");
-    $.getJSON(WEB_URL+"/nws/"+this.hash+"/"+str, function(){});
-}
-
 NotWebsocket.prototype.on = function(msg, callback) {
     if(!(msg in this.handlers))
         this.handlers[msg] = [];
     this.handlers[msg].push(callback);
 }
 
-NotWebsocket.prototype.poll = function() {
-    if(!this.connected)
-        return;
-    if(this.polling)
-        return false;
-    $.getJSON(WEB_URL+"/nws/"+this.hash+"/poll?callback=?", function(data) {
-        this.polling = true;
-        for(var i = 0; i < data.length; i++) {
-            try {
-                this.recv(data[i]);
-            }
-            catch(e) { }
-        }
-        this.polling = false;
-    }.bind(this))
-    .fail(function() {
-        console.log(arguments);
-        this.disconnect();
-    }.bind(this));
-}
-
 NotWebsocket.prototype.recv = function(pkt) {
     var msg = pkt[0], data = pkt[1];
     if(!(msg in this.handlers)) {
@@ -82,7 +110,9 @@ NotWebsocket.prototype.recv = function(pkt) {
 
 NotWebsocket.prototype.disconnect = function() {
     this.recv(["disconnect", undefined]);
-    clearInterval(this.pollint);
+    if(this.polltmr !== false)
+        clearTimeout(this.polltmr);
+    this.polltmr = false;
     this.connected = false;
     this.reconndelay = 1000;
     setTimeout(function() {

From cfc866400cefd0f2f84919dba8ff76a66a7fbdee Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 15:41:34 -0400
Subject: [PATCH 05/18] Break out NWS into a user option

---
 www/assets/js/callbacks.js    |  7 -------
 www/assets/js/client.js       |  3 ++-
 www/assets/js/functions.js    | 28 ++++++++++++++++++++++++++++
 www/assets/js/notwebsocket.js |  1 -
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index b2f36ec1..2c2201b5 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -835,7 +835,6 @@ Callbacks = {
     }
 }
 
-/*
 $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
     try {
         socket = io.connect(IO_URL);
@@ -847,9 +846,3 @@ $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
         Callbacks.disconnect();
     }
 });
-*/
-
-socket = new NotWebsocket();
-for(var key in Callbacks) {
-    socket.on(key, Callbacks[key]);
-}
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index d44cc27c..dcf7af82 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -71,7 +71,8 @@ var USEROPTS = {
     modhat          : parseBool(getOrDefault("cytube_modhat", false)),
     blink_title     : parseBool(getOrDefault("cytube_blink_title", false)),
     sync_accuracy   : parseFloat(getOrDefault("cytube_sync_accuracy", 2)) || 2,
-    chatbtn         : parseBool(getOrDefault("cytube_chatbtn", false))
+    chatbtn         : parseBool(getOrDefault("cytube_chatbtn", false)),
+    altsocket       : parseBool(getOrDefault("cytube_altsocket", false))
 };
 applyOpts();
 $("#optlink").click(showUserOpts);
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 47890980..7b41dd17 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -1070,6 +1070,13 @@ function showUserOpts() {
     sendbtn.prop("checked", USEROPTS.chatbtn);
     addOption("Send Button", sendbtncontainer);
 
+    var altsocketcontainer = $("<label/>").addClass("checkbox")
+        .text("Use alternative socket connection");
+    var altsocket = $("<input/>").attr("type", "checkbox")
+        .appendTo(altsocketcontainer);
+    altsocket.prop("checked", USEROPTS.altsocket);
+    addOption("Alternate Socket", altsocketcontainer);
+
     var profile = $("<a/>").attr("target", "_blank")
         .addClass("btn")
         .attr("href", "./account.html")
@@ -1100,6 +1107,7 @@ function showUserOpts() {
         USEROPTS.show_timestamps = showts.prop("checked");
         USEROPTS.blink_title     = blink.prop("checked");
         USEROPTS.chatbtn         = sendbtn.prop("checked");
+        USEROPTS.altsocket       = altsocket.prop("checked");
         if(RANK >= Rank.Moderator) {
             USEROPTS.modhat = modhat.prop("checked");
         }
@@ -1179,6 +1187,26 @@ function applyOpts() {
             }
         });
     }
+
+    if(USEROPTS.altsocket) {
+        socket.disconnect();
+        socket = new NotWebsocket();
+        for(var key in Callbacks) {
+            socket.on(key, Callbacks[key]);
+        }
+    }
+    // Switch from NotWebsocket => Socket.io
+    else if(socket && typeof socket.poll !== "undefined") {
+        try {
+            socket = io.connect(IO_URL);
+            for(var key in Callbacks) {
+                socket.on(key, Callbacks[key]);
+            }
+        }
+        catch(e) {
+            Callbacks.disconnect();
+        }
+    }
 }
 
 function idToURL(data) {
diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
index fcdf7677..a5e67ee1 100644
--- a/www/assets/js/notwebsocket.js
+++ b/www/assets/js/notwebsocket.js
@@ -2,7 +2,6 @@ var NotWebsocket = function() {
     this.connected = false;
     this.polltmr = false;
     $.getJSON(WEB_URL + "/nws/connect", function(data) {
-        console.log(data);
         this.hash = data;
         this.connected = true;
         this.recv(["connect", undefined]);

From 2c57d2a8f2a1bb4d8b49b1d2be3fd6f389f849ac Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 18:22:05 -0400
Subject: [PATCH 06/18] Fixes, rate limiting

---
 notwebsocket.js               | 34 +++++++++++++++++++++++++++++-----
 www/assets/js/callbacks.js    |  6 ++++++
 www/assets/js/functions.js    | 15 +++++++--------
 www/assets/js/notwebsocket.js |  1 +
 www/channel.html              |  2 +-
 5 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/notwebsocket.js b/notwebsocket.js
index f1b65f91..2f6409cd 100644
--- a/notwebsocket.js
+++ b/notwebsocket.js
@@ -14,6 +14,23 @@ var NotWebsocket = function() {
     this.handlers = {};
     this.room = "";
     this.lastpoll = Date.now();
+    this.noflood = {};
+}
+
+NotWebsocket.prototype.checkFlood = function(id, rate) {
+    if(id in this.noflood) {
+        this.noflood[id].push(Date.now());
+    }
+    else {
+        this.noflood[id] = [Date.now()];
+    }
+    if(this.noflood[id].length > 10) {
+        this.noflood[id].shift();
+        var hz = 10000 / (this.noflood[id][9] - this.noflood[id][0]);
+        if(hz > rate) {
+            throw "Rate is too high: " + id;
+        }
+    }
 }
 
 NotWebsocket.prototype.emit = function(msg, data) {
@@ -22,6 +39,7 @@ NotWebsocket.prototype.emit = function(msg, data) {
 }
 
 NotWebsocket.prototype.poll = function() {
+    this.checkFlood("poll", 100);
     this.lastpoll = Date.now();
     var q = [];
     for(var i = 0; i < this.pktqueue.length; i++) {
@@ -38,6 +56,7 @@ NotWebsocket.prototype.on = function(msg, callback) {
 }
 
 NotWebsocket.prototype.recv = function(urlstr) {
+    this.checkFlood("recv", 100);
     var msg, data;
     try {
         var js = JSON.parse(urlstr);
@@ -115,12 +134,17 @@ function msgReceived(req, res) {
     if(h in clients && clients[h] != null) {
         var str = req.params.str;
         res.callback = req.query.callback;
-        if(str == "poll") {
-            sendJSON(res, clients[h].poll());
+        try {
+            if(str == "poll") {
+                sendJSON(res, clients[h].poll());
+            }
+            else {
+                clients[h].recv(unescape(str));
+                sendJSON(res, "");
+            }
         }
-        else {
-            clients[h].recv(unescape(str));
-            sendJSON(res, "");
+        catch(e) {
+            res.send(429); // 429 Too Many Requests
         }
     }
     else {
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 2c2201b5..f34a7b33 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -846,3 +846,9 @@ $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
         Callbacks.disconnect();
     }
 });
+
+window.setupNewSocket = function() {
+    for(var key in Callbacks) {
+        socket.on(key, Callbacks[key]);
+    }
+}
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 7b41dd17..d344b813 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -1129,6 +1129,9 @@ function saveOpts() {
     }
 }
 
+// To be overridden in callbacks.js
+function setupNewSocket() { }
+
 function applyOpts() {
     $("#usertheme").remove();
     if(USEROPTS.theme != "default") {
@@ -1189,22 +1192,18 @@ function applyOpts() {
     }
 
     if(USEROPTS.altsocket) {
-        socket.disconnect();
+        if(socket)
+            socket.disconnect();
         socket = new NotWebsocket();
-        for(var key in Callbacks) {
-            socket.on(key, Callbacks[key]);
-        }
+        setupNewSocket();
     }
     // Switch from NotWebsocket => Socket.io
     else if(socket && typeof socket.poll !== "undefined") {
         try {
             socket = io.connect(IO_URL);
-            for(var key in Callbacks) {
-                socket.on(key, Callbacks[key]);
-            }
+            setupNewSocket();
         }
         catch(e) {
-            Callbacks.disconnect();
         }
     }
 }
diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
index a5e67ee1..a0495b26 100644
--- a/www/assets/js/notwebsocket.js
+++ b/www/assets/js/notwebsocket.js
@@ -118,3 +118,4 @@ NotWebsocket.prototype.disconnect = function() {
         this.reconnect();
     }.bind(this), this.reconndelay);
 }
+
diff --git a/www/channel.html b/www/channel.html
index c3413473..3d8e62a3 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -310,10 +310,10 @@
     <script src="./assets/js/jquery.js"></script>
     <!-- My Javascript -->
     <script src="./assets/js/iourl.js"></script>
+    <script src="./assets/js/notwebsocket.js"></script>
     <script src="./assets/js/media.js"></script>
     <script src="./assets/js/functions.js"></script>
     <script src="./assets/js/client.js"></script>
-    <script src="./assets/js/notwebsocket.js"></script>
     <script src="./assets/js/callbacks.js"></script>
     <!-- APIs -->
     <script src="http://api.dmcdn.net/all.js"></script>

From a02228afdd362b6b590e33639c2d1e3bbd91b068 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 18:26:17 -0400
Subject: [PATCH 07/18] Add license text to files missing it

---
 database.js                   | 11 +++++++++++
 filter.js                     | 11 +++++++++++
 notwebsocket.js               | 11 +++++++++++
 www/assets/js/account.js      | 11 +++++++++++
 www/assets/js/callbacks.js    | 11 +++++++++++
 www/assets/js/media.js        | 11 +++++++++++
 www/assets/js/notwebsocket.js | 11 +++++++++++
 7 files changed, 77 insertions(+)

diff --git a/database.js b/database.js
index 9557f477..c734695e 100644
--- a/database.js
+++ b/database.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 var mysql = require("mysql-libmysqlclient");
 var Logger = require("./logger");
 var Media = require("./media").Media;
diff --git a/filter.js b/filter.js
index c26a1fec..c2586abf 100644
--- a/filter.js
+++ b/filter.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 var Filter = function(name, regex, flags, replace) {
     this.name = name;
     this.source = regex;
diff --git a/notwebsocket.js b/notwebsocket.js
index 2f6409cd..c4862ea4 100644
--- a/notwebsocket.js
+++ b/notwebsocket.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 var Logger = require("./logger");
 
 const chars = "abcdefghijklmnopqsrtuvwxyz" +
diff --git a/www/assets/js/account.js b/www/assets/js/account.js
index 816e2036..04d04de8 100644
--- a/www/assets/js/account.js
+++ b/www/assets/js/account.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 var uname = readCookie("sync_uname") || "";
 var session = readCookie("sync_session") || "";
 var api = WEB_URL + "/api/json/";
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index f34a7b33..ee6891fd 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 Callbacks = {
 
     connect: function() {
diff --git a/www/assets/js/media.js b/www/assets/js/media.js
index 1783ccf0..401bead5 100644
--- a/www/assets/js/media.js
+++ b/www/assets/js/media.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 var Media = function(data) {
     if(!data) {
         data = {
diff --git a/www/assets/js/notwebsocket.js b/www/assets/js/notwebsocket.js
index a0495b26..7aba9f4c 100644
--- a/www/assets/js/notwebsocket.js
+++ b/www/assets/js/notwebsocket.js
@@ -1,3 +1,14 @@
+/*
+The MIT License (MIT)
+Copyright (c) 2013 Calvin Montgomery
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 var NotWebsocket = function() {
     this.connected = false;
     this.polltmr = false;

From ae55f449060bf1bd68da764f9648835b378e5b4b Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 18:33:51 -0400
Subject: [PATCH 08/18] Fix #165

---
 channel.js | 8 ++------
 user.js    | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/channel.js b/channel.js
index af565ed4..cdef75a3 100644
--- a/channel.js
+++ b/channel.js
@@ -537,12 +537,8 @@ Channel.prototype.userJoin = function(user) {
     if(user.name != "") {
         for(var i = 0; i < this.users.length; i++) {
             if(this.users[i].name.toLowerCase() == user.name.toLowerCase()) {
-                user.name = "";
-                user.loggedIn = false;
-                user.socket.emit("login", {
-                    success: false,
-                    error: "The username " + user.name + " is already in use on this channel"
-                });
+                console.log("DBG");
+                this.kick(this.users[i], "Duplicate login");
             }
         }
     }
diff --git a/user.js b/user.js
index 5175a9e6..c675570f 100644
--- a/user.js
+++ b/user.js
@@ -521,11 +521,7 @@ User.prototype.login = function(name, pw, session) {
     if(this.channel != null && name != "") {
         for(var i = 0; i < this.channel.users.length; i++) {
             if(this.channel.users[i].name == name) {
-                this.socket.emit("login", {
-                    success: false,
-                    error: "The username " + name + " is already in use on this channel"
-                });
-                return false;
+                this.channel.kick(this.channel.users[i], "Duplicate login");
             }
         }
     }

From d5e03c10b6ee23a9d89d7e88cae6af803e5b16ea Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 18:34:03 -0400
Subject: [PATCH 09/18] Increment version number

---
 package.json | 2 +-
 server.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 838002ad..85c80382 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.9.3",
+    "version": "1.9.4",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 5362237a..d10e63a2 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.9.3";
+const VERSION = "1.9.4";
 
 var fs = require("fs");
 var Logger = require("./logger.js");

From ef6a415c1b6c267dd71634d9df1af3f8cbeafa0e Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 22:36:49 -0400
Subject: [PATCH 10/18] Don't remove user theme when channel CSS is set

---
 www/assets/js/callbacks.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index ee6891fd..3396ed7b 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -206,7 +206,6 @@ Callbacks = {
         $("#opt_show_public").prop("checked", opts.show_public);
         $("#customCss").remove();
         if(opts.customcss.trim() != "") {
-            $("#usertheme").remove();
             $("<link/>")
                 .attr("rel", "stylesheet")
                 .attr("href", opts.customcss)
@@ -253,7 +252,6 @@ Callbacks = {
         $("#jstext").val(data.js);
 
         if(data.css) {
-            $("#usertheme").remove();
             $("<style/>").attr("type", "text/css")
                 .attr("id", "chancss")
                 .text(data.css)

From 8c6d2ccfb2ea78060df8154b1d931f8eefa0235d Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 22:47:02 -0400
Subject: [PATCH 11/18] Add imgur album embedding

---
 channel.js                 | 19 +++++++++++++------
 www/assets/js/functions.js | 10 ++++++++++
 www/assets/js/media.js     | 28 ++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/channel.js b/channel.js
index cdef75a3..aa4b60e4 100644
--- a/channel.js
+++ b/channel.js
@@ -952,12 +952,13 @@ function mediaUpdate(chan, id) {
 }
 
 function isLive(type) {
-    return type == "li"
-        || type == "tw"
-        || type == "jt"
-        || type == "rt"
-        || type == "jw"
-        || type == "us";
+    return type == "li" // Livestream.com
+        || type == "tw" // Twitch.tv
+        || type == "jt" // Justin.tv
+        || type == "rt" // RTMP
+        || type == "jw" // JWPlayer
+        || type == "us" // Ustream.tv
+        || type == "im";// Imgur album
 }
 
 Channel.prototype.queueAdd = function(media, idx) {
@@ -1050,6 +1051,12 @@ Channel.prototype.enqueue = function(data, user) {
                 this.autoTemp(media, user);
                 this.queueAdd(media, idx);
                 break;
+            case "im":
+                var media = new Media(data.id, "Imgur Album", "--:--", "im");
+                media.queueby = user ? user.name : "";
+                this.autoTemp(media, user);
+                this.queueAdd(media, idx);
+                break;
             default:
                 break;
         }
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index d344b813..e13310cf 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -669,6 +669,8 @@ function parseVideoURL(url){
         return [parseVimeo(url), "vi"];
     else if(url.indexOf("dailymotion.com") != -1)
         return [parseDailymotion(url), "dm"];
+    else if(url.indexOf("imgur.com") != -1)
+        return [parseImgur(url), "im"];
 }
 
 function parseYTURL(url) {
@@ -743,6 +745,14 @@ function parseDailymotion(url) {
     return null;
 }
 
+function parseImgur(url) {
+    var m = url.match(/imgur\.com\/a\/([a-zA-Z0-9]+)/);
+    if(m) {
+        return m[1];
+    }
+    return null;
+}
+
 function closePoll() {
     if($("#pollcontainer .active").length != 0) {
         var poll = $("#pollcontainer .active");
diff --git a/www/assets/js/media.js b/www/assets/js/media.js
index 401bead5..1a8cf6a4 100644
--- a/www/assets/js/media.js
+++ b/www/assets/js/media.js
@@ -51,6 +51,9 @@ var Media = function(data) {
         case "us":
             this.initUstream();
             break;
+        case "im":
+            this.initImgur();
+            break;
         default:
             this.nullPlayer();
             break;
@@ -467,6 +470,31 @@ Media.prototype.initUstream = function() {
     this.seek = function() { }
 }
 
+Media.prototype.initImgur = function() {
+    var iframe = $("<iframe/>").insertBefore($("#ytapiplayer"));
+    $("#ytapiplayer").remove();
+    iframe.attr("id", "ytapiplayer");
+    iframe.attr("width", VWIDTH);
+    iframe.attr("height", VHEIGHT);
+    iframe.attr("src", "http://imgur.com/a/"+this.id+"/embed");
+    iframe.attr("frameborder", "0");
+    iframe.attr("scrolling", "no");
+    iframe.css("border", "none");
+
+    this.load = function(data) {
+        this.id = data.id;
+        this.initImgur()
+    }
+
+    this.pause = function() { }
+
+    this.play = function() { }
+
+    this.getTime = function() { }
+
+    this.seek = function() { }
+}
+
 Media.prototype.update = function(data) {
     if(data.id && data.id != this.id) {
         if(data.currentTime < 0) {

From 33f4ffcec256f3b4253ab5ce160a1f8c91b7b5cd Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Tue, 4 Jun 2013 22:51:41 -0400
Subject: [PATCH 12/18] Add permission option for livestreams

---
 channel.js                 | 7 ++++++-
 www/assets/js/callbacks.js | 7 +++++--
 www/assets/js/functions.js | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/channel.js b/channel.js
index aa4b60e4..1c749da6 100644
--- a/channel.js
+++ b/channel.js
@@ -55,7 +55,7 @@ var Channel = function(name) {
         playlistdelete: 2,
         playlistjump: 1.5,
         playlistaddlist: 1.5,
-        playlistadd: 1.5,
+        playlistaddlive: 1.5,
         addnontemp: 2,
         settemp: 2,
         playlistgeturl: 1.5,
@@ -985,6 +985,11 @@ Channel.prototype.autoTemp = function(media, user) {
 Channel.prototype.enqueue = function(data, user) {
     var idx = data.pos == "next" ? this.position + 1 : this.queue.length;
 
+    if(isLive(data.type) && !this.hasPermission(user, "playlistaddlive")) {
+        user.socket.emit("queueFail", "You don't have permission to queue livestreams");
+        return;
+    }
+
     // Prefer cache over looking up new data
     if(data.id in this.library) {
         var media = this.library[data.id].dup();
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 3396ed7b..8680b4e1 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -581,8 +581,11 @@ Callbacks = {
         $(li).show("blind");
     },
 
-    queueFail: function() {
-        makeAlert("Error", "Queue failed.  Check your link to make sure it is valid.", "alert-error")
+    queueFail: function(data) {
+        if(!data) {
+            data = "Queue failed.  Check your link to make sure it is valid.";
+        }
+        makeAlert("Error", data, "alert-error")
             .insertAfter($("#playlist_controls"));
     },
 
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index e13310cf..135ab045 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -1314,6 +1314,7 @@ function genPermissionsEditor() {
     makeOption("Delete playlist items", "playlistdelete", standard, CHANPERMS.playlistdelete+"");
     makeOption("Jump to video", "playlistjump", standard, CHANPERMS.playlistjump+"");
     makeOption("Queue playlist", "playlistaddlist", standard, CHANPERMS.playlistaddlist+"");
+    makeOption("Queue livestream", "playlistaddlive", standard, CHANPERMS.playlistaddlive+"");
     makeOption("Add nontemporary media", "addnontemp", standard, CHANPERMS.addnontemp+"");
     makeOption("Temp/untemp playlist item", "settemp", standard, CHANPERMS.settemp+"");
     makeOption("Retrieve playlist URLs", "playlistgeturl", standard, CHANPERMS.playlistgeturl+"");

From 33744da63401a6bf9f5c0253d9b52e95021dafd2 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Wed, 5 Jun 2013 11:40:59 -0400
Subject: [PATCH 13/18] Revise channel ranks editor (Fixes #162)

---
 channel.js                 | 53 +++++++++++++++++++++++++++++--
 user.js                    |  6 ++++
 www/assets/js/callbacks.js | 43 +++++++------------------
 www/assets/js/functions.js | 65 +++++++++++++++++++++-----------------
 www/channel.html           |  3 +-
 5 files changed, 104 insertions(+), 66 deletions(-)

diff --git a/channel.js b/channel.js
index 1c749da6..af6ec42f 100644
--- a/channel.js
+++ b/channel.js
@@ -537,7 +537,6 @@ Channel.prototype.userJoin = function(user) {
     if(user.name != "") {
         for(var i = 0; i < this.users.length; i++) {
             if(this.users[i].name.toLowerCase() == user.name.toLowerCase()) {
-                console.log("DBG");
                 this.kick(this.users[i], "Duplicate login");
             }
         }
@@ -760,6 +759,14 @@ Channel.prototype.sendAll = function(message, data) {
     NWS.inRoom(this.name).emit(message, data);
 }
 
+Channel.prototype.sendAllWithPermission = function(perm, msg, data) {
+    for(var i = 0; i < this.users.length; i++) {
+        if(Rank.hasPermission(this.users[i], perm)) {
+            this.users[i].socket.emit(msg, data);
+        }
+    }
+}
+
 Channel.prototype.broadcastPlaylistMeta = function() {
     var total = 0;
     for(var i = 0; i < this.queue.length; i++) {
@@ -1671,6 +1678,46 @@ Channel.prototype.sendMessage = function(username, msg, msgclass, data) {
 
 /* REGION Rank stuff */
 
+Channel.prototype.trySetRank = function(user, data) {
+    if(!Rank.hasPermission(user, "promote"))
+        return;
+
+    if(typeof data.user !== "string" || typeof data.rank !== "number")
+        return;
+
+    if(data.rank >= user.rank)
+        return;
+
+    if(data.rank < 1)
+        return;
+
+    var receiver;
+    for(var i = 0; i < this.users.length; i++) {
+        if(this.users[i].name == data.user) {
+            receiver = this.users[i];
+            break;
+        }
+    }
+
+    if(receiver) {
+        if(receiver.rank >= user.rank)
+            return;
+        receiver.rank = data.rank;
+        if(receiver.loggedIn) {
+            this.saveRank(receiver);
+        }
+        this.broadcastUserUpdate(receiver);
+    }
+    else {
+        var rrank = this.getRank(data.user);
+        if(rrank >= user.rank)
+            return;
+        Database.setChannelRank(this.name, data.user, data.rank);
+    }
+
+    this.sendAllWithPermission("acl", "setChannelRank", data);
+}
+
 Channel.prototype.tryPromoteUser = function(actor, data) {
     if(!Rank.hasPermission(actor, "promote")) {
         return;
@@ -1705,7 +1752,7 @@ Channel.prototype.tryPromoteUser = function(actor, data) {
             Database.setChannelRank(this.name, data.name, rank);
         }
         this.logger.log("*** " + actor.name + " promoted " + data.name + " from " + (rank - 1) + " to " + rank);
-        this.broadcastRankTable();
+        //this.broadcastRankTable();
     }
 }
 
@@ -1742,7 +1789,7 @@ Channel.prototype.tryDemoteUser = function(actor, data) {
             Database.setChannelRank(this.name, data.name, rank);
         }
         this.logger.log("*** " + actor.name + " demoted " + data.name + " from " + (rank + 1) + " to " + rank);
-        this.broadcastRankTable();
+        //this.broadcastRankTable();
     }
 }
 
diff --git a/user.js b/user.js
index c675570f..549ac99e 100644
--- a/user.js
+++ b/user.js
@@ -146,6 +146,12 @@ User.prototype.initCallbacks = function() {
         }
     }.bind(this));
 
+    this.socket.on("setChannelRank", function(data) {
+        if(this.channel != null) {
+            this.channel.trySetRank(this, data);
+        }
+    }.bind(this));
+
     this.socket.on("banName", function(data) {
         if(this.channel != null) {
             this.channel.banName(this, data.name || "");
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 8680b4e1..315f5fcf 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -361,40 +361,18 @@ Callbacks = {
             }
         }
         loadACLPage(0);
-        return;
-        for(var i = 0; i < entries.length; i++) {
-            var tr = $("<tr/>").appendTo(tbl);
-            var name = $("<td/>").text(entries[i].name).appendTo(tr);
-            name.addClass(getNameColor(entries[i].rank));
-            var rank = $("<td/>").text(entries[i].rank).appendTo(tr);
-            var control = $("<td/>").appendTo(tr);
-            var up = $("<button/>").addClass("btn btn-mini btn-success")
-                .appendTo(control);
-            $("<i/>").addClass("icon-plus").appendTo(up);
-            var down = $("<button/>").addClass("btn btn-mini btn-danger")
-                .appendTo(control);
-            $("<i/>").addClass("icon-minus").appendTo(down);
-            if(entries[i].rank + 1 >= RANK) {
-                up.attr("disabled", true);
-            }
-            else {
-                up.click(function(name) { return function() {
-                    socket.emit("promote", {
-                        name: name
-                    });
-                }}(entries[i].name));
-            }
-            if(entries[i].rank >= RANK) {
-                down.attr("disabled", true);
-            }
-            else {
-                down.click(function(name) { return function() {
-                    socket.emit("demote", {
-                        name: name
-                    });
-                }}(entries[i].name));
+    },
+
+    setChannelRank: function(data) {
+        var ents = $("#channelranks").data("entries");
+        for(var i = 0; i < ents.length; i++) {
+            if(ents[i].name == data.user) {
+                ents[i].rank = data.rank;
+                break;
             }
         }
+        $("#channelranks").data("entries", ents);
+        loadACLPage($("#channelranks").data("page"));
     },
 
     voteskip: function(data) {
@@ -515,6 +493,7 @@ Callbacks = {
                 formatUserlistItem(users[i], data);
             }
         }
+
     },
 
     userLeave: function(data) {
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 135ab045..55c6ab87 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -499,7 +499,6 @@ function loadLoginlogPage(page) {
                 .text("Ban IP Range")
                 .appendTo(bantd);
             var callback = (function(id, name) { return function() {
-                console.log(id, name);
                 socket.emit("banIP", {
                     id: id,
                     name: name,
@@ -509,7 +508,6 @@ function loadLoginlogPage(page) {
             } })(entries[i].id, entries[i].names[0]);
             ban.click(callback);
             var callback2 = (function(id, name) { return function() {
-                console.log(id, name);
                 socket.emit("banIP", {
                     id: id,
                     name: name,
@@ -561,6 +559,7 @@ function loadLoginlogPage(page) {
 
 function loadACLPage(page) {
     var entries = $("#channelranks").data("entries");
+    $("#channelranks").data("page", page);
     var start = page * 20;
     var tbl = $("#channelranks table");
     if(tbl.children().length > 1) {
@@ -570,34 +569,42 @@ function loadACLPage(page) {
         var tr = $("<tr/>").appendTo(tbl);
         var name = $("<td/>").text(entries[i].name).appendTo(tr);
         name.addClass(getNameColor(entries[i].rank));
-        var rank = $("<td/>").text(entries[i].rank).appendTo(tr);
-        var control = $("<td/>").appendTo(tr);
-        var up = $("<button/>").addClass("btn btn-mini btn-success")
-            .appendTo(control);
-        $("<i/>").addClass("icon-plus").appendTo(up);
-        var down = $("<button/>").addClass("btn btn-mini btn-danger")
-            .appendTo(control);
-        $("<i/>").addClass("icon-minus").appendTo(down);
-        if(entries[i].rank + 1 >= RANK) {
-            up.attr("disabled", true);
-        }
-        else {
-            up.click(function(name) { return function() {
-                socket.emit("promote", {
-                    name: name
+        var rank = $("<td/>").text(entries[i].rank)
+            .css("min-width", "220px")
+            .appendTo(tr);
+        (function(name) {
+        rank.click(function() {
+            if(this.find(".rank-edit").length > 0)
+                return;
+            var r = this.text();
+            this.text("");
+            var edit = $("<input/>").attr("type", "text")
+                .attr("placeholder", r)
+                .addClass("rank-edit")
+                .appendTo(this)
+                .focus();
+            if(parseInt(r) >= RANK) {
+                edit.attr("disabled", true);
+            }
+            function save() {
+                var r = this.val();
+                var r2 = r;
+                if(r.trim() == "" || parseInt(r) >= RANK || parseInt(r) < 1)
+                    r = this.attr("placeholder");
+                r = parseInt(r) + "";
+                this.parent().text(r);
+                socket.emit("setChannelRank", {
+                    user: name,
+                    rank: parseInt(r)
                 });
-            }}(entries[i].name));
-        }
-        if(entries[i].rank >= RANK) {
-            down.attr("disabled", true);
-        }
-        else {
-            down.click(function(name) { return function() {
-                socket.emit("demote", {
-                    name: name
-                });
-            }}(entries[i].name));
-        }
+            }
+            edit.blur(save.bind(edit));
+            edit.keydown(function(ev) {
+                if(ev.keyCode == 13)
+                    save.bind(edit)();
+            });
+        }.bind(rank));
+        })(entries[i].name);
     }
     if($("#acl_pagination").length > 0) {
         $("#acl_pagination").find("li").each(function() {
diff --git a/www/channel.html b/www/channel.html
index 3d8e62a3..b3acf39e 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -288,8 +288,7 @@
                 <table class="table table-striped">
                     <thead>
                         <th>Name</th>
-                        <th>Rank</th>
-                        <th>Control</th>
+                        <th>Rank (Click to edit)</th>
                     </thead>
                 </table>
             </div>

From a1862496a9ff436b05ddf916721466291eb946b1 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Wed, 5 Jun 2013 16:49:54 -0400
Subject: [PATCH 14/18] Implement #163

---
 channel.js                 | 13 +++++++++----
 www/assets/js/callbacks.js |  1 +
 www/assets/js/client.js    |  3 ++-
 www/channel.html           |  5 +++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/channel.js b/channel.js
index af6ec42f..2e19e294 100644
--- a/channel.js
+++ b/channel.js
@@ -76,7 +76,8 @@ var Channel = function(name) {
         customcss: "",
         customjs: "",
         chat_antiflood: false,
-        show_public: false
+        show_public: false,
+        enable_link_regex: true
     };
     this.filters = [
         new Filter("monospace", "`([^`]+)`", "g", "<code>$1</code>"),
@@ -1465,8 +1466,12 @@ Channel.prototype.trySetLock = function(user, data) {
 Channel.prototype.updateFilter = function(filter) {
     var found = false;
     for(var i = 0; i < this.filters.length; i++) {
-        if(this.filters[i].name == filter.name
-                && this.filters[i].source == filter.source) {
+        if(this.filters[i].name == "" && filter.name == ""
+            && this.filters[i].source == filter.source) {
+            found = true;
+            this.filters[i] = filter;
+        }
+        else if(filter.name != "" && this.filters[i].name == filter.name) {
             found = true;
             this.filters[i] = filter;
         }
@@ -1641,7 +1646,7 @@ Channel.prototype.filterMessage = function(msg) {
     var subs = msg.split(link);
     // Apply other filters
     for(var j = 0; j < subs.length; j++) {
-        if(subs[j].match(link)) {
+        if(this.opts.enable_link_regex && subs[j].match(link)) {
             subs[j] = subs[j].replace(link, "<a href=\"$1\" target=\"_blank\">$1</a>");
             continue;
         }
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 315f5fcf..b560d72d 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -204,6 +204,7 @@ Callbacks = {
         $("#opt_customjs").val(opts.customjs);
         $("#opt_chat_antiflood").prop("checked", opts.chat_antiflood);
         $("#opt_show_public").prop("checked", opts.show_public);
+        $("#opt_enable_link_regex").prop("checked", opts.enable_link_regex);
         $("#customCss").remove();
         if(opts.customcss.trim() != "") {
             $("<link/>")
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index dcf7af82..336625b4 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -366,7 +366,8 @@ $("#opt_submit").click(function() {
         customcss: css,
         customjs: $("#opt_customjs").val(),
         chat_antiflood: $("#opt_chat_antiflood").prop("checked"),
-        show_public: $("#opt_show_public").prop("checked")
+        show_public: $("#opt_show_public").prop("checked"),
+        enable_link_regex: $("#opt_enable_link_regex").prop("checked")
     };
     socket.emit("channelOpts", opts);
 });
diff --git a/www/channel.html b/www/channel.html
index b3acf39e..7de2fc89 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -209,6 +209,11 @@
                                 <input type="checkbox" id="opt_show_public">
                                 Show channel publicly
                             </label>
+                            <br>
+                            <label class="checkbox">
+                                <input type="checkbox" id="opt_enable_link_regex">
+                                Convert URLs to links in chat messages
+                            </label>
                         </div>
 
                         <div class="span10">

From 685358b0d85c5597908b69326fe32b3ec48f186c Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Wed, 5 Jun 2013 17:22:50 -0400
Subject: [PATCH 15/18] Move user options to localStorage instead of cookies

---
 www/assets/js/client.js    | 39 ++++++++++++++++++++++----------------
 www/assets/js/functions.js |  2 +-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 336625b4..1701b9ee 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -53,26 +53,33 @@ function parseBool(x) {
     else return Boolean(x);
 }
 
-function getOrDefault(cookie, def) {
-    var cook = readCookie(cookie);
-    if(cook === null) {
+getOrDefault = function(k, def) {
+    var v = localStorage.getItem(k);
+    if(v === null)
         return def;
-    }
-    return cook;
+    if(v === "true")
+        return true;
+    if(v === "false")
+        return false;
+    if(v.match(/[0-9]+/))
+        return parseInt(v);
+    if(v.match(/[0-9\.]+/))
+        return parseFloat(v);
+    return v;
 }
 
 var USEROPTS = {
-    theme           : getOrDefault("cytube_theme", "default"),
-    css             : getOrDefault("cytube_css", ""),
-    layout          : getOrDefault("cytube_layout", "default"),
-    synch           : parseBool(getOrDefault("cytube_synch", true)),
-    hidevid         : parseBool(getOrDefault("cytube_hidevid", false)),
-    show_timestamps : parseBool(getOrDefault("cytube_show_timestamps", false)),
-    modhat          : parseBool(getOrDefault("cytube_modhat", false)),
-    blink_title     : parseBool(getOrDefault("cytube_blink_title", false)),
-    sync_accuracy   : parseFloat(getOrDefault("cytube_sync_accuracy", 2)) || 2,
-    chatbtn         : parseBool(getOrDefault("cytube_chatbtn", false)),
-    altsocket       : parseBool(getOrDefault("cytube_altsocket", false))
+    theme           : getOrDefault("theme", "default"),
+    css             : getOrDefault("css", ""),
+    layout          : getOrDefault("layout", "default"),
+    synch           : getOrDefault("synch", true),
+    hidevid         : getOrDefault("hidevid", false),
+    show_timestamps : getOrDefault("show_timestamps", true),
+    modhat          : getOrDefault("modhat", false),
+    blink_title     : getOrDefault("blink_title", false),
+    sync_accuracy   : getOrDefault("sync_accuracy", 2),
+    chatbtn         : getOrDefault("chatbtn", false),
+    altsocket       : getOrDefault("altsocket", false)
 };
 applyOpts();
 $("#optlink").click(showUserOpts);
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 55c6ab87..ca1715d4 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -1142,7 +1142,7 @@ function showUserOpts() {
 
 function saveOpts() {
     for(var key in USEROPTS) {
-        createCookie("cytube_"+key, USEROPTS[key], 100);
+        localStorage.setItem(key, USEROPTS[key]);
     }
 }
 

From 2c069c26b3b8351b9aa298a32657f46c354dac4f Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 6 Jun 2013 13:53:10 -0400
Subject: [PATCH 16/18] Add button to show/hide userlist

---
 www/assets/css/ytsync.css | 11 ++++++++++-
 www/assets/js/client.js   | 12 ++++++++++++
 www/channel.html          |  5 ++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/www/assets/css/ytsync.css b/www/assets/css/ytsync.css
index c7e3016b..ce752dca 100644
--- a/www/assets/css/ytsync.css
+++ b/www/assets/css/ytsync.css
@@ -77,12 +77,21 @@ html, body {
     margin-bottom: 0;
 }
 
-#usercount, #currenttitle {
+#usercountcontainer, #currenttitle {
     border: 1px solid #aaaaaa;
     border-bottom: none;
     margin: 0;
 }
 
+#usercount {
+    margin: 0;
+}
+
+#ulistchevron {
+    cursor: pointer;
+    float: left;
+}
+
 #plmeta {
     border: 1px solid #aaaaaa;
     background-color: #ffffff;
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 1701b9ee..9982be90 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -149,6 +149,18 @@ if(!USEROPTS.hidevid) {
     firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
 }
 
+$("#ulistchevron").click(function() {
+    var state = $("#userlist").css("display");
+    if(state == "none") {
+        $("#userlist").show();
+        $("#ulistchevron").removeClass().addClass("icon-chevron-up");
+    }
+    else {
+        $("#userlist").hide();
+        $("#ulistchevron").removeClass().addClass("icon-chevron-down");
+    }
+});
+
 var sendVideoUpdate = function() { }
 setInterval(function() {
     sendVideoUpdate();
diff --git a/www/channel.html b/www/channel.html
index 7de2fc89..53ecf038 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -58,7 +58,10 @@
         </div>
         <div class="row" id="main" style="margin-top: 20px;">
             <div class="span5" id="chatdiv">
-                <p id="usercount"></p>
+                <div id="usercountcontainer">
+                    <i class="icon-chevron-up" id="ulistchevron" title="Show/Hide Userlist"></i>
+                    <p id="usercount"></p>
+                </div>
                 <div id="userlist">
                 </div>
                 <div id="messagebuffer">

From ca7a9e83a5769bdc990f443080ae68d4779226c7 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 6 Jun 2013 19:13:56 -0400
Subject: [PATCH 17/18] Fix IPban dropdown option

---
 channel.js                 |  9 ++++-----
 chatcommand.js             | 13 ++++++-------
 www/assets/js/functions.js |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/channel.js b/channel.js
index 2e19e294..f67eb8e5 100644
--- a/channel.js
+++ b/channel.js
@@ -647,13 +647,12 @@ Channel.prototype.sendRankStuff = function(user) {
         var ents = [];
         for(var ip in this.ipbans) {
             if(this.ipbans[ip] != null) {
-                var name;
+                var name = [];
                 if(ip in this.logins) {
-                    name = this.logins[ip].join(", ");
-                }
-                else {
-                    name = this.ipbans[ip][0];
+                    name = this.logins[ip];
                 }
+                name.push(this.ipbans[ip][0]);
+                name = name.join(", ");
                 var id = this.hideIP(ip);
                 var disp = ip;
                 if(user.rank < Rank.Siteadmin) {
diff --git a/chatcommand.js b/chatcommand.js
index a134574a..59a0ade0 100644
--- a/chatcommand.js
+++ b/chatcommand.js
@@ -39,7 +39,7 @@ function handle(chan, user, msg, data) {
         handleBan(chan, user, msg.substring(5).split(" "));
     }
     else if(msg.indexOf("/ipban ") == 0) {
-        handleIPBan(chan, user, msg.substring(5).split(" "));
+        handleIPBan(chan, user, msg.substring(7).split(" "));
     }
     else if(msg.indexOf("/unban ") == 0) {
         handleUnban(chan, user, msg.substring(7).split(" "));
@@ -86,12 +86,11 @@ function handleIPBan(chan, user, args) {
                 break;
             }
         }
-        if(kickee && kickee.rank < user.rank) {
-            chan.logger.log("*** " + user.name + " banned " + args[0]);
-            args[0] = "";
-            var reason = args.join(" ");
-            chan.kick(kickee, "(banned) " + reason);
-            chan.banIP(user, kickee);
+        if(kickee) {
+            chan.tryIPBan(user, {
+                id: chan.hideIP(kickee.ip),
+                name: kickee.name
+            });
         }
     }
 }
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index ca1715d4..8450eaa5 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -130,7 +130,7 @@ function addUserDropdown(entry, name) {
         a.text("IP Ban");
         a.click(function() {
             socket.emit("chatMsg", {
-                msg: "/ban " + name
+                msg: "/ipban " + name
             });
         });
 

From 261abadf125cf85b51e39564a74f15ad63d317d2 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 6 Jun 2013 19:22:27 -0400
Subject: [PATCH 18/18] Fix possible race condition

---
 channel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/channel.js b/channel.js
index f67eb8e5..708054f5 100644
--- a/channel.js
+++ b/channel.js
@@ -199,7 +199,9 @@ Channel.prototype.loadDump = function() {
             }
             data.logins = data.logins || {};
             for(var ip in data.logins) {
-                this.logins[ip] = data.logins[ip];
+                for(var i = 0; i < data.logins.length; i++) {
+                    this.logins[ip].push(data.logins[ip][i]);
+                }
             }
             this.setLock(!(data.openqueue || false));
             this.chatbuffer = data.chatbuffer || [];