- {t.i18n.t('emote-menu.channel', 'Channel')}
+ {this.state.has_channel_tab &&
- {t.i18n.t('emote-menu.my-emotes', 'My Emotes')}
+
- {this.state.has_emoji_tab &&
- {t.i18n.t('emote-menu.emoji', 'Emoji')}
+ {this.state.has_emoji_tab &&
}
- {!loading && (
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index ad180ad6..90923e83 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -89,6 +89,7 @@ const CHAT_TYPES = make_enum(
'Resubscription',
'GiftPaidUpgrade',
'AnonGiftPaidUpgrade',
+ 'PrimePaidUpgrade',
'SubGift',
'AnonSubGift',
'Clear',
@@ -274,6 +275,15 @@ export default class ChatHook extends Module {
}
});
+ this.settings.add('chat.subs.merge-gifts-visibility', {
+ default: false,
+ ui: {
+ path: 'Chat > Appearance >> Subscriptions',
+ title: 'Expand merged mass sub gift messages by default.',
+ component: 'setting-check-box'
+ }
+ });
+
this.settings.add('chat.lines.alternate', {
default: false,
ui: {
diff --git a/src/sites/twitch-twilight/modules/chat/line.js b/src/sites/twitch-twilight/modules/chat/line.js
index 959a36b5..86f5dc54 100644
--- a/src/sites/twitch-twilight/modules/chat/line.js
+++ b/src/sites/twitch-twilight/modules/chat/line.js
@@ -416,8 +416,11 @@ export default class ChatLine extends Module {
});
}
+ const expanded = t.chat.context.get('chat.subs.merge-gifts-visibility') ?
+ ! this.state.ffz_expanded : this.state.ffz_expanded;
+
let sub_list = null;
- if( this.state.ffz_expanded && mystery && mystery.recipients && mystery.recipients.length > 0 ) {
+ if( expanded && mystery && mystery.recipients && mystery.recipients.length > 0 ) {
const the_list = [];
for(const x of mystery.recipients) {
if ( the_list.length )
@@ -455,7 +458,7 @@ export default class ChatLine extends Module {
mystery ? e('div', {
className: 'tw-pd-l-05 tw-font-size-4'
}, e('figure', {
- className: `ffz-i-${this.state.ffz_expanded ? 'down' : 'right'}-dir tw-pd-y-1`
+ className: `ffz-i-${expanded ? 'down' : 'right'}-dir tw-pd-y-1`
})) : null
]),
sub_list,
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/index.js b/src/sites/twitch-twilight/modules/css_tweaks/index.js
index 8b71b19f..146c1f5f 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/index.js
+++ b/src/sites/twitch-twilight/modules/css_tweaks/index.js
@@ -12,6 +12,7 @@ import {has} from 'utilities/object';
const PORTRAIT_ROUTES = ['user', 'video', 'user-video', 'user-clip', 'user-videos', 'user-clips', 'user-collections', 'user-events', 'user-followers', 'user-following']
const CLASSES = {
+ 'top-discover': '.top-nav__nav-link[data-a-target="discover-link"]',
'side-nav': '.side-nav',
'side-rec-channels': '.side-nav .recommended-channels',
'side-rec-friends': '.side-nav .recommended-friends',
@@ -30,7 +31,7 @@ const CLASSES = {
'pinned-cheer': '.pinned-cheer,.pinned-cheer-v2',
'whispers': '.whispers',
- 'dir-live-ind': '.live-channel-card:not([data-a-target*="host"]) .stream-type-indicator.stream-type-indicator--live,.stream-thumbnail__card .stream-type-indicator.stream-type-indicator--live,.preview-card .stream-type-indicator.stream-type-indicator--live',
+ 'dir-live-ind': '.live-channel-card:not([data-a-target*="host"]) .stream-type-indicator.stream-type-indicator--live,.stream-thumbnail__card .stream-type-indicator.stream-type-indicator--live,.preview-card .stream-type-indicator.stream-type-indicator--live,.preview-card .preview-card-stat.preview-card-stat--live',
'profile-hover': '.preview-card .tw-relative:hover .ffz-channel-avatar',
};
@@ -242,7 +243,17 @@ export default class CSSTweaks extends Module {
component: 'setting-check-box'
},
changed: val => this.toggle('theatre-nav', val)
- })
+ });
+
+ this.settings.add('layout.discover', {
+ default: true,
+ ui: {
+ path: 'Appearance > Layout >> Top Navigation',
+ title: 'Show Discover link.',
+ component: 'setting-check-box'
+ },
+ changed: val => this.toggleHide('top-discover', !val)
+ });
this.settings.add('layout.prime-offers', {
default: true,
@@ -290,6 +301,7 @@ export default class CSSTweaks extends Module {
this.toggleHide('side-nav', !this.settings.get('layout.side-nav.show'));
this.toggleHide('side-rec-friends', !this.settings.get('layout.side-nav.show-rec-friends'));
this.toggleHide('prime-offers', !this.settings.get('layout.prime-offers'));
+ this.toggleHide('top-discover', !this.settings.get('layout.discover'));
const recs = this.settings.get('layout.side-nav.show-rec-channels');
this.toggleHide('side-rec-channels', recs === 0);
diff --git a/src/sites/twitch-twilight/styles/chat.scss b/src/sites/twitch-twilight/styles/chat.scss
index 6f847015..722de55d 100644
--- a/src/sites/twitch-twilight/styles/chat.scss
+++ b/src/sites/twitch-twilight/styles/chat.scss
@@ -188,7 +188,7 @@
}
}
- .emote-picker__tab > *,
+ .emote-picker-tab-item button > *,
.emote-picker__emote-link > * {
pointer-events: none;
}
diff --git a/src/utilities/dom.js b/src/utilities/dom.js
index 2c5b7518..c0779fcc 100644
--- a/src/utilities/dom.js
+++ b/src/utilities/dom.js
@@ -132,6 +132,33 @@ export function setChildren(el, children, no_sanitize, no_empty) {
}
+export function openFile(contentType, multiple) {
+ return new Promise(resolve => {
+ const input = document.createElement('input');
+ input.type = 'file';
+ input.accept = contentType;
+ input.multiple = multiple;
+
+ input.onchange = () => {
+ const files = Array.from(input.files);
+ resolve(multiple ? files : files[0])
+ }
+
+ input.click();
+ })
+}
+
+
+export function readFile(file, encoding = 'utf-8') {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.readAsText(file, encoding);
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = e => reject(e);
+ });
+}
+
+
const el = createElement('span');
export function sanitize(text) {
diff --git a/styles/icons.scss b/styles/icons.scss
index 69585c85..685ae846 100644
--- a/styles/icons.scss
+++ b/styles/icons.scss
@@ -119,12 +119,15 @@
.ffz-i-eye-off:before { content: '\e82a'; } /* '' */
.ffz-i-views:before { content: '\e82b'; } /* '' */
.ffz-i-conversations:before { content: '\e82c'; } /* '' */
+.ffz-i-channels:before { content: '\e82d'; } /* '' */
+.ffz-i-camera:before { content: '\e82e'; } /* '' */
.ffz-i-link-ext:before { content: '\f08e'; } /* '' */
.ffz-i-twitter:before { content: '\f099'; } /* '' */
.ffz-i-github:before { content: '\f09b'; } /* '' */
.ffz-i-gauge:before { content: '\f0e4'; } /* '' */
.ffz-i-download-cloud:before { content: '\f0ed'; } /* '' */
.ffz-i-upload-cloud:before { content: '\f0ee'; } /* '' */
+.ffz-i-smile:before { content: '\f118'; } /* '' */
.ffz-i-keyboard:before { content: '\f11c'; } /* '' */
.ffz-i-calendar-empty:before { content: '\f133'; } /* '' */
.ffz-i-ellipsis-vert:before { content: '\f142'; } /* '' */