From 829ebb87e7967c918a2cb32012889265b630f0ee Mon Sep 17 00:00:00 2001 From: Namyts <35004248+Namyts@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:09:46 +0100 Subject: [PATCH] more formatting reverts --- .../MetaDetails/StreamsList/Stream/Stream.js | 12 +- .../MetaDetails/StreamsList/StreamsList.js | 180 +++++++++--------- 2 files changed, 91 insertions(+), 101 deletions(-) diff --git a/src/routes/MetaDetails/StreamsList/Stream/Stream.js b/src/routes/MetaDetails/StreamsList/Stream/Stream.js index e4676c676..3f6b24483 100644 --- a/src/routes/MetaDetails/StreamsList/Stream/Stream.js +++ b/src/routes/MetaDetails/StreamsList/Stream/Stream.js @@ -107,9 +107,7 @@ const Stream = ({ className, videoId, videoReleased, addonName, name, descriptio if (typeof props.onClick === 'function') { props.onClick(event); } - }, - [props.onClick, profile.settings, markVideoAsWatched] - ); + }, [props.onClick, profile.settings, markVideoAsWatched]); const copyMagneticLinkToClipboard = React.useCallback((event) => { event.preventDefault(); @@ -223,11 +221,11 @@ Stream.propTypes = { android: PropTypes.string, windows: PropTypes.string, macos: PropTypes.string, - linux: PropTypes.string, - }), - }), + linux: PropTypes.string + }) + }) }), - onClick: PropTypes.func, + onClick: PropTypes.func }; module.exports = Stream; diff --git a/src/routes/MetaDetails/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js index 9c8cd1c43..f932ea0ee 100644 --- a/src/routes/MetaDetails/StreamsList/StreamsList.js +++ b/src/routes/MetaDetails/StreamsList/StreamsList.js @@ -37,25 +37,25 @@ const StreamsList = ({ className, video, ...props }) => { core.transport.analytics({ event: 'StreamClicked', args: { - stream, - }, + stream + } }); }, - addonName: streams.addon.manifest.name, - })), + addonName: streams.addon.manifest.name + })) }; return streamsByAddon; }, {}); }, [props.streams]); const filteredStreams = React.useMemo(() => { - return selectedAddon === ALL_ADDONS_KEY - ? Object.values(streamsByAddon) - .map(({ streams }) => streams) - .flat(1) - : streamsByAddon[selectedAddon] - ? streamsByAddon[selectedAddon].streams - : []; + return selectedAddon === ALL_ADDONS_KEY ? + Object.values(streamsByAddon).map(({ streams }) => streams).flat(1) + : + streamsByAddon[selectedAddon] ? + streamsByAddon[selectedAddon].streams + : + []; }, [streamsByAddon, selectedAddon]); const selectableOptions = React.useMemo(() => { return { @@ -64,105 +64,97 @@ const StreamsList = ({ className, video, ...props }) => { { value: ALL_ADDONS_KEY, label: t('ALL_ADDONS'), - title: t('ALL_ADDONS'), + title: t('ALL_ADDONS') }, ...Object.keys(streamsByAddon).map((transportUrl) => ({ value: transportUrl, label: streamsByAddon[transportUrl].addon.manifest.name, title: streamsByAddon[transportUrl].addon.manifest.name, - })), + })) ], selected: [selectedAddon], - onSelect: onAddonSelected, + onSelect: onAddonSelected }; }, [streamsByAddon, selectedAddon]); return (
- {props.streams.length === 0 ? ( -
- {' -
- No addons were requested for streams! + { + props.streams.length === 0 ? +
+ {' +
No addons were requested for streams!
-
- ) : props.streams.every((streams) => streams.content.type === 'Err') ? ( -
- {' -
{t('NO_STREAM')}
-
- ) : filteredStreams.length === 0 ? ( -
- - -
- ) : ( - - {countLoadingAddons > 0 ? ( -
-
- {countLoadingAddons} {t('MOBILE_ADDONS_LOADING')} -
- + : + props.streams.every((streams) => streams.content.type === 'Err') ? +
+ {' +
{t('NO_STREAM')}
- ) : null} -
- {video ? ( + : + filteredStreams.length === 0 ? +
+ + +
+ : - -
- {`S${video?.season}E${video?.episode} ${video?.title}`} + { + countLoadingAddons > 0 ? +
+
+ {countLoadingAddons} {t('MOBILE_ADDONS_LOADING')} +
+ +
+ : + null + } +
+ { + video ? + + +
+ {`S${video?.season}E${video?.episode} ${(video?.title)}`} +
+
+ : + null + } + { + Object.keys(streamsByAddon).length > 1 ? + + : + null + } +
+
+ {filteredStreams.map((stream, index) => ( + + ))}
- ) : null} - {Object.keys(streamsByAddon).length > 1 ? ( - - ) : null} -
-
- {filteredStreams.map((stream, index) => ( - - ))} -
-
- )} -
); @@ -171,7 +163,7 @@ const StreamsList = ({ className, video, ...props }) => { StreamsList.propTypes = { className: PropTypes.string, streams: PropTypes.arrayOf(PropTypes.object).isRequired, - video: PropTypes.object, + video: PropTypes.object }; module.exports = StreamsList;