1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00
* Fixed: Chat not appearing correctly when using the Separator appearance options.
* API Added: Channel-specific emote sets can set a `title_is_channel` flag to have the FFZ emote menu automatically rename the emote set to show the source channel's name when using Shared Chat.
This commit is contained in:
SirStendec 2024-10-24 14:37:17 -04:00
parent 7499f308a6
commit ef7e91f82b
8 changed files with 23 additions and 18 deletions

View file

@ -1,7 +1,7 @@
{ {
"name": "frankerfacez", "name": "frankerfacez",
"author": "Dan Salvato LLC", "author": "Dan Salvato LLC",
"version": "4.75.4", "version": "4.75.5",
"description": "FrankerFaceZ is a Twitch enhancement suite.", "description": "FrankerFaceZ is a Twitch enhancement suite.",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",

View file

@ -1644,9 +1644,9 @@ export default class Emotes extends Module {
const out = [], seen = new Set; const out = [], seen = new Set;
this._withSources(out, seen, room.emote_sets); this._withSources(out, seen, room.emote_sets, room.id);
if ( room_user ) if ( room_user )
this._withSources(out, seen, room_user.emote_sets); this._withSources(out, seen, room_user.emote_sets, room.id);
// Shared Chats // Shared Chats
if ( room?.shared_chats?.size > 0 ) if ( room?.shared_chats?.size > 0 )

View file

@ -416,6 +416,11 @@ Twilight.ROUTES = {
'front-page': '/', 'front-page': '/',
'collection': '/directory/collection/:collectionID', 'collection': '/directory/collection/:collectionID',
'dir': '/directory', 'dir': '/directory',
'dir-gaming': '/directory/gaming',
'dir-irl': '/directory/irl',
'dir-music': '/directory/music',
'dir-creative': '/directory/creative',
'dir-esports': '/directory/esports',
//'dir-community': '/communities/:communityName', //'dir-community': '/communities/:communityName',
//'dir-community-index': '/directory/communities', //'dir-community-index': '/directory/communities',
//'dir-creative': '/directory/creative', //'dir-creative': '/directory/creative',

View file

@ -2368,7 +2368,7 @@ export default class EmoteMenu extends Module {
continue; continue;
seen_sets.add(emote_set); seen_sets.add(emote_set);
const section = this.processFFZSet(emote_set, provider, favorites, seen_favorites, grouped_sets, false, undefined, source_id); const section = this.processFFZSet(emote_set, provider, favorites, seen_favorites, grouped_sets, false, undefined, source_id, props.channel_id);
if ( section ) { if ( section ) {
section.emotes.sort(sort_emotes); section.emotes.sort(sort_emotes);
@ -2466,7 +2466,7 @@ export default class EmoteMenu extends Module {
} }
processFFZSet(emote_set, provider, favorites, seen_favorites, grouped_sets, locked = false, state, source_id) { // eslint-disable-line class-methods-use-this processFFZSet(emote_set, provider, favorites, seen_favorites, grouped_sets, locked = false, state, source_id, host_id = null) { // eslint-disable-line class-methods-use-this
if ( ! emote_set || ! emote_set.emotes ) if ( ! emote_set || ! emote_set.emotes )
return null; return null;
@ -2489,7 +2489,7 @@ export default class EmoteMenu extends Module {
pdata.name) : pdata.name) :
emote_set.source || 'FFZ', emote_set.source || 'FFZ',
title = provider === 'main' title = (provider === 'main' || emote_set.title_is_channel)
? source_name ? source_name
? t.i18n.t('emote-menu.source-set', '{channel}\'s Emotes', {channel: source_name}) ? t.i18n.t('emote-menu.source-set', '{channel}\'s Emotes', {channel: source_name})
: t.i18n.t('emote-menu.main-set', 'Channel Emotes') : t.i18n.t('emote-menu.main-set', 'Channel Emotes')
@ -2502,7 +2502,7 @@ export default class EmoteMenu extends Module {
: 0; : 0;
// Shared Chat emote sets always come after. // Shared Chat emote sets always come after.
if (source_id) if (source_id && source_id !== host_id)
sort_key += 50; sort_key += 50;
let section, emotes, locks; let section, emotes, locks;

View file

@ -21,9 +21,9 @@
border-bottom-color: rgba(255,255,255,0.1); border-bottom-color: rgba(255,255,255,0.1);
} }
&:first-child { /*&:first-child {
border-top-color: transparent !important; border-top-color: transparent !important;
} }*/
} }
.vod-message { .vod-message {

View file

@ -18,9 +18,9 @@
border-bottom-color: #000; border-bottom-color: #000;
} }
&:first-child { /*&:first-child {
border-top-color: transparent !important; border-top-color: transparent !important;
} }*/
} }
.vod-message { .vod-message {
@ -47,4 +47,4 @@
& > .tw-pd-y-05 { & > .tw-pd-y-05 {
padding-top: calc(.5rem - 1px) !important; padding-top: calc(.5rem - 1px) !important;
} }
} }

View file

@ -11,9 +11,9 @@
padding-top: calc(.5rem - 1px) !important; padding-top: calc(.5rem - 1px) !important;
border-top: 1px solid var(--ffz-border-color); border-top: 1px solid var(--ffz-border-color);
&:first-child { /*&:first-child {
border-top-color: transparent !important; border-top-color: transparent !important;
} }*/
} }
.vod-message { .vod-message {
@ -33,4 +33,4 @@
& > .tw-pd-y-05 { & > .tw-pd-y-05 {
padding-top: calc(.5rem - 1px) !important; padding-top: calc(.5rem - 1px) !important;
} }
} }

View file

@ -11,9 +11,9 @@
padding-bottom: calc(.5rem - 1px) !important; padding-bottom: calc(.5rem - 1px) !important;
border-bottom: 1px solid var(--ffz-border-color); border-bottom: 1px solid var(--ffz-border-color);
&:last-child:nth-child(odd) { /*&:last-child:nth-child(odd) {
border-bottom-color: transparent !important; border-bottom-color: transparent !important;
} }*/
} }
.vod-message { .vod-message {
@ -33,4 +33,4 @@
& > .tw-pd-y-05 { & > .tw-pd-y-05 {
padding-bottom: calc(.5rem - 1px) !important; padding-bottom: calc(.5rem - 1px) !important;
} }
} }