oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-06 14:20:56 +00:00
Code Wiki Activity

4.72.1

Browse source 
* Fixed: Catch the error when we are unable to obtain a video ID for the current broadcast, and show a proper error message instead of what we're doing now. The feature is still not working due to Twitch server issues. (Closes #1505)
* Fixed: The appearance of checkboxes and text boxes in the FFZ Control Center was incorrect due to Twitch CSS changes.
* Fixed: Update the URL for collections for profile rules.
This commit is contained in:
SirStendec 2024-06-13 14:51:42 -04:00
parent 38e557e809
commit 340551dc83
5 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "frankerfacez", "name": "frankerfacez",
"author": "Dan Salvato LLC", "author": "Dan Salvato LLC",
"version": "4.72.0", "version": "4.72.1",
"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",

4
src/modules/metadata.tsx
View file

@ -73,7 +73,7 @@ export type MetadataState = {
getViewerCount: () => number; getViewerCount: () => number;
/** Get the broadcast ID of the current live broadcast, assuming the current channel is live. */ /** Get the broadcast ID of the current live broadcast, assuming the current channel is live. */
getBroadcastID: () => string | null; getBroadcastID: () => Promise<string | null> | null;
/** Get the currently logged in user's relationship with the current channel. */ /** Get the currently logged in user's relationship with the current channel. */
// TODO: Types // TODO: Types
@ -405,7 +405,7 @@ export default class Metadata extends Module {
// We need the as any here because TypeScript's devs don't // We need the as any here because TypeScript's devs don't
// live with the rest of us in the real world. // live with the rest of us in the real world.
navigator?.permissions?.query?.({name: 'clipboard-write' as PermissionName}).then(perm => perm?.state).catch(() => null), navigator?.permissions?.query?.({name: 'clipboard-write' as PermissionName}).then(perm => perm?.state).catch(() => null),
data.getBroadcastID() data.getBroadcastID()?.catch(err => null)
]); ]);
if ( ! broadcast_id ) if ( ! broadcast_id )
return (<div> return (<div>

2
src/sites/twitch-twilight/index.js
View file

@ -405,7 +405,7 @@ Twilight.DASH_ROUTES = {
Twilight.ROUTES = { Twilight.ROUTES = {
'front-page': '/', 'front-page': '/',
'collection': '/collections/:collectionID', 'collection': '/directory/collection/:collectionID',
'dir': '/directory', 'dir': '/directory',
//'dir-community': '/communities/:communityName', //'dir-community': '/communities/:communityName',
//'dir-community-index': '/directory/communities', //'dir-community-index': '/directory/communities',

26
styles/native/checkbox.scss
View file

@ -27,7 +27,7 @@
&:hover:checked, &:hover:checked,
&:hover:indeterminate { &:hover:indeterminate {
& + .ffz-checkbox__label:before { & + .ffz-checkbox__label:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox-checked); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-checked);
} }
} }
@ -36,7 +36,7 @@
& + .ffz-checkbox__label { & + .ffz-checkbox__label {
&:before { &:before {
background-color: var(--color-background-input-checkbox-checked-background); background-color: var(--color-background-input-checkbox-checked-background);
border: var(--border-width-input) solid var(--color-border-input-checkbox-checked); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-checked);
} }
&:after { &:after {
@ -71,7 +71,7 @@
} }
&[data-focus-visible-added] + .ffz-checkbox__label:before { &[data-focus-visible-added] + .ffz-checkbox__label:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox-focus); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-focus);
box-shadow: var(--shadow-input-focus); box-shadow: var(--shadow-input-focus);
} }
} }
@ -86,7 +86,7 @@
position: relative; position: relative;
&:before { &:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox);
border-radius: .2rem; border-radius: .2rem;
border-radius: var(--border-radius-small); border-radius: var(--border-radius-small);
left: 0; left: 0;
@ -106,7 +106,7 @@
} }
.ffz-checkbox--error .ffz-checkbox__label:before { .ffz-checkbox--error .ffz-checkbox__label:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox-error); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-error);
} }
.ffz-checkbox--overlay { .ffz-checkbox--overlay {
@ -114,7 +114,7 @@
&:checked + .ffz-checkbox__label { &:checked + .ffz-checkbox__label {
&:before { &:before {
background-color: var(--color-background-input-checkbox-checked-background-overlay); background-color: var(--color-background-input-checkbox-checked-background-overlay);
border: var(--border-width-input) solid var(--color-border-input-checkbox-checked-overlay); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-checked-overlay);
} }
&:after { &:after {
@ -125,14 +125,14 @@
&:hover:checked, &:hover:checked,
&:indeterminate { &:indeterminate {
& + .ffz-checkbox__label:before { & + .ffz-checkbox__label:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox-checked-overlay); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-checked-overlay);
} }
} }
&:indeterminate + .ffz-checkbox__label { &:indeterminate + .ffz-checkbox__label {
&:before { &:before {
background-color: var(--color-background-input-checkbox-checked-background-overlay); background-color: var(--color-background-input-checkbox-checked-background-overlay);
border: var(--border-width-input) solid var(--color-border-input-checkbox-checked-overlay); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-checked-overlay);
} }
&:after { &:after {
@ -153,7 +153,7 @@
} }
&[data-focus-visible-added] + .ffz-checkbox__label:before { &[data-focus-visible-added] + .ffz-checkbox__label:before {
border: var(--border-width-input) solid var(--color-border-input-overlay-focus); border: var(--border-width-checkbox) solid var(--color-border-input-overlay-focus);
box-shadow: 0 0 6px 0 var(--color-border-input-overlay-focus); box-shadow: 0 0 6px 0 var(--color-border-input-overlay-focus);
} }
} }
@ -163,7 +163,7 @@
&:before { &:before {
background-color: var(--color-background-input-overlay); background-color: var(--color-background-input-overlay);
border: var(--border-width-input) solid var(--color-border-input-checkbox-overlay); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-overlay);
} }
&:hover:before { &:hover:before {
@ -202,7 +202,7 @@
} }
&[data-focus-visible-added] + .ffz-radio__label:before { &[data-focus-visible-added] + .ffz-radio__label:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox-focus); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-focus);
box-shadow: var(--shadow-input-focus); box-shadow: var(--shadow-input-focus);
} }
} }
@ -216,7 +216,7 @@
position: relative; position: relative;
&:before { &:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox);
border-radius: 50%; border-radius: 50%;
left: 0; left: 0;
position: absolute; position: absolute;
@ -236,7 +236,7 @@
} }
.ffz-radio--error .ffz-radio__label:before { .ffz-radio--error .ffz-radio__label:before {
border: var(--border-width-input) solid var(--color-border-input-checkbox-error); border: var(--border-width-checkbox) solid var(--color-border-input-checkbox-error);
} }
// TODO: radio overlay // TODO: radio overlay

24
styles/native/text.scss
View file

@ -12,7 +12,7 @@
-moz-appearance: none; -moz-appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
appearance: none; appearance: none;
border: var(--border-width-input) solid var(--color-border-input); border: var(--input-border-width-default) solid var(--color-border-input);
color: var(--color-text-input); color: var(--color-text-input);
line-height: 1.5; line-height: 1.5;
@ -71,7 +71,7 @@
&:focus, &:focus:hover { &:focus, &:focus:hover {
background-color: var(--color-background-input-focus); background-color: var(--color-background-input-focus);
border: var(--border-width-input) solid var(--color-border-input-focus); border: var(--input-border-width-default) solid var(--color-border-input-focus);
outline: 0; outline: 0;
} }
} }
@ -80,7 +80,7 @@
box-shadow: var(--shadow-input-error); box-shadow: var(--shadow-input-error);
&, &:focus { &, &:focus {
border: var(--border-width-input) solid var(--color-border-input-error); border: var(--input-border-width-default) solid var(--color-border-input-error);
} }
} }
@ -94,18 +94,18 @@
.ffz-textarea--overlay { .ffz-textarea--overlay {
background-color: var(--color-background-input-overlay); background-color: var(--color-background-input-overlay);
border: none; border: none;
box-shadow: inset 0 0 0 var(--border-width-input) var(--color-border-input-overlay); box-shadow: inset 0 0 0 var(--input-border-width-default) var(--color-border-input-overlay);
color: var(--color-text-overlay); color: var(--color-text-overlay);
&:hover { &:hover {
background-color: var(--color-background-input-overlay); background-color: var(--color-background-input-overlay);
box-shadow: inset 0 0 0 var(--border-width-input) var(--color-border-input-overlay-hover); box-shadow: inset 0 0 0 var(--input-border-width-default) var(--color-border-input-overlay-hover);
} }
&:focus, &:focus:hover { &:focus, &:focus:hover {
background-color: var(--color-background-input-overlay-focus); background-color: var(--color-background-input-overlay-focus);
border: none; border: none;
box-shadow: inset 0 0 0 var(--border-width-input) var(--color-border-input-overlay-focus); box-shadow: inset 0 0 0 var(--input-border-width-default) var(--color-border-input-overlay-focus);
} }
//&::-webkit-input-placeholder, //&::-webkit-input-placeholder,
@ -117,11 +117,11 @@
&.ffz-input--error, &.ffz-input--error,
&.ffz-select--error { &.ffz-select--error {
border: var(--border-width-input) solid var(--color-border-input-error); border: var(--input-border-width-default) solid var(--color-border-input-error);
box-shadow: var(--shadow-input-error); box-shadow: var(--shadow-input-error);
&:focus { &:focus {
border: var(--border-width-input) solid var(--color-border-input-error); border: var(--input-border-width-default) solid var(--color-border-input-error);
box-shadow: var(--shadow-input-error-focus); box-shadow: var(--shadow-input-error-focus);
} }
} }
@ -169,7 +169,7 @@
background-size: 2rem; background-size: 2rem;
} }
border: var(--border-width-input) solid var(--color-border-input); border: var(--input-border-width-default) solid var(--color-border-input);
color: var(--color-text-input); color: var(--color-text-input);
cursor: pointer; cursor: pointer;
line-height: 1.5; line-height: 1.5;
@ -196,7 +196,7 @@
&[data-focus-visible-added] { &[data-focus-visible-added] {
&, & option { &, & option {
background-color: var(--color-background-input-overlay-focus); background-color: var(--color-background-input-overlay-focus);
box-shadow: inset 0 0 0 var(--border-width-input) var(--color-border-input-overlay-focus); box-shadow: inset 0 0 0 var(--input-border-width-default) var(--color-border-input-overlay-focus);
} }
} }
} }
@ -217,7 +217,7 @@
-ms-overflow-style: none; -ms-overflow-style: none;
-webkit-appearance: none; -webkit-appearance: none;
appearance: none; appearance: none;
border: var(--border-width-input) solid var(--color-border-input); border: var(--input-border-width-default) solid var(--color-border-input);
color: var(--color-text-input); color: var(--color-text-input);
padding: .5rem 1rem; padding: .5rem 1rem;
resize: vertical; resize: vertical;
@ -231,7 +231,7 @@
box-shadow: var(--shadow-input-error); box-shadow: var(--shadow-input-error);
&,&:focus { &,&:focus {
border: var(--border-width-input) solid var(--color-border-input-error); border: var(--input-border-width-default) solid var(--color-border-input-error);
} }
&:focus { &:focus {