From c4142edeb2081217105695c85efef7dc153ce79e Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Sat, 10 Dec 2016 22:24:31 -0500
Subject: [PATCH] 3.5.394. Fix the /card command and switching mod card targets
 while the mod card is open. Add more modifier emotes for Christmas.

---
 changelog.html               |  6 ++++++
 src/commands.js              |  2 +-
 src/ember/moderation-card.js |  2 +-
 src/ember/room.js            |  2 +-
 src/emoticons.js             | 20 ++++++++++++++++++++
 src/main.js                  |  4 ++--
 src/utils.js                 |  2 +-
 style.css                    | 13 ++++++++++++-
 8 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/changelog.html b/changelog.html
index 365a335f..bb3f5d49 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">3.5.394 <time datetime="2016-12-08">(2016-12-08)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: The <code>/card</code> command and the link in whisper windows to Open Moderation Card were not working.</li>
+	<li>Fixed: Switching moderation cards to another user by clicking their name in moderation card chat history.</li>
+</ul>
+
 <div class="list-header">3.5.393 <time datetime="2016-12-07">(2016-12-07)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>API Added: <code>api.room_add_user_badge</code> and <code>api.room_remove_user_badge</code> methods for adding and removing room-specific badges from a user. Note: These methods only function when the associated room is loaded.</li>
diff --git a/src/commands.js b/src/commands.js
index c0b2092e..82d45cf3 100644
--- a/src/commands.js
+++ b/src/commands.js
@@ -259,7 +259,7 @@ FFZ.chat_commands.card = function(room, args) {
 		}
 	}
 
-	this._roomv.get('controller').send('showModOverlay', {
+	this._roomv.actions.showModOverlay.call(this._roomv, {
 		top: y,
 		left: x,
 		bottom: bottom,
diff --git a/src/ember/moderation-card.js b/src/ember/moderation-card.js
index a48d705a..ad87a5d9 100644
--- a/src/ember/moderation-card.js
+++ b/src/ember/moderation-card.js
@@ -1574,7 +1574,7 @@ FFZ.prototype._build_mod_card_history = function(msg, modcard, show_from, ts_cli
 	if ( modcard ) {
 		modcard.get('cardInfo.user.id') !== msg.from && jQuery('span.from', l_el).click(function(e) {
 			var el = modcard.get('element');
-			el && f._roomv && f._roomv.get('context.model.id') === msg.room && f._roomv.get('controller').send('showModOverlay', {
+			el && f._roomv && f._roomv.get('room.id') === msg.room && f._roomv.actions.showModCard.call(f._roomv, {
 				sender: msg.from,
 				top: parseInt(el.style.top),
 				left: parseInt(el.style.left)
diff --git a/src/ember/room.js b/src/ember/room.js
index 8811eaa4..84fee886 100644
--- a/src/ember/room.js
+++ b/src/ember/room.js
@@ -1035,7 +1035,7 @@ FFZ.prototype.add_room = function(room_id, room) {
 
 
 	// Why don't we set the scrollback length, too?
-	room.set('messageBufferSize', this.settings.scrollback_length + ((this._roomv && !this._roomv.get('stuckToBottom') && this._roomv.get('controller.model.id') === room_id) ? 150 : 0));
+	room.set('messageBufferSize', this.settings.scrollback_length + ((this._roomv && !this._roomv.get('stuckToBottom') && this._roomv.get('room.id') === room_id) ? 150 : 0));
 
 	// Load the room's data from the API.
 	this.load_room(room_id);
diff --git a/src/emoticons.js b/src/emoticons.js
index cd91ef0b..61c3c020 100644
--- a/src/emoticons.js
+++ b/src/emoticons.js
@@ -20,6 +20,26 @@ var FFZ = window.FrankerFaceZ,
 		70854: {
 			modifier: true,
 			modifier_offset: '30px 0 0'
+		},
+
+		147049: {
+			modifier: true,
+			modifier_offset: '4px 1px 0 3px'
+		},
+
+		147011: {
+			modifier: true,
+			modifier_offset: '0'
+		},
+
+		70864: {
+			modifier: true,
+			modifier_offset: '0'
+		},
+
+		147038: {
+			modifier: true,
+			modifier_offset: '0'
 		}
 	};
 
diff --git a/src/main.js b/src/main.js
index 9a0aa370..3458f979 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 393,
+	major: 3, minor: 5, revision: 394,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
@@ -292,7 +292,7 @@ FFZ.prototype.initialize = function(increment, delay) {
 		return this.init_normal(delay);
 
 	// Check for the dashboard.
-	if ( /\/[^\/]+\/dashboard/.test(location.pathname) && !/bookmarks$/.test(location.pathname) )
+	if ( window.PP && /\/[^\/]+\/dashboard/.test(location.pathname) && !/bookmarks$/.test(location.pathname) )
 		return this.init_dashboard(delay);
 
 	var loaded = FFZ.utils.ember_resolve('model:room');
diff --git a/src/utils.js b/src/utils.js
index 250f1323..ef7a8cb9 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -975,7 +975,7 @@ module.exports = FFZ.utils = {
 
 	emote_css: function(emote) {
 		var output = '';
-		if ( ! emote.margins && ! emote.css )
+		if ( ! emote.margins && (!emote.modifier || (! emote.modifier_offset && ! emote.extra_width && ! emote.shrink_to_fit)) && ! emote.css )
 			return output;
 
 		if ( emote.modifier && (emote.modifier_offset || emote.margins || emote.extra_width || emote.shrink_to_fit) ) {
diff --git a/style.css b/style.css
index d8b75a5e..2224bf61 100644
--- a/style.css
+++ b/style.css
@@ -3793,10 +3793,21 @@ body.ffz-bttv #ffz-feed-tabs .tabs { margin-bottom: 0 }
 	z-index: 0;
 }
 
-.modified-emoticon[data-ffz-emote="59829"] span { right: 128px }
+.ffz-bttv .emoticon[data-ffz-emote="70864"]:hover { opacity: 0 }
 
+.modified-emoticon[data-ffz-emote="59829"] span { right: 128px }
 .modified-emoticon > img.emoticon { margin: 0 !important }
 
+.emoticon[data-ffz-modifiers~="147011"] { clip-path: circle(14px at 50% 50%) }
+.modified-emoticon > img.emoticon[data-ffz-modifiers~="147038"] {
+	transform: translateY(-2px);
+	max-height: 24px;
+	clip-path: circle(14px at 50% 50%);
+}
+
+.modified-emoticon:hover span .emoticon[data-ffz-emote="70864"],
+.modified-emoticon:not(:hover) .emoticon[data-ffz-modifiers~="70864"] { opacity: 0 }
+
 .modified-emoticon span {
 	position: absolute;
 	top: -20px; bottom: -20px; left: -20px; right: -20px;