Changed: Filter a bunch of errors out from Sentry logging.
+
API Added: module.hasModule(name) method to test if a module is already installed.
+
+
+
4.0.0-beta2.5@b3fb24504616675ad2b9
+
+
Added: Automatic error reporting using Sentry.
+
Added: Rarity sorting for the Experiments debugging information.
+
Changed: Allow Ctrl-Shift-Clicking emotes to open their information pages.
+
Fixed: deep_copy erroneously thinking some objects were recursive.
+
Fixed: The option to disallow mouse mouse interaction with extensions was not functioning.
+
+
4.0.0-beta2.4@b3fb24504616675ad2b9
Added: Debugging > Experiments for viewing active experiment information.
diff --git a/package-lock.json b/package-lock.json
index 2e490883..fc9db98f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7294,6 +7294,11 @@
"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
"dev": true
},
+ "raven-js": {
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/raven-js/-/raven-js-3.24.1.tgz",
+ "integrity": "sha512-p+e+yoQbq4YgXDonYIRZNL/Kov6+t5L0UNEHZeYNzjOkNNCXcwQ1Vi3pulgGBaOjqXNipkFsbpmnH7YI+GPSjw=="
+ },
"raw-body": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
diff --git a/package.json b/package.json
index 7b429d0c..80d017ff 100755
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
"js-cookie": "^2.2.0",
"path-to-regexp": "^2.2.0",
"popper.js": "^1.14.2",
+ "raven-js": "^3.24.1",
"sortablejs": "^1.7.0",
"vue": "^2.5.16",
"vue-clickaway": "^2.1.0",
diff --git a/res/font/ffz-fontello.eot b/res/font/ffz-fontello.eot
index 81bb5795..8005e0ed 100644
Binary files a/res/font/ffz-fontello.eot and b/res/font/ffz-fontello.eot differ
diff --git a/res/font/ffz-fontello.svg b/res/font/ffz-fontello.svg
index f69090ea..7577c92d 100644
--- a/res/font/ffz-fontello.svg
+++ b/res/font/ffz-fontello.svg
@@ -76,6 +76,14 @@
+
+
+
+
+
+
+
+
diff --git a/res/font/ffz-fontello.ttf b/res/font/ffz-fontello.ttf
index ad8dc0e0..57fec2d5 100644
Binary files a/res/font/ffz-fontello.ttf and b/res/font/ffz-fontello.ttf differ
diff --git a/res/font/ffz-fontello.woff b/res/font/ffz-fontello.woff
index a06f5954..f688d60f 100644
Binary files a/res/font/ffz-fontello.woff and b/res/font/ffz-fontello.woff differ
diff --git a/res/font/ffz-fontello.woff2 b/res/font/ffz-fontello.woff2
index 03c27215..01d82879 100644
Binary files a/res/font/ffz-fontello.woff2 and b/res/font/ffz-fontello.woff2 differ
diff --git a/src/experiments.js b/src/experiments.js
index 85c46b84..f786764d 100644
--- a/src/experiments.js
+++ b/src/experiments.js
@@ -18,6 +18,12 @@ const OVERRIDE_COOKIE = 'experiment_overrides',
};
+// We want to import this so that the file is included in the output.
+// We don't load using this because we might want a newer file from the
+// server.
+import EXPERIMENTS from 'file-loader?name=[name].[hash].[ext]!./experiments.json'; // eslint-disable-line no-unused-vars
+
+
// ============================================================================
// Experiment Manager
// ============================================================================
@@ -31,6 +37,9 @@ export default class ExperimentManager extends Module {
this.settings.addUI('experiments', {
path: 'Debugging > Experiments',
component: 'experiments',
+
+ unique_id: () => this.unique_id,
+
ffz_data: () => deep_copy(this.experiments),
twitch_data: () => deep_copy(this.getTwitchExperiments()),
@@ -66,7 +75,7 @@ export default class ExperimentManager extends Module {
let data;
try {
- data = await fetch(`${SERVER}/static/experiments.json?_=${Date.now()}`).then(r =>
+ data = await fetch(`${SERVER}/script/experiments.json?_=${Date.now()}`).then(r =>
r.ok ? r.json() : null);
} catch(err) {
@@ -179,12 +188,11 @@ export default class ExperimentManager extends Module {
_rebuildTwitchKey(key, is_set, new_val) {
const core = this.resolve('site').getCore(),
- exps = core.experiments;
+ exps = core.experiments,
- if ( ! has(exps.assignments, key) )
- return;
-
- const old_val = exps.assignments[key];
+ old_val = has(exps.assignments, key) ?
+ exps.assignments[key] :
+ undefined;
if ( old_val !== new_val ) {
const value = is_set ? new_val : old_val;
diff --git a/src/main.js b/src/main.js
index ae3ef9e3..b357eb23 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,7 @@
'use strict';
+import RavenLogger from './raven';
+
import Logger from 'utilities/logging';
import Module from 'utilities/module';
@@ -24,7 +26,14 @@ class FrankerFaceZ extends Module {
this.__state = 0;
this.__modules.core = this;
- this.log = new Logger(this);
+ // ========================================================================
+ // Error Reporting and Logging
+ // ========================================================================
+
+ //if ( ! DEBUG )
+ this.inject('raven', RavenLogger);
+
+ this.log = new Logger(null, null, null, this.raven);
this.core_log = this.log.get('core');
this.log.info(`FrankerFaceZ v${VER} (build ${VER.build})`);
@@ -86,18 +95,12 @@ class FrankerFaceZ extends Module {
await Promise.all(promises);
}
-
-
- /* eslint class-methods-use-this: off */
- api(...args) {
- return this._api.create(...args);
- }
}
FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = {
- major: 4, minor: 0, revision: 0, extra: '-beta2.4',
+ major: 4, minor: 0, revision: 0, extra: '-beta2.7',
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 d4a014ed..05ecb878 100644
--- a/src/modules/chat/emotes.js
+++ b/src/modules/chat/emotes.js
@@ -195,6 +195,35 @@ export default class Emotes extends Module {
const provider = ds.provider;
+ if ( event.shiftKey && this.parent.context.get('chat.click-emotes') ) {
+ let url;
+
+ if ( provider === 'twitch' )
+ url = `https://twitchemotes.com/emotes/${ds.id}`;
+
+ else if ( provider === 'ffz' ) {
+ const emote_set = this.emote_sets[ds.set],
+ emote = emote_set && emote_set.emotes[ds.id];
+
+ if ( ! emote )
+ return;
+
+ if ( emote.click_url )
+ url = emote.click_url;
+
+ else if ( ! emote_set.source )
+ url = `https://www.frankerfacez.com/emoticons/${emote.id}`;
+ }
+
+ if ( url ) {
+ const win = window.open();
+ win.opener = null;
+ win.location = url;
+ }
+
+ return true;
+ }
+
if ( event[MOD_KEY] ) {
// Favoriting Emotes
let source, id;
@@ -225,35 +254,6 @@ export default class Emotes extends Module {
return true;
}
-
- if ( event.shiftKey && this.parent.context.get('chat.click-emotes') ) {
- let url;
-
- if ( provider === 'twitch' )
- url = `https://twitchemotes.com/emotes/${ds.id}`;
-
- else if ( provider === 'ffz' ) {
- const emote_set = this.emote_sets[ds.set],
- emote = emote_set && emote_set.emotes[ds.id];
-
- if ( ! emote )
- return;
-
- if ( emote.click_url )
- url = emote.click_url;
-
- else if ( ! emote_set.source )
- url = `https://www.frankerfacez.com/emoticons/${emote.id}`;
- }
-
- if ( url ) {
- const win = window.open();
- win.opener = null;
- win.location = url;
- }
-
- return true;
- }
}
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 5f742c9c..40dfb84f 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -303,11 +303,15 @@ export default class Chat extends Module {
else if ( this.users[login] && ! no_login )
user = this.users[login];
- else if ( no_create )
- return null;
+ if ( user && user.destroyed )
+ user = null;
- else
- user = new User(this, null, id, login);
+ if ( ! user ) {
+ if ( no_create )
+ return null;
+ else
+ user = new User(this, null, id, login);
+ }
if ( id && id !== user.id ) {
// If the ID isn't what we expected, something is very wrong here.
@@ -358,11 +362,15 @@ export default class Chat extends Module {
else if ( this.rooms[login] && ! no_login )
room = this.rooms[login];
- else if ( no_create )
- return null;
+ if ( room && room.destroyed )
+ room = null;
- else
- room = new Room(this, id, login);
+ if ( ! room ) {
+ if ( no_create )
+ return null;
+ else
+ room = new Room(this, id, login);
+ }
if ( id && id !== room.id ) {
// If the ID isn't what we expected, something is very wrong here.
diff --git a/src/modules/chat/room.js b/src/modules/chat/room.js
index 9561ea6c..f86f1180 100644
--- a/src/modules/chat/room.js
+++ b/src/modules/chat/room.js
@@ -70,8 +70,8 @@ export default class Room {
this.manager.socket.unsubscribe(this, `room.${this.login}`);
}
- if ( this.manager.room_ids[this.id] === this )
- this.manager.room_ids[this.id] = null;
+ if ( this.manager.room_ids[this._id] === this )
+ this.manager.room_ids[this._id] = null;
}
diff --git a/src/modules/chat/user.js b/src/modules/chat/user.js
index 085ad40c..fed2da9b 100644
--- a/src/modules/chat/user.js
+++ b/src/modules/chat/user.js
@@ -28,6 +28,14 @@ export default class User {
this.manager.emotes.unrefSet(set_id);
this.emote_sets = null;
+
+ const parent = this.room || this.manager;
+
+ if ( this._login && parent.users[this._login] === this )
+ parent.users[this._login] = null;
+
+ if ( parent.user_ids[this._id] === this )
+ parent.user_ids[this._id] = null;
}
get id() {
diff --git a/src/modules/main_menu/components/experiments.vue b/src/modules/main_menu/components/experiments.vue
index e01617f9..9f454c4c 100644
--- a/src/modules/main_menu/components/experiments.vue
+++ b/src/modules/main_menu/components/experiments.vue
@@ -1,9 +1,23 @@
-
+
{{ t('settings.experiments.about', 'This feature allows you to override experiment values. Please note that, for most experiments, you may have to refresh the page for your changes to take effect.') }}