convert plug.dj settings mirror to Plugin

Author: goto-bus-stop

src/ExtPlug.js

@@ -19,6 +19,7 @@ import TooltipsPlugin from './plugins/TooltipsPlugin';
 import GuestPlugin from './plugins/GuestPlugin';
 import SocketEventsPlugin from './plugins/SocketEventsPlugin';
 import WaitlistEventsPlugin from './plugins/WaitlistEventsPlugin';
+import PlugSettingsPlugin from './plugins/PlugSettingsPlugin';
 
 import * as _package from './package';
 
@@ -89,7 +90,8 @@ const ExtPlug = Plugin.extend({
       new EmojiDataPlugin('extplug:emoji-data', this),
       new TooltipsPlugin('extplug:tooltips', this),
       new SocketEventsPlugin('extplug:socket-events', this),
-      new WaitlistEventsPlugin('extplug:waitlist-events', this)
+      new WaitlistEventsPlugin('extplug:waitlist-events', this),
+      new PlugSettingsPlugin('extplug:plug-settings', this)
     ];
 
     this._guest = new GuestPlugin('extplug:guest', this);
@@ -249,7 +251,6 @@ const ExtPlug = Plugin.extend({
 
     this.upgrade();
 
-    settings.update();
     this.appView = getApplicationView();
 
     // install extra events

src/hooks/index.js

@@ -1,11 +1,9 @@
 import * as apiEarlyHook from './api-early';
 import * as playbackHook from './playback';
-import * as settingsHook from './settings';
 import * as popoutStyleHook from './popout-style';
 
 export default [
   apiEarlyHook,
   playbackHook,
-  settingsHook,
   popoutStyleHook
 ];

src/hooks/settings.js

@@ -0,0 +1,34 @@
+import Plugin from '../Plugin';
+import { before } from 'meld';
+import plugSettings from 'plug/store/settings';
+import extMirror from '../store/settings';
+
+const PlugSettingsPlugin = Plugin.extend({
+  name: 'Plug.dj Settings Sync',
+  description: 'Mirrors plug.dj settings to the ExtPlug settings model, firing change events.',
+
+  enable() {
+    this.advice = before(plugSettings, 'save', this.sync.bind(this));
+    this.sync();
+  },
+
+  disable() {
+    this.advice.remove();
+    this.advice = null;
+  },
+
+  sync() {
+    const newSettings = _.extend({}, plugSettings.settings);
+    const muted = $('#volume .icon').hasClass('icon-volume-off');
+    // when you mute a song using the volume button, plug.dj does not change the associated setting.
+    // here we fake a volume of 0% anyway if the volume is muted, so ExtPlug modules can just
+    // use volume throughout and have it work.
+    if (newSettings.volume !== 0 && muted) {
+      newSettings.volume = 0;
+    }
+    newSettings.muted = muted;
+    extMirror.set(newSettings);
+  }
+});
+
+export default PlugSettingsPlugin;

src/plugins/PlugSettingsPlugin.js

@@ -1,22 +1,3 @@
-import _ from 'underscore';
-import plugSettings from 'plug/store/settings';
 import Settings from '../models/Settings';
 
-const settings = new Settings();
-
-function sync() {
-  let newSettings = _.extend({}, plugSettings.settings);
-  let muted = $('#volume .icon').hasClass('icon-volume-off');
-  // when you mute a song using the volume button, plug.dj does not change the associated setting.
-  // here we fake a volume of 0% anyway if the volume is muted, so ExtPlug modules can just
-  // use volume throughout and have it work.
-  if (newSettings.volume !== 0 && muted) {
-    newSettings.volume = 0;
-  }
-  newSettings.muted = muted;
-  settings.set(newSettings);
-}
-
-settings.update = sync;
-
-export default settings;
+export default new Settings();