diff --git a/changelog.html b/changelog.html index 158af03c..ac7e945d 100644 --- a/changelog.html +++ b/changelog.html @@ -1,4 +1,11 @@ -
4.0.0-beta2.16@61e6d676fdac89cf0592
+
4.0.0-beta2.17@dce1b0c5268bdd3fe086
+ + +
4.0.0-beta2.16@9fac4d6cabd486c45f4e
diff --git a/src/main.js b/src/main.js index 6253be44..3dc06bc6 100644 --- a/src/main.js +++ b/src/main.js @@ -100,7 +100,7 @@ class FrankerFaceZ extends Module { FrankerFaceZ.Logger = Logger; const VER = FrankerFaceZ.version_info = { - major: 4, minor: 0, revision: 0, extra: '-beta2.16', + major: 4, minor: 0, revision: 0, extra: '-beta2.17', build: __webpack_hash__, toString: () => `${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}` diff --git a/src/modules/chat/emotes.js b/src/modules/chat/emotes.js index 0f31a3aa..8cdc4b8e 100644 --- a/src/modules/chat/emotes.js +++ b/src/modules/chat/emotes.js @@ -128,10 +128,13 @@ export default class Emotes extends Module { updateFollowSets(data) { for(const room_login in data) if ( has(data, room_login) ) { - const room = this.parent.getRoom(null, room_login, true), - new_sets = data[room_login] || [], + const room = this.parent.getRoom(null, room_login, true); + if ( ! room || room.destroyed ) + continue; + + const new_sets = data[room_login] || [], emote_sets = room.emote_sets, - providers = emote_sets._sources; + providers = emote_sets && emote_sets._sources; if ( providers && providers.has('featured') ) for(const item of providers.get('featured')) { diff --git a/src/raven.js b/src/raven.js index 6e37ea6b..804f26e0 100644 --- a/src/raven.js +++ b/src/raven.js @@ -152,7 +152,7 @@ export default class RavenLogger extends Module { }, shouldSendCallback: data => { if ( this.settings && ! this.settings.get('reports.error.enable') ) { - if ( data.tags.example && this.__example_waiter ) { + if ( data.tags && data.tags.example && this.__example_waiter ) { this.__example_waiter(null); this.__example_waiter = null; } @@ -160,12 +160,13 @@ export default class RavenLogger extends Module { return false; } + const exc = data.exception && data.exception.values[0]; + // We don't want any of Sentry's junk. - if ( data.message && data.messages.includes('raven-js/') ) + if ( data.message && data.messages.includes('raven-js/') || (exc && JSON.stringify(exc).includes('raven-js/')) ) return false; // We don't want any of Mozilla's junk either. - const exc = data.exception && data.exception.values[0]; if ( exc && exc.type.startsWith('NS_') ) return false; diff --git a/src/sites/twitch-twilight/modules/host-options.vue b/src/sites/twitch-twilight/modules/host-options.vue index 0f34f3fe..6f704f4d 100644 --- a/src/sites/twitch-twilight/modules/host-options.vue +++ b/src/sites/twitch-twilight/modules/host-options.vue @@ -56,7 +56,7 @@
@@ -178,6 +178,7 @@ {{ t('metadata.host.tab.auto-host', 'Auto Host') }}