profile.toggled = ! profile.toggled,
getBackup: () => deep_copy(profile.getBackup()),
context: deep_copy(profile.context),
@@ -617,6 +620,11 @@ export default class MainMenu extends Module {
this._update_profiles(profile);
},
+ _profile_toggled(profile, val) {
+ Vue.set(profile_keys[profile.id], 'toggled', val);
+ this._update_profiles(profile);
+ },
+
_profile_deleted(profile) {
Vue.delete(profile_keys, profile.id);
this._update_profiles();
@@ -641,6 +649,7 @@ export default class MainMenu extends Module {
_add_user() {
this._users++;
if ( this._users === 1 ) {
+ settings.on(':profile-toggled', this._profile_toggled, this);
settings.on(':profile-created', this._profile_created, this);
settings.on(':profile-changed', this._profile_changed, this);
settings.on(':profile-deleted', this._profile_deleted, this);
@@ -654,6 +663,7 @@ export default class MainMenu extends Module {
_remove_user() {
this._users--;
if ( this._users === 0 ) {
+ settings.off(':profile-toggled', this._profile_toggled, this);
settings.off(':profile-created', this._profile_created, this);
settings.off(':profile-changed', this._profile_changed, this);
settings.off(':profile-deleted', this._profile_deleted, this);
diff --git a/src/modules/tooltips.js b/src/modules/tooltips.js
index 3a2b06ee..e60f187a 100644
--- a/src/modules/tooltips.js
+++ b/src/modules/tooltips.js
@@ -60,7 +60,8 @@ export default class TooltipProvider extends Module {
}
onEnable() {
- const container = document.querySelector('#root>div') || document.querySelector('#root') || document.querySelector('.clips-root') || document.body;
+ const container = document.querySelector('.sunlight-root') || document.querySelector('#root>.tw-absolute:not(.tw-flex)') || document.querySelector('#root') || document.querySelector('.clips-root') || document.body;
+
// is_minimal = false; //container && container.classList.contains('twilight-minimal-root');
this.tips = new Tooltip(container, 'ffz-tooltip', {
diff --git a/src/settings/components/time.vue b/src/settings/components/time.vue
new file mode 100644
index 00000000..55f5f9d9
--- /dev/null
+++ b/src/settings/components/time.vue
@@ -0,0 +1,47 @@
+
+
+
+
+ {{ t(type.i18n, type.title) }}
+
+
+
+ {{ t('settings.filter.time.start', 'Start:') }}
+
+
+
+
+
+ {{ t('settings.filter.time.end', 'End:') }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/settings/context.js b/src/settings/context.js
index 85792a58..3117ba07 100644
--- a/src/settings/context.js
+++ b/src/settings/context.js
@@ -118,8 +118,9 @@ export default class SettingsContext extends EventEmitter {
selectProfiles() {
const new_profiles = [],
order = this.order = [];
+
for(const profile of this.manager.__profiles)
- if ( profile.matches(this.__context) ) {
+ if ( profile.toggled && profile.matches(this.__context) ) {
new_profiles.push(profile);
order.push(profile.id);
}
@@ -389,6 +390,16 @@ export default class SettingsContext extends EventEmitter {
}
+ hasProfile(profile) {
+ if ( typeof profile === 'number' )
+ for(const prof of this.__profiles)
+ if ( prof.id === profile )
+ return true;
+
+ return this.__profiles.includes(profile);
+ }
+
+
_getRaw(key, type) {
if ( ! type )
throw new Error(`non-existent type for ${key}`)
diff --git a/src/settings/filters.js b/src/settings/filters.js
index 81b8b6a9..d52b9ede 100644
--- a/src/settings/filters.js
+++ b/src/settings/filters.js
@@ -42,6 +42,74 @@ export const Or = {
// Context Stuff
+function parseTime(time) {
+ if ( typeof time !== 'string' || ! time.length )
+ return null;
+
+ const idx = time.indexOf(':');
+ if ( idx === -1 )
+ return null;
+
+ let hours, minutes;
+ try {
+ hours = parseInt(time.slice(0, idx), 10);
+ minutes = parseInt(time.slice(idx + 1), 10);
+
+ } catch(err) {
+ return null;
+ }
+
+ return hours * 60 + minutes;
+}
+
+export const Time = {
+ _captured: new Set,
+
+ createTest(config) {
+ const start = parseTime(config[0]),
+ end = parseTime(config[1]);
+
+ if ( start == null || end == null )
+ return () => false;
+
+ if ( start <= end )
+ return () => {
+ Time._captured.add(start);
+ Time._captured.add(end + 1);
+
+ const d = new Date,
+ v = d.getHours() * 60 + d.getMinutes();
+
+ return v >= start && v <= end;
+ }
+
+ return () => {
+ Time._captured.add(start + 1);
+ Time._captured.add(end);
+
+ const d = new Date,
+ v = d.getHours() * 60 + d.getMinutes();
+
+ return v <= start || v >= end;
+ }
+ },
+
+ captured: () => {
+ const out = Array.from(Time._captured);
+ Time._captured = new Set;
+ out.sort((a, b) => a - b);
+ return out;
+ },
+
+ title: 'Time of Day',
+ i18n: 'settings.filter.time',
+
+ default: ['08:00', '18:00'],
+
+ editor: () => import(/* webpackChunkName: 'main-menu' */ './components/time.vue')
+}
+
+
export const TheaterMode = {
createTest(config) {
return ctx => ctx.ui && ctx.ui.theatreModeEnabled === config;
diff --git a/src/settings/index.js b/src/settings/index.js
index 95fe497c..07d2ec22 100644
--- a/src/settings/index.js
+++ b/src/settings/index.js
@@ -46,7 +46,6 @@ export default class SettingsManager extends Module {
this.migrations = new MigrationManager(this);
-
// Also create the main context as early as possible.
this.main_context = new SettingsContext(this);
@@ -98,6 +97,42 @@ export default class SettingsManager extends Module {
this.log.info(`Initialization complete after ${duration.toFixed(5)}ms -- Values: ${this.provider.size} -- Profiles: ${this.__profiles.length}`)
this.scheduleUpdates();
+ this.updateClock();
+ }
+
+
+ updateClock() {
+ const captured = require('./filters').Time.captured();
+ if ( ! captured?.length )
+ return;
+
+ if ( this._time_timer )
+ clearTimeout(this._time_timer);
+
+ const d = new Date,
+ now = d.getHours() * 60 + d.getMinutes();
+
+ let next = this._time_next != null ? this._time_next : null;
+ for(const value of captured) {
+ if ( value <= now )
+ continue;
+
+ if ( next == null || value < next )
+ next = value;
+ }
+
+ // There's no time waiting for today. Skip to the next day.
+ if ( next == null )
+ next = captured[0] + 1440;
+
+ // Determine how long it'll take to reach the next time period.
+ const delta = (next - now) * 60 * 1000 - 59750 + (60000 - Date.now() % 60000);
+ this._time_timer = setTimeout(() => {
+ for(const context of this.__contexts)
+ context.selectProfiles();
+
+ this.updateClock();
+ }, delta);
}
@@ -186,6 +221,8 @@ export default class SettingsManager extends Module {
// Look up the profile it belongs to and emit a changed event from
// that profile, thus notifying any contexts or UI instances.
key = key.substr(2);
+
+ // Is it a value?
const idx = key.indexOf(':');
if ( idx === -1 )
return;
@@ -193,8 +230,12 @@ export default class SettingsManager extends Module {
const profile = this.__profile_ids[key.slice(0, idx)],
s_key = key.slice(idx + 1);
- if ( profile )
- profile.emit('changed', s_key, new_value, deleted);
+ if ( profile ) {
+ if ( s_key === ':enabled' )
+ profile.emit('toggled', profile, deleted ? true : new_value);
+ else
+ profile.emit('changed', s_key, new_value, deleted);
+ }
}
@@ -210,6 +251,17 @@ export default class SettingsManager extends Module {
// And then re-select the active profiles.
for(const context of this.__contexts)
context.selectProfiles();
+
+ this.updateClock();
+ }
+
+
+ _onProfileToggled(profile, val) {
+ for(const context of this.__contexts)
+ context.selectProfiles();
+
+ this.updateClock();
+ this.emit(':profile-toggled', profile, val);
}
@@ -250,6 +302,9 @@ export default class SettingsManager extends Module {
let reordered = false,
changed = false;
+ for(const profile of old_profiles)
+ profile.off('toggled', this._onProfileToggled, this);
+
for(const profile_data of raw_profiles) {
const id = profile_data.id,
slot_id = profiles.length,
@@ -293,12 +348,17 @@ export default class SettingsManager extends Module {
changed = true;
}
+ for(const profile of profiles)
+ profile.on('toggled', this._onProfileToggled, this);
+
if ( ! changed && ! old_ids.size || suppress_events )
return;
for(const context of this.__contexts)
context.selectProfiles();
+ this.updateClock();
+
for(const id of new_ids)
this.emit(':profile-created', profile_ids[id]);
@@ -327,9 +387,10 @@ export default class SettingsManager extends Module {
options.name = `Unnamed Profile ${i}`;
const profile = this.__profile_ids[i] = new SettingsProfile(this, options);
-
this.__profiles.unshift(profile);
+ profile.on('toggled', this._onProfileToggled, this);
+
this._saveProfiles();
this.emit(':profile-created', profile);
return profile;
@@ -351,6 +412,7 @@ export default class SettingsManager extends Module {
if ( profile.id === 0 )
throw new Error('cannot delete default profile');
+ profile.off('toggled', this._onProfileToggled, this);
profile.clear();
this.__profile_ids[id] = null;
@@ -400,6 +462,8 @@ export default class SettingsManager extends Module {
this.provider.set('profiles', this.__profiles.map(prof => prof.data));
for(const context of this.__contexts)
context.selectProfiles();
+
+ this.updateClock();
}
diff --git a/src/settings/profile.js b/src/settings/profile.js
index ba6157e3..c75a25d5 100644
--- a/src/settings/profile.js
+++ b/src/settings/profile.js
@@ -24,6 +24,7 @@ export default class SettingsProfile extends EventEmitter {
this.data = data;
this.prefix = `p:${this.id}:`;
+ this.enabled_key = `${this.prefix}:enabled`;
}
get data() {
@@ -38,6 +39,7 @@ export default class SettingsProfile extends EventEmitter {
desc_i18n_key: this.desc_i18n_key,
url: this.url,
+ show_toggle: this.show_toggle,
context: this.context
}
@@ -72,6 +74,7 @@ export default class SettingsProfile extends EventEmitter {
version: 2,
type: 'profile',
profile: this.data,
+ toggled: this.toggled,
values: {}
};
@@ -107,6 +110,23 @@ export default class SettingsProfile extends EventEmitter {
}
+ // ========================================================================
+ // Toggled
+ // ========================================================================
+
+ get toggled() {
+ return this.provider.get(this.enabled_key, true);
+ }
+
+ set toggled(val) {
+ if ( val === this.toggleState )
+ return;
+
+ this.provider.set(this.enabled_key, val);
+ this.emit('toggled', this, val);
+ }
+
+
// ========================================================================
// Context
// ========================================================================
@@ -158,7 +178,7 @@ export default class SettingsProfile extends EventEmitter {
len = p.length;
for(const key of this.provider.keys())
- if ( key.startsWith(p) )
+ if ( key.startsWith(p) && key !== this.enabled_key )
out.push(key.slice(len));
return out;
@@ -168,7 +188,7 @@ export default class SettingsProfile extends EventEmitter {
const p = this.prefix,
len = p.length;
for(const key of this.provider.keys())
- if ( key.startsWith(p) ) {
+ if ( key.startsWith(p) && key !== this.enabled_key ) {
this.provider.delete(key);
this.emit('changed', key.slice(len), undefined, true);
}
@@ -179,7 +199,7 @@ export default class SettingsProfile extends EventEmitter {
len = p.length;
for(const key of this.provider.keys())
- if ( key.startsWith(p) )
+ if ( key.startsWith(p) && key !== this.enabled_key )
yield [key.slice(len), this.provider.get(key)];
}
@@ -188,7 +208,7 @@ export default class SettingsProfile extends EventEmitter {
let count = 0;
for(const key of this.provider.keys())
- if ( key.startsWith(p) )
+ if ( key.startsWith(p) && key !== this.enabled_key )
count++;
return count;
diff --git a/src/sites/twitch-twilight/index.js b/src/sites/twitch-twilight/index.js
index 1046d7c4..924ca66b 100644
--- a/src/sites/twitch-twilight/index.js
+++ b/src/sites/twitch-twilight/index.js
@@ -236,6 +236,6 @@ Twilight.ROUTES = {
};
-Twilight.DIALOG_EXCLUSIVE = '.twilight-main,.twilight-minimal-root>div,#root>div>.tw-full-height,.clips-root';
-Twilight.DIALOG_MAXIMIZED = '.twilight-main,.twilight-minimal-root,#root .dashboard-side-nav+.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
-Twilight.DIALOG_SELECTOR = '#root>div>.tw-full-height,.twilight-minimal-root>.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
\ No newline at end of file
+Twilight.DIALOG_EXCLUSIVE = '.sunlight-root,.twilight-main,.twilight-minimal-root>div,#root>div>.tw-full-height,.clips-root';
+Twilight.DIALOG_MAXIMIZED = '.sunlight-page,.twilight-main,.twilight-minimal-root,#root .dashboard-side-nav+.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
+Twilight.DIALOG_SELECTOR = '.sunlight-root,#root,.twilight-minimal-root>.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/menu_button.jsx b/src/sites/twitch-twilight/modules/menu_button.jsx
index ddcb2e58..ae060a40 100644
--- a/src/sites/twitch-twilight/modules/menu_button.jsx
+++ b/src/sites/twitch-twilight/modules/menu_button.jsx
@@ -6,7 +6,7 @@
import {DEBUG} from 'utilities/constants';
import {SiteModule} from 'utilities/module';
-import {createElement} from 'utilities/dom';
+import {createElement, ClickOutside, setChildren} from 'utilities/dom';
export default class MenuButton extends SiteModule {
constructor(...args) {
@@ -192,6 +192,7 @@ export default class MenuButton extends SiteModule {
{btn = (
this.handleClick(e, btn)} // eslint-disable-line react/jsx-no-bind
+ onContextMenu={e => this.renderContext(e, btn)} // eslint-disable-line react/jsx-no-bind
>
@@ -256,6 +257,9 @@ export default class MenuButton extends SiteModule {
);
container.insertBefore(el, container.lastElementChild);
+
+ if ( this._ctx_open )
+ this.renderContext(null, btn);
}
handleClick(event, btn) {
@@ -269,13 +273,160 @@ export default class MenuButton extends SiteModule {
this.emit(':clicked', event, btn);
}
+ renderButtonIcon(profile) {
+ const live = this.settings.main_context.hasProfile(profile);
+ return ( { // eslint-disable-line react/jsx-no-bind
+ profile.toggled = ! profile.toggled;
+
+ setChildren(toggle, this.renderButtonIcon(profile));
+ toggle.dataset.title = this.renderButtonTip(profile);
+
+ if ( toggle['_ffz_tooltip$0']?.rerender )
+ toggle['_ffz_tooltip$0'].rerender();
+
+ this.emit('tooltips:cleanup');
+
+ e.preventDefault();
+ e.stopPropagation();
+ }}
+ >
+ { this.renderButtonIcon(profile) }
+ )
+
+ profiles.push(
+ {toggle}
+
+
{ profile.i18n_key ? this.i18n.t(profile.i18n_key, profile.name, profile) : profile.name }
+ {profile.description && (
+ { profile.desc_i18n_key ? this.i18n.t(profile.desc_i18n_key, profile.description, profile) : profile.description }
+
)}
+
+