From 9592dc1c2c058a8470494f093d833ffa777e387b Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 12 Aug 2016 14:25:19 -0400
Subject: [PATCH] 3.5.270. Fix a BTTV template. Change the get_editor_of
 function to use DOMParser for better security. Fix websocket callbacks not
 getting called. Remove a client-side permissions check from the /ffz
 following command.

---
 changelog.html       | 11 +++++++++++
 src/ember/channel.js | 27 +++++++++++++++++++++++++++
 src/ext/betterttv.js |  8 +++++---
 src/main.js          | 25 ++++++++++++++++++-------
 src/socket.js        |  4 ++--
 src/ui/following.js  | 11 +++++------
 style.css            |  2 +-
 7 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/changelog.html b/changelog.html
index 2c70c01b..dc76a365 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,14 @@
+<div class="list-header">3.5.270</div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Changed: Remove client-side permissions check from <code>/ffz following</code>.</li>
+	<li>Fixed: Socket command callbacks were not being called if an error occured.</li>
+</ul>
+
+<div class="list-header">3.5.269</div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Update one of BetterTTV's chat templates so sub notifications have backgrounds as they should with BTTV.</li>
+</ul>
+
 <div class="list-header">3.5.268</div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>As was pointed out on Twitter, I'm silly and the strings for username colors should be <code>Deprecated</code> and not <code>Depreciated</code>.</li>
diff --git a/src/ember/channel.js b/src/ember/channel.js
index 56c09740..9d6058e1 100644
--- a/src/ember/channel.js
+++ b/src/ember/channel.js
@@ -45,6 +45,32 @@ FFZ.prototype.setup_channel = function() {
 		return;
 
 	Channel.reopen({
+		/*isEditable: function() {
+			var channel_id = this.get('content.id'),
+				user = this.get('login.userData');
+
+			if ( ! user || ! user.login )
+				return false;
+
+			else if ( user.login === channel_id || user.is_admin || user.is_staff)
+				return true;
+
+			// Okay, have we loaded this user's editor status? Try that.
+			if ( f._editor_of )
+				return f._editor_of.indexOf(channel_id) !== -1;
+
+			var t = this;
+			f.get_user_editor_of().then(function(result) {
+				// Once editor status is loaded, if the user does have editor
+				// status for this channel, update this property.
+				if ( result.indexOf(channel_id) !== -1 )
+					Ember.propertyDidChange(t, 'isEditable');
+			});
+
+			return false;
+
+		}.property('content.id', 'login.userData', 'login.userData.login'),*/
+
 		ffzUpdateUptime: function() {
 			if ( f._cindex )
 				f._cindex.ffzUpdateUptime();
@@ -142,6 +168,7 @@ FFZ.prototype.setup_channel = function() {
 		}.observes("content.hostModeTarget")
 	});
 
+	Ember.propertyDidChange(Channel, 'isEditable');
 	Channel.ffzUpdateInfo();
 }
 
diff --git a/src/ext/betterttv.js b/src/ext/betterttv.js
index d1ed120e..fedd6031 100644
--- a/src/ext/betterttv.js
+++ b/src/ext/betterttv.js
@@ -155,7 +155,7 @@ FFZ.prototype.setup_bttv = function(delay) {
 			f.bttv_badges(data);
 
 			// Now, do everything else manually because things are hard-coded.
-			return '<div class="chat-line'+(opts.highlight?' highlight':'')+(opts.action?' action':'')+(opts.server?' admin':'')+'" data-sender="'+(data.sender||"").toLowerCase()+'" data-room="'+received_room+'">'+
+			return '<div class="chat-line'+(opts.highlight?' highlight':'')+(opts.action?' action':'')+(opts.server?' admin':'')+(opts.notice?' notice':'')+'" data-sender="'+(data.sender||"").toLowerCase()+'" data-room="'+received_room+'">'+
 				BC.templates.timestamp(data.time)+' '+
 				(opts.isMod ? BC.templates.modicons():'')+' '+
 				BC.templates.badges(data.badges)+
@@ -201,9 +201,11 @@ FFZ.prototype.setup_bttv = function(delay) {
 		received_sender;
 	BC.templates.message = function(sender, message, data) {
 		try {
+			data = data || {};
 			var colored = data.colored || false,
 				force = data.force || false,
 				emotes = data.emotes,
+				bits = data.bits,
 				rawMessage = encodeURIComponent(message);
 
 			if(sender !== 'jtv') {
@@ -214,7 +216,7 @@ FFZ.prototype.setup_bttv = function(delay) {
 
 				for(var i=0; i<tokenizedMessage.length; i++) {
 					if(typeof tokenizedMessage[i] === 'string') {
-						tokenizedMessage[i] = BC.templates.bttvMessageTokenize(sender, tokenizedMessage[i], data.bits);
+						tokenizedMessage[i] = BC.templates.bttvMessageTokenize(sender, tokenizedMessage[i], bits);
 					} else {
 						tokenizedMessage[i] = tokenizedMessage[i][0];
 					}
@@ -229,7 +231,7 @@ FFZ.prototype.setup_bttv = function(delay) {
 				spam = true;
 			}
 
-			return '<span class="message ' + (spam ? 'spam' : '') + '" ' + (colored ? 'style="color: ' + colored + '" ' : '') + 'data-raw="' + rawMessage + '" data-emotes="' + (emotes ? encodeURIComponent(JSON.stringify(emotes)) : 'false') + '">' + message + '</span>';
+			return '<span class="message ' + (spam ? 'spam' : '') + '" ' + (colored ? 'style="color: ' + colored + '" ' : '') + 'data-raw="' + rawMessage + '" data-bits="' + (bits ? encodeURIComponent(JSON.stringify(bits)) : 'false') + '" data-emotes="' + (emotes ? encodeURIComponent(JSON.stringify(emotes)) : 'false') + '">' + message + '</span>';
 
 		} catch(err) {
 			f.log("Error: ", err);
diff --git a/src/main.js b/src/main.js
index 338f9ce1..60247376 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ FFZ.msg_commands = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 268,
+	major: 3, minor: 5, revision: 270,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
@@ -125,24 +125,35 @@ FFZ.prototype.get_user = function(force_reload) {
 	return user;
 }
 
+FFZ.prototype._editor_of = null;
 
 FFZ.prototype.get_user_editor_of = function() {
 	var f = this;
 	return new Promise(function(succeed,fail) {
 		var user = f.get_user();
 		if ( ! user || ! user.login )
-			return fail('not logged in');
+			return fail();
 
 		jQuery.get("/" + user.login + "/dashboard/permissions").done(function(data) {
-			var el = document.createElement('div');
-			el.innerHTML = data;
+			try {
+				var dom = new DOMParser().parseFromString(data, 'text/html'),
+					links = dom.querySelectorAll('#editable .label');
 
-			var links = _.pluck(el.querySelectorAll('#editable .label'), 'href');
-			succeed(_.map(links, function(e) { return e.substr(e.lastIndexOf('/') + 1) }));
+				f._editor_of = _.map(links, function(e) {
+					var href = e.getAttribute('href');
+					return href && href.substr(href.lastIndexOf('/') + 1);
+				});
+
+				succeed(f._editor_of);
+
+			} catch(err) {
+				f.error("Failed to parse User Editor State", err);
+				fail();
+			}
 
 		}).fail(function(e) {
 			f.error("Failed to load User Editor State", e);
-			fail('failed to load dashboard');
+			fail();
 		});
 	});
 }
diff --git a/src/socket.js b/src/socket.js
index f8c5e9be..c7fbaa47 100644
--- a/src/socket.js
+++ b/src/socket.js
@@ -298,12 +298,12 @@ FFZ.prototype.ws_create = function() {
 			else
 				f.log("Invalid command: " + cmd, data, false, true);
 
-		} else if ( cmd === "error" ) {
+		} /*else if ( cmd === "error" ) {
 			f.log("Socket server reported error: " + data);
 			if (f._ws_callbacks[request] )
 				delete f._ws_callbacks[request];
 
-		} else {
+		}*/ else {
 			var success = cmd === 'ok',
 				has_callback = typeof f._ws_callbacks[request] === "function";
 
diff --git a/src/ui/following.js b/src/ui/following.js
index 6ad78749..cbabb482 100644
--- a/src/ui/following.js
+++ b/src/ui/following.js
@@ -41,7 +41,9 @@ FFZ.settings_info.follow_buttons = {
 FFZ.ffz_commands.following = function(room, args) {
 	args = args.join(" ").trim().toLowerCase().split(/[ ,]+/);
 
-	var out = [];
+	var f = this,
+		out = [];
+
 	for(var i=0,l=args.length; i<l; i++) {
 		var arg = args[i],
 			match = arg.match(TWITCH_URL);
@@ -52,13 +54,10 @@ FFZ.ffz_commands.following = function(room, args) {
 			out.push(arg);
 	}
 
-	var user = this.get_user(), f = this;
-	if ( ! user || (user.login !== room.id && user.login !== "sirstendec" && user.login !== "dansalvato")  )
-		return "You must be logged in as the broadcaster to use this command.";
-
 	if ( ! this.ws_send("update_follow_buttons", [room.id, out], function(success, data) {
 		if ( ! success ) {
-			f.room_message(room, "There was an error updating the following buttons.");
+			f.log("Not a Success: " + JSON.stringify(data));
+			f.room_message(room, data);
 			return;
 		}
 
diff --git a/style.css b/style.css
index 89670df1..794bf2f9 100644
--- a/style.css
+++ b/style.css
@@ -130,7 +130,7 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill:
 	50% { opacity: 0.75; }
 }
 
-.drawer__item--brick .warp__logo:hover {
+.warp__logo:hover {
 	animation: ffzflipwobble 4s infinite;
 }