Moderators can remove videos from the library

channel.js

@@ -733,6 +733,18 @@ Channel.prototype.tryDequeue = function(user, data) {
      this.dequeue(data);
 }
 
+Channel.prototype.tryUncache = function(user, data) {
+    if(!Rank.hasPermission(user, "uncache")) {
+        return;
+    }
+    if(typeof data.id != "string") {
+        return;
+    }
+    if(Database.uncacheMedia(this.name, data.id)) {
+        delete this.library[data.id];
+    }
+}
+
 Channel.prototype.playNext = function() {
     // Nothing to play
     if(this.queue.length == 0) {

database.js

@@ -1,11 +1,11 @@
 /*
 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.
 */
 
@@ -14,7 +14,7 @@ var Config = require("./config.js");
 var Logger = require("./logger.js");
 var Rank = require("./rank.js");
 var Media = require("./media.js").Media;
-var Server = require("./server.js");
+//var Server = require("./server.js");
 
 var initialized = false;
 
@@ -29,6 +29,18 @@ exports.getConnection = function() {
     return db;
 }
 
+function sqlEscape(data) {
+    if(data == null || data == undefined)
+        return "NULL";
+    else if(typeof data == "number")
+        return data;
+    else if(typeof data == "object")
+        return "(object)";
+    else if(typeof data == "string") {
+        return data.replace("'", "\\'");
+    }
+}
+
 exports.init = function() {
     if(initialized)
         return;
@@ -93,7 +105,7 @@ exports.loadChannel = function(chan) {
 
     // Load library
     var query = "SELECT * FROM chan_{}_library"
-        .replace("{}", chan.name);
+        .replace("{}", sqlEscape(chan.name));
     var results = db.querySync(query);
     if(!results) {
         Logger.errlog.log("Channel.loadMysql: failed to load library for " + chan.name);
@@ -106,7 +118,7 @@ exports.loadChannel = function(chan) {
 
     // Load bans
     var query = "SELECT * FROM chan_{}_bans"
-        .replace("{}", chan.name);
+        .replace("{}", sqlEscape(chan.name));
     var results = db.querySync(query);
     if(!results) {
         Logger.errlog.log("Channel.loadMysql: failed to load banlist for " + chan.name);
@@ -166,7 +178,7 @@ exports.registerChannel = function(chan) {
 
     // Insert into global channel table
     var query = "INSERT INTO channels (`id`, `name`) VALUES (NULL, '{}')"
-        .replace("{}", chan.name);
+        .replace("{}", sqlEscape(chan.name));
     results = db.querySync(query) || results;
     db.closeSync();
     return results;
@@ -179,8 +191,8 @@ exports.lookupChannelRank = function(channame, username) {
         return Rank.Guest;
     }
     var query = "SELECT * FROM chan_{1}_ranks WHERE name='{2}'"
-        .replace("{1}", channame)
+        .replace("{1}", sqlEscape(channame))
-        .replace("{2}", username);
+        .replace("{2}", sqlEscape(username));
     var results = db.querySync(query);
     if(!results) {
         return Rank.Guest;
@@ -201,16 +213,16 @@ exports.saveChannelRank = function(channame, user) {
         return false;
     }
     var query = "UPDATE chan_{1}_ranks SET rank='{2}' WHERE name='{3}'"
-        .replace("{1}", channame)
+        .replace("{1}", sqlEscape(channame))
-        .replace("{2}", user.rank)
+        .replace("{2}", sqlEscape(user.rank))
-        .replace("{3}", user.name);
+        .replace("{3}", sqlEscape(user.name));
     var results = db.querySync(query);
     // Gonna have to insert a new one, bugger
     if(!results.fetchAllSync) {
         var query = "INSERT INTO chan_{1}_ranks (`name`, `rank`) VALUES ('{2}', '{3}')"
-            .replace("{1}", channame)
+            .replace("{1}", sqlEscape(channame))
-            .replace("{2}", user.name)
+            .replace("{2}", sqlEscape(user.name))
-            .replace("{3}", user.rank);
+            .replace("{3}", sqlEscape(user.rank));
         results = db.querySync(query);
     }
     db.closeSync();
@@ -224,12 +236,26 @@ exports.cacheMedia = function(channame, media) {
         return false;
     }
     var query = "INSERT INTO chan_{1}_library VALUES ('{2}', '{3}', {4}, '{5}', '{6}')"
-        .replace("{1}", channame)
+        .replace("{1}", sqlEscape(channame))
-        .replace("{2}", media.id)
+        .replace("{2}", sqlEscape(media.id))
-        .replace("{3}", media.title)
+        .replace("{3}", sqlEscape(media.title))
-        .replace("{4}", media.seconds)
+        .replace("{4}", sqlEscape(media.seconds))
-        .replace("{5}", media.duration)
+        .replace("{5}", sqlEscape(media.duration))
-        .replace("{6}", media.type);
+        .replace("{6}", sqlEscape(media.type));
+    var results = db.querySync(query);
+    db.closeSync();
+    return results;
+}
+
+exports.uncacheMedia = function(channame, id) {
+    var db = exports.getConnection();
+    if(!db) {
+        Logger.errlog.log("database.uncacheMedia: DB connection failed");
+        return false;
+    }
+    var query = "DELETE FROM chan_{1}_library WHERE id='{2}'"
+        .replace("{1}", sqlEscape(channame))
+        .replace("{2}", sqlEscape(id))
     var results = db.querySync(query);
     db.closeSync();
     return results;
@@ -242,10 +268,10 @@ exports.addChannelBan = function(channame, actor, receiver) {
         return false;
     }
     var query = "INSERT INTO chan_{1}_bans (`ip`, `name`, `banner`) VALUES ('{2}', '{3}', '{4}')"
-        .replace("{1}", channame)
+        .replace("{1}", sqlEscape(channame))
-        .replace("{2}", receiver.ip)
+        .replace("{2}", sqlEscape(receiver.ip))
-        .replace("{3}", receiver.name)
+        .replace("{3}", sqlEscape(receiver.name))
-        .replace("{4}", actor.name);
+        .replace("{4}", sqlEscape(actor.name));
     results = db.querySync(query);
     db.closeSync();
     return results;
@@ -258,8 +284,8 @@ exports.removeChannelBan = function(channame, ip) {
         return false;
     }
     var query = "DELETE FROM chan_{1}_bans WHERE `ip` = '{2}'"
-        .replace("{1}", channame)
+        .replace("{1}", sqlEscale(channame))
-        .replace("{2}", ip);
+        .replace("{2}", sqlEscape(ip));
     results = db.querySync(query);
     db.closeSync();
     return results;
@@ -272,7 +298,7 @@ exports.getChannelRanks = function(channame) {
     }
 
     var query = "SELECT * FROM chan_{}_ranks WHERE 1"
-        .replace("{}", channame);
+        .replace("{}", sqlEscape(channame));
 
     var results = db.querySync(query);
     if(results) {

rank.js

@@ -34,6 +34,7 @@ var permissions = {
     updateMotd      : exports.Moderator,
     drink           : exports.Moderator,
     seeVoteskip     : exports.Moderator,
+    uncache         : exports.Moderator,
     search          : exports.Guest,
     chat            : exports.Guest,
 };

user.js

@@ -170,6 +170,12 @@ User.prototype.initCallbacks = function() {
         }
     }.bind(this));
 
+    this.socket.on("uncache", function(data) {
+        if(this.channel != null) {
+            this.channel.tryUncache(this, data);
+        }
+    }.bind(this));
+
     this.socket.on("moveMedia", function(data) {
         if(this.channel != null) {
             this.channel.tryMove(this, data);

www/assets/js/functions.js

@@ -338,35 +338,43 @@ function rebuildPlaylist() {
 function addLibraryButtons(li, id, yt) {
     var btnstrip = $("<div />").attr("class", "btn-group qe_buttons").prependTo(li);
 
+    if(RANK >= Rank.Moderator || LEADER || (OPENQUEUE && CHANNELOPTS.qopen_allow_qnext)) {
+        var btnNext =  $("<button />").addClass("btn qe_btn")
+            .text("Next")
+            .appendTo(btnstrip);
+        btnNext.click(function() {
+            if(yt) {
+                socket.emit("queue", {
+                    id: id,
+                    pos: "next",
+                    type: "yt"
+                });
+            }
+            else {
+                socket.emit("queue", {
+                    id: id,
+                    pos: "next"
+                });
+            }
+        });
+    }
 
-    var btnNext =  $("<button />").attr("class", "btn qe_btn").appendTo(btnstrip);
+    var btnEnd =  $("<button />").addClass("btn qe_btn").text("End").appendTo(btnstrip);
-    //$("<i />").attr("class", "icon-play").appendTo(btnNext);
-    btnNext.text("Next");
-    if(!CHANNELOPTS.qopen_allow_qnext && RANK < Rank.Moderator && !LEADER)
-        btnNext.attr("disabled", true);
 
-    var btnEnd =  $("<button />").attr("class", "btn qe_btn").appendTo(btnstrip);
+    if(RANK >= Rank.Moderator) {
-    //$("<i />").attr("class", "icon-fast-forward").appendTo(btnEnd);
+        var btnDelete = $("<button/>").addClass("btn qe_btn btn-danger").appendTo(btnstrip);
-    btnEnd.text("End");
+        $("<i/>").addClass("icon-remove").appendTo(btnDelete);
-
+        btnDelete.click(function() {
-    // Callback time
+            socket.emit("uncache", {
-    $(btnNext).click(function() {
+                id: id
-        if(yt) {
-            socket.emit("queue", {
-                id: id,
-                pos: "next",
-                type: "yt"
             });
-        }
+            $(li).hide("blind", function() {
-        else {
+                $(li).remove();
-            socket.emit("queue", {
-                id: id,
-                pos: "next"
             });
-        }
+        });
-    });
+    }
 
-    $(btnEnd).click(function() {
+    btnEnd.click(function() {
         if(yt) {
             socket.emit("queue", {
                 id: id,
@@ -381,6 +389,7 @@ function addLibraryButtons(li, id, yt) {
             });
         }
     });
+
 }
 
 // Rearranges the queue