diff --git a/channel.js b/channel.js index 67b8c9cf..4d24ac02 100644 --- a/channel.js +++ b/channel.js @@ -783,6 +783,9 @@ Channel.prototype.tryVote = function(user, data) { } Channel.prototype.tryVoteskip = function(user) { + if(!this.opts.allow_voteskip) { + return; + } if(!this.voteskip) { this.voteskip = new Poll("voteskip", "voteskip", ["yes"]); } diff --git a/server.js b/server.js index 2bab4c64..90a2b644 100644 --- a/server.js +++ b/server.js @@ -9,11 +9,11 @@ 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.0.0"; -console.log("Starting CyTube v" + VERSION); +const VERSION = "1.0.1"; var fs = require("fs"); var Logger = require("./logger.js"); +Logger.syslog.log("Starting CyTube v" + VERSION); var Config = require("./config.js"); var connect = require("connect"); var app = connect.createServer(connect.static(__dirname+"/www")).listen(Config.IO_PORT); diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index e79ed723..49ec106d 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -236,7 +236,8 @@ function initCallbacks() { var linew = $("#queue").children()[data.idx]; $(linew).addClass("alert alert-info"); POSITION = data.idx; - $("#voteskip").attr("disabled", false); + if(CHANNELOPTS.allow_voteskip) + $("#voteskip").attr("disabled", false); }); socket.on("mediaUpdate", function(data) {