diff --git a/channel.js b/channel.js index b81f8367..4221ce2b 100644 --- a/channel.js +++ b/channel.js @@ -75,6 +75,9 @@ var Channel = function(name) { time: "00:00" }; + this.css = ""; + this.js = ""; + Database.loadChannel(this); if(this.registered) { this.loadDump(); @@ -152,6 +155,9 @@ Channel.prototype.loadDump = function() { for(var i = 0; i < this.chatbuffer.length; i++) { this.sendAll("chatMsg", this.chatbuffer[i]); } + this.css = data.css || ""; + this.js = data.js || ""; + this.sendAll("channelCSSJS", {css: this.css, js: this.js}); setTimeout(function() { incrementalDump(this); }, 300000); } catch(e) { @@ -175,7 +181,9 @@ Channel.prototype.saveDump = function() { motd: this.motd, logins: this.logins, openqueue: this.openqueue, - chatbuffer: this.chatbuffer + chatbuffer: this.chatbuffer, + css: this.css, + js: this.js }; var text = JSON.stringify(dump); fs.writeFileSync("chandump/" + this.name, text); @@ -378,6 +386,7 @@ Channel.prototype.userJoin = function(user) { user.socket.emit("queueLock", {locked: !this.openqueue}); this.sendUserlist(user); this.sendRecentChat(user); + user.socket.emit("channelCSSJS", {css: this.css, js: this.js}); if(this.poll) { user.socket.emit("newPoll", this.poll.packUpdate()); } @@ -1225,6 +1234,38 @@ Channel.prototype.tryUpdateOptions = function(user, data) { this.broadcastOpts(); } +Channel.prototype.trySetCSS = function(user, data) { + if(!Rank.hasPermission(user, "setcss")) { + return; + } + + var css = data.css || ""; + if(css.length > 20000) { + css = css.substring(0, 20000); + } + this.css = css; + this.sendAll("channelCSSJS", { + css: this.css, + js: this.js + }); +} + +Channel.prototype.trySetJS = function(user, data) { + if(!Rank.hasPermission(user, "setjs")) { + return; + } + + var js = data.js || ""; + if(js.length > 20000) { + js = js.substring(0, 20000); + } + this.js = js; + this.sendAll("channelCSSJS", { + css: this.css, + js: this.js + }); +} + Channel.prototype.updateMotd = function(motd) { var html = motd.replace(/\n/g, "
"); //html = this.filterMessage(html); diff --git a/package.json b/package.json index c5b7469a..63ded37d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Calvin Montgomery", "name": "CyTube", "description": "Online media synchronizer and chat", - "version": "1.7.4", + "version": "1.7.5", "repository": { "url": "http://github.com/calzoneman/sync" }, diff --git a/rank.js b/rank.js index f757953b..62ecfd3d 100644 --- a/rank.js +++ b/rank.js @@ -21,6 +21,8 @@ var permissions = { registerChannel : exports.Owner, acl : exports.Owner, chatFilter : exports.Owner, + setcss : exports.Owner, + setjs : exports.Owner, queue : exports.Moderator, assignLeader : exports.Moderator, kick : exports.Moderator, diff --git a/server.js b/server.js index e8b4697b..22fd1863 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.7.4"; +const VERSION = "1.7.5"; var fs = require("fs"); var Logger = require("./logger.js"); diff --git a/user.js b/user.js index 571f8f13..16b586a8 100644 --- a/user.js +++ b/user.js @@ -323,6 +323,18 @@ User.prototype.initCallbacks = function() { } }.bind(this)); + this.socket.on("setChannelCSS", function(data) { + if(this.channel != null) { + this.channel.trySetCSS(this, data); + } + }.bind(this)); + + this.socket.on("setChannelJS", function(data) { + if(this.channel != null) { + this.channel.trySetJS(this, data); + } + }.bind(this)); + this.socket.on("chatFilter", function(data) { if(this.channel != null) { this.channel.tryChangeFilter(this, data); diff --git a/www/assets/css/ytsync.css b/www/assets/css/ytsync.css index a60edcf9..7e6bfaa7 100644 --- a/www/assets/css/ytsync.css +++ b/www/assets/css/ytsync.css @@ -202,10 +202,14 @@ html, body { text-align: center; } -#motdtext { +#motdtext, #csstext, #jstext { width: 100%; } +#csstext, #jstext { + font-family: Monospace; +} + #queue_next, #queue_end, #library_search, #youtube_search { width: 50%; } diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 0166be55..9dbc1aa3 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -227,6 +227,29 @@ Callbacks = { rebuildPlaylist(); }, + channelCSSJS: function(data) { + console.log("recv cssjs", data); + $("#chancss").remove(); + $("#chanjs").remove(); + + $("#csstext").val(data.css); + $("#jstext").val(data.js); + + if(data.css) { + $("