From 7cc6bf576fc67beb5da6ced1175b9fd6052347a6 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 2 Feb 2018 18:11:37 -0500
Subject: [PATCH] Fix a typo with room-specific user-specific emote sets. Add a
 suppress_logs argument to registering emote sets to avoid spam from the
 GameWisp add-on.

---
 changelog.html             |  7 +++++++
 src/modules/chat/emotes.js | 14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/changelog.html b/changelog.html
index 0a5d82d4..3a6f491c 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,10 @@
+<div class="list-header">4.0.0-beta1.5<span>@bd87103fc1c64cf0df6d</span> <time datetime="2018-02-02">(2018-02-02)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Error fetching room-specific user-specific emote sets.</li>
+	<li>Fixed: Tweaks to badge CSS generation.</li>
+	<li>API Changed: Add optional arguments to suppress logging when registering emote sets.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1.5<span>@bd87103fc1c64cf0df6d</span> <time datetime="2018-02-02">(2018-02-02)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Setting to disable chat rituals, such as "User is new here! Say hello!"</li>
diff --git a/src/modules/chat/emotes.js b/src/modules/chat/emotes.js
index a5bb7c3b..c25897e3 100644
--- a/src/modules/chat/emotes.js
+++ b/src/modules/chat/emotes.js
@@ -113,7 +113,7 @@ export default class Emotes extends Module {
 			user = this.parent.getUser(user_id, user_login, true);
 
 		return (user ? user.emote_sets._cache : []).concat(
-			room_user ? room_user.emote_set._cache : [],
+			room_user ? room_user.emote_sets._cache : [],
 			room ? room.emote_sets._cache : [],
 			this.default_sets._cache
 		);
@@ -259,7 +259,7 @@ export default class Emotes extends Module {
 	}
 
 
-	loadSetData(set_id, data) {
+	loadSetData(set_id, data, suppress_log = false) {
 		const old_set = this.emote_sets[set_id];
 		if ( ! data ) {
 			if ( old_set )
@@ -314,12 +314,14 @@ export default class Emotes extends Module {
 		else if ( css.length )
 			data.pending_css = css.join('');
 
-		this.log.info(`Loaded emote set #${set_id}: ${data.title} (${count} emotes)`);
+		if ( ! suppress_log )
+			this.log.info(`Loaded emote set #${set_id}: ${data.title} (${count} emotes)`);
+
 		this.emit(':loaded', set_id, data);
 	}
 
 
-	unloadSet(set_id, force = false) {
+	unloadSet(set_id, force = false, suppress_log = false) {
 		const old_set = this.emote_sets[set_id],
 			count = this._set_refs[set_id] || 0;
 
@@ -332,7 +334,9 @@ export default class Emotes extends Module {
 			this.log.warn(`Unloading emote set ${set_id} with ${count} users.`);
 		}
 
-		this.log.info(`Unloaded emote set #${set_id}: ${old_set.title}`);
+		if ( ! suppress_log )
+			this.log.info(`Unloaded emote set #${set_id}: ${old_set.title}`);
+
 		this.emit(':unloaded', set_id, old_set);
 		this.emote_sets[set_id] = null;
 	}