From a5c297365c792d5f5b9a38a081e09ea69fefe703 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 23 May 2013 00:03:37 -0400
Subject: [PATCH] Fixes; implement /clear command

---
 channel.js                 |  6 +++---
 chatcommand.js             | 12 ++++++++++++
 package.json               |  2 +-
 server.js                  |  2 +-
 www/assets/js/callbacks.js | 11 ++++-------
 www/assets/js/functions.js |  5 ++---
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/channel.js b/channel.js
index 2fe4dd9b..faa57a16 100644
--- a/channel.js
+++ b/channel.js
@@ -115,10 +115,9 @@ Channel.prototype.hasPermission = function(user, key) {
     if(key.indexOf("playlist") == 0 && this.openqueue) {
         var key2 = "o" + key;
         var v = this.permissions[key2];
-        if(typeof v != "number") {
-            return false;
+        if(typeof v == "number" && user.rank >= v) {
+            return true;
         }
-        return user.rank >= v;
     }
     var v = this.permissions[key];
     if(typeof v != "number") {
@@ -1723,6 +1722,7 @@ Channel.prototype.changeLeader = function(name) {
     if(name == "") {
         this.logger.log("*** Resuming autolead");
         if(this.media != null && !isLive(this.media.type)) {
+            this.media.paused = false;
             this.time = new Date().getTime();
             this.i = 0;
             mediaUpdate(this, this.media.id);
diff --git a/chatcommand.js b/chatcommand.js
index 7b49769e..f4a6263d 100644
--- a/chatcommand.js
+++ b/chatcommand.js
@@ -51,6 +51,9 @@ function handle(chan, user, msg, data) {
             msg[2].match(/[-0-9 ]/)) {
         handleDrink(chan, user, msg.substring(2), data);
     }
+    else if(msg.indexOf("/clear") == 0) {
+        handleClear(chan, user);
+    }
 }
 
 function handleKick(chan, user, args) {
@@ -147,5 +150,14 @@ function handleDrink(chan, user, msg, data) {
     chan.sendMessage(user.name, msg, "drink", data);
 }
 
+function handleClear(chan, user) {
+    if(user.rank < Rank.Moderator) {
+        return;
+    }
+
+    chan.chatbuffer = [];
+    chan.sendAll("clearchat");
+}
+
 exports.handle = handle;
 
diff --git a/package.json b/package.json
index 4f71bf6c..34fb113e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.8.2",
+    "version": "1.9.0",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 9c7ec3c0..a5067dbd 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.8.2";
+const VERSION = "1.9.0";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 8d7ebe9e..c422902f 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -186,13 +186,6 @@ Callbacks = {
     },
 
     channelOpts: function(opts) {
-        $("#opt_qopen_allow_anon").prop("checked", opts.qopen_allow_anon);
-        $("#opt_qopen_allow_guest").prop("checked", opts.qopen_allow_guest);
-        $("#opt_qopen_allow_qnext").prop("checked", opts.qopen_allow_qnext);
-        $("#opt_qopen_allow_move").prop("checked", opts.qopen_allow_move);
-        $("#opt_qopen_allow_delete").prop("checked", opts.qopen_allow_delete);
-        $("#opt_qopen_allow_playnext").prop("checked", opts.qopen_allow_playnext);
-        $("#opt_qopen_temp").prop("checked", opts.qopen_temp);
         $("#opt_pagetitle").attr("placeholder", opts.pagetitle);
         document.title = opts.pagetitle;
         PAGETITLE = opts.pagetitle;
@@ -473,6 +466,10 @@ Callbacks = {
         addChatMessage(data);
     },
 
+    clearchat: function() {
+        $("#messagebuffer").html("");
+    },
+
     userlist: function(data) {
         $(".userlist_item").each(function() { $(this).remove(); });
         for(var i = 0; i < data.length; i++) {
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 44ecf2ea..b1438eb1 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -1154,10 +1154,9 @@ function hasPermission(key) {
     if(key.indexOf("playlist") == 0 && OPENQUEUE) {
         var key2 = "o" + key;
         var v = CHANPERMS[key2];
-        if(typeof v != "number") {
-            return false;
+        if(typeof v == "number" && RANK >= v) {
+            return true;
         }
-        return RANK >= v;
     }
     var v = CHANPERMS[key];
     if(typeof v != "number") {