diff --git a/src/main.js b/src/main.js
index 1aeded36..cc2c182f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = {
- major: 4, minor: 0, revision: 0, extra: '-rc13.17',
+ major: 4, minor: 0, revision: 0, extra: '-rc13.18',
commit: __git_commit__,
build: __webpack_hash__,
toString: () =>
diff --git a/src/modules/chat/actions/types.jsx b/src/modules/chat/actions/types.jsx
index c20880fc..e5db0ac2 100644
--- a/src/modules/chat/actions/types.jsx
+++ b/src/modules/chat/actions/types.jsx
@@ -312,7 +312,7 @@ export const whisper = {
// ============================================================================
// Gift Subscription
// ============================================================================
-
+/*
export const gift_sub = {
presets: [{
appearance: {
@@ -334,4 +334,4 @@ export const gift_sub = {
Woop woop.
);
}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx
index d515bd25..2d86e5d1 100644
--- a/src/modules/chat/tokenizers.jsx
+++ b/src/modules/chat/tokenizers.jsx
@@ -631,7 +631,8 @@ const render_emote = (token, createElement, wrapped) => {
'data-a-target': 'emote-name',
'data-provider': token.provider,
'data-id': token.id,
- 'data-set': token.set
+ 'data-set': token.set,
+ 'data-modifiers': ml ? mods.map(x => x.id).join(' ') : null
}
}, [emote, mods.map(x => createElement('span', {key: x.text}, render_emote(x, createElement, true)))])
}
@@ -679,10 +680,11 @@ export const AddonEmotes = {
data-provider={token.provider}
data-id={token.id}
data-set={token.set}
+ data-modifiers={ml ? mods.map(x => x.id).join(' ') : null}
onClick={this.emotes.handleClick}
>
{emote}
- {mods.map(t => {this.tokenizers.emote.render.call(this, t, createElement)})}
+ {mods.map(t => {this.tokenizers.emote.render.call(this, t, createElement, true)})}
);
},
@@ -701,7 +703,7 @@ export const AddonEmotes = {
emote = emote_set && emote_set.emotes[emote_id];
if ( emote )
- return (
+ return (
{this.tokenizers.emote.render.call(this, emote.token, createElement)}
{` - ${emote.hidden ? '???' : emote.name}`}
);
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/index.js b/src/sites/twitch-twilight/modules/css_tweaks/index.js
index 583cbf63..7b4ecf06 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/index.js
+++ b/src/sites/twitch-twilight/modules/css_tweaks/index.js
@@ -24,13 +24,13 @@ const CLASSES = {
'player-ext': '.player .extension-taskbar,.player .extension-container',
'player-ext-hover': '.player:not([data-controls="true"]) .extension-container',
- 'player-event-bar': '.channel-page .live-event-banner-ui__header',
- 'player-rerun-bar': '.channel-page div.tw-c-text-overlay:not([data-a-target="hosting-ui-header"])',
+ 'player-event-bar': '.channel-root .live-event-banner-ui__header',
+ 'player-rerun-bar': '.channel-root div.tw-c-text-overlay:not([data-a-target="hosting-ui-header"])',
'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',
+ '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',
'profile-hover': '.preview-card .tw-relative:hover .ffz-channel-avatar',
};