diff --git a/package.json b/package.json index d41c58da..6bdbe93f 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.72.0", + "version": "4.72.1", "description": "FrankerFaceZ is a Twitch enhancement suite.", "private": true, "license": "Apache-2.0", diff --git a/src/modules/metadata.tsx b/src/modules/metadata.tsx index c87c363f..e378fd7e 100644 --- a/src/modules/metadata.tsx +++ b/src/modules/metadata.tsx @@ -73,7 +73,7 @@ export type MetadataState = { getViewerCount: () => number; /** Get the broadcast ID of the current live broadcast, assuming the current channel is live. */ - getBroadcastID: () => string | null; + getBroadcastID: () => Promise | null; /** Get the currently logged in user's relationship with the current channel. */ // TODO: Types @@ -405,7 +405,7 @@ export default class Metadata extends Module { // We need the as any here because TypeScript's devs don't // live with the rest of us in the real world. navigator?.permissions?.query?.({name: 'clipboard-write' as PermissionName}).then(perm => perm?.state).catch(() => null), - data.getBroadcastID() + data.getBroadcastID()?.catch(err => null) ]); if ( ! broadcast_id ) return (
diff --git a/src/sites/twitch-twilight/index.js b/src/sites/twitch-twilight/index.js index 3884e1c2..35259ff4 100644 --- a/src/sites/twitch-twilight/index.js +++ b/src/sites/twitch-twilight/index.js @@ -405,7 +405,7 @@ Twilight.DASH_ROUTES = { Twilight.ROUTES = { 'front-page': '/', - 'collection': '/collections/:collectionID', + 'collection': '/directory/collection/:collectionID', 'dir': '/directory', //'dir-community': '/communities/:communityName', //'dir-community-index': '/directory/communities', diff --git a/styles/native/checkbox.scss b/styles/native/checkbox.scss index 1bc924b4..95d57ca5 100644 --- a/styles/native/checkbox.scss +++ b/styles/native/checkbox.scss @@ -27,7 +27,7 @@ &:hover:checked, &:hover:indeterminate { & + .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 { &:before { 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 { @@ -71,7 +71,7 @@ } &[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); } } @@ -86,7 +86,7 @@ position: relative; &: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: var(--border-radius-small); left: 0; @@ -106,7 +106,7 @@ } .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 { @@ -114,7 +114,7 @@ &:checked + .ffz-checkbox__label { &:before { 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 { @@ -125,14 +125,14 @@ &:hover:checked, &:indeterminate { & + .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 { &:before { 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 { @@ -153,7 +153,7 @@ } &[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); } } @@ -163,7 +163,7 @@ &:before { 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 { @@ -202,7 +202,7 @@ } &[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); } } @@ -216,7 +216,7 @@ position: relative; &: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%; left: 0; position: absolute; @@ -236,7 +236,7 @@ } .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 @@ -265,4 +265,4 @@ .ffz-segmented-button-option__input--radio:focus+.ffz-segmented-button-option__label, .ffz-toggle__input:focus+.ffz-toggle__button { outline: 5px solid Highlight; -} \ No newline at end of file +} diff --git a/styles/native/text.scss b/styles/native/text.scss index a3984d87..03bdc567 100644 --- a/styles/native/text.scss +++ b/styles/native/text.scss @@ -12,7 +12,7 @@ -moz-appearance: none; -webkit-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); line-height: 1.5; @@ -71,7 +71,7 @@ &:focus, &:focus:hover { 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; } } @@ -80,7 +80,7 @@ box-shadow: var(--shadow-input-error); &, &: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 { background-color: var(--color-background-input-overlay); 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); &:hover { 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 { background-color: var(--color-background-input-overlay-focus); 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, @@ -117,11 +117,11 @@ &.ffz-input--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); &: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); } } @@ -169,7 +169,7 @@ 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); cursor: pointer; line-height: 1.5; @@ -196,7 +196,7 @@ &[data-focus-visible-added] { &, & option { 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; -webkit-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); padding: .5rem 1rem; resize: vertical; @@ -231,7 +231,7 @@ box-shadow: var(--shadow-input-error); &,&: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 { @@ -242,4 +242,4 @@ &--no-resize { resize: none; } -} \ No newline at end of file +}