{
- upcoming ?
+ upcoming && !watched ?
@@ -171,7 +168,7 @@ const Video = ({ className, id, title, thumbnail, episode, released, upcoming, w
watched={watched}
progress={progress}
scheduled={scheduled}
- href={href}
+ onClick={videoButtonOnClick}
{...props}
onMouseUp={popupLabelOnMouseUp}
onLongPress={popupLabelOnLongPress}
diff --git a/src/routes/MetaDetails/VideosList/styles.less b/src/routes/MetaDetails/VideosList/styles.less
index 40146c289..e1b2215ae 100644
--- a/src/routes/MetaDetails/VideosList/styles.less
+++ b/src/routes/MetaDetails/VideosList/styles.less
@@ -74,5 +74,9 @@
@media only screen and (max-width: @minimum) {
.videos-list-container {
overflow: visible;
+
+ .videos-container {
+ overflow: auto;
+ }
}
}
\ No newline at end of file
diff --git a/src/routes/MetaDetails/useMetaDetails.d.ts b/src/routes/MetaDetails/useMetaDetails.d.ts
index 5146bed99..e2215194c 100644
--- a/src/routes/MetaDetails/useMetaDetails.d.ts
+++ b/src/routes/MetaDetails/useMetaDetails.d.ts
@@ -1,2 +1,2 @@
declare const useMetaDetails: (urlParams: UrlParams) => MetaDetails;
-export = useMetaDetails;
\ No newline at end of file
+export = useMetaDetails;
diff --git a/src/routes/Player/OptionsMenu/OptionsMenu.js b/src/routes/Player/OptionsMenu/OptionsMenu.js
index 6c50e1551..11738cb3e 100644
--- a/src/routes/Player/OptionsMenu/OptionsMenu.js
+++ b/src/routes/Player/OptionsMenu/OptionsMenu.js
@@ -4,7 +4,7 @@ const React = require('react');
const PropTypes = require('prop-types');
const classnames = require('classnames');
const { useTranslation } = require('react-i18next');
-const { useToast } = require('stremio/common');
+const { usePlatform, useToast } = require('stremio/common');
const { useServices } = require('stremio/services');
const Option = require('./Option');
const styles = require('./styles');
@@ -12,6 +12,7 @@ const styles = require('./styles');
const OptionsMenu = ({ className, stream, playbackDevices }) => {
const { t } = useTranslation();
const { core } = useServices();
+ const platform = usePlatform();
const toast = useToast();
const [streamingUrl, downloadUrl] = React.useMemo(() => {
return stream !== null ?
@@ -48,7 +49,7 @@ const OptionsMenu = ({ className, stream, playbackDevices }) => {
}, [streamingUrl, downloadUrl]);
const onDownloadVideoButtonClick = React.useCallback(() => {
if (streamingUrl || downloadUrl) {
- window.open(streamingUrl || downloadUrl);
+ platform.openExternal(streamingUrl || downloadUrl);
}
}, [streamingUrl, downloadUrl]);
const onExternalDeviceRequested = React.useCallback((deviceId) => {
diff --git a/src/routes/Player/usePlayer.d.ts b/src/routes/Player/usePlayer.d.ts
index 256424dd4..6f9586099 100644
--- a/src/routes/Player/usePlayer.d.ts
+++ b/src/routes/Player/usePlayer.d.ts
@@ -1,2 +1,2 @@
declare const usePlayer: (urlParams: UrlParams) => [Player, (videoParams: { hash: string | null, size: number | null, filename: string | null }) => void, (time: number, duration: number, device: string) => void, (time: number, duration: number, device: string) => void, (paused: boolean) => void, () => void, () => void,];
-export = usePlayer;
\ No newline at end of file
+export = usePlayer;
diff --git a/src/routes/Player/useSettings.d.ts b/src/routes/Player/useSettings.d.ts
index 688445b1f..e3daf32cd 100644
--- a/src/routes/Player/useSettings.d.ts
+++ b/src/routes/Player/useSettings.d.ts
@@ -1,2 +1,2 @@
declare const useSettings: () => [Settings, (settings: any) => void];
-export = useSettings;
\ No newline at end of file
+export = useSettings;
diff --git a/src/routes/Search/useSearch.d.ts b/src/routes/Search/useSearch.d.ts
index 156cacbbf..dd8e77ef6 100644
--- a/src/routes/Search/useSearch.d.ts
+++ b/src/routes/Search/useSearch.d.ts
@@ -1,2 +1,2 @@
declare const useSearch: (searchParams: URLSearchParams) => [Search, (range: number) => void];
-export = useSearch;
\ No newline at end of file
+export = useSearch;
diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
index 071f14d0e..2ed0a1ab7 100644
--- a/src/routes/Settings/Settings.js
+++ b/src/routes/Settings/Settings.js
@@ -7,7 +7,7 @@ const { useTranslation } = require('react-i18next');
const { default: Icon } = require('@stremio/stremio-icons/react');
const { useRouteFocused } = require('stremio-router');
const { useServices } = require('stremio/services');
-const { Button, Checkbox, MainNavBars, Multiselect, ColorInput, TextInput, ModalDialog, useProfile, useStreamingServer, useBinaryState, withCoreSuspender, useToast } = require('stremio/common');
+const { Button, Checkbox, MainNavBars, Multiselect, ColorInput, TextInput, ModalDialog, useProfile, usePlatform, useStreamingServer, useBinaryState, withCoreSuspender, useToast } = require('stremio/common');
const useProfileSettingsInputs = require('./useProfileSettingsInputs');
const useStreamingServerSettingsInputs = require('./useStreamingServerSettingsInputs');
const useDataExport = require('./useDataExport');
@@ -25,6 +25,7 @@ const Settings = () => {
const profile = useProfile();
const [dataExport, loadDataExport] = useDataExport();
const streamingServer = useStreamingServer();
+ const platform = usePlatform();
const toast = useToast();
const {
interfaceLanguageSelect,
@@ -90,7 +91,7 @@ const Settings = () => {
}, []);
const toggleTraktOnClick = React.useCallback(() => {
if (!isTraktAuthenticated && profile.auth !== null && profile.auth.user !== null && typeof profile.auth.user._id === 'string') {
- window.open(`https://www.strem.io/trakt/auth/${profile.auth.user._id}`);
+ platform.openExternal(`https://www.strem.io/trakt/auth/${profile.auth.user._id}`);
setTraktAuthStarted(true);
} else {
core.transport.dispatch({
@@ -102,15 +103,18 @@ const Settings = () => {
}
}, [isTraktAuthenticated, profile.auth]);
const subscribeCalendarOnClick = React.useCallback(() => {
- const url = `webcal://www.strem.io/calendar/${profile.auth.user._id}.ics`;
- window.open(url);
+ if (!profile.auth) return;
+
+ const protocol = platform.name === 'ios' ? 'webcal' : 'https';
+ const url = `${protocol}://www.strem.io/calendar/${profile.auth.user._id}.ics`;
+ platform.openExternal(url);
toast.show({
type: 'success',
- title: 'Calendar has been added to your default caldendar app',
+ title: platform.name === 'ios' ? t('SETTINGS_SUBSCRIBE_CALENDAR_IOS_TOAST') : t('SETTINGS_SUBSCRIBE_CALENDAR_TOAST'),
timeout: 25000
});
- //Stremio 4 emits not documented event subscribeCalendar
- }, []);
+ // Stremio 4 emits not documented event subscribeCalendar
+ }, [profile.auth]);
const exportDataOnClick = React.useCallback(() => {
loadDataExport();
}, []);
@@ -181,7 +185,7 @@ const Settings = () => {
}, [isTraktAuthenticated, traktAuthStarted]);
React.useEffect(() => {
if (dataExport.exportUrl !== null && typeof dataExport.exportUrl === 'string') {
- window.open(dataExport.exportUrl);
+ platform.openExternal(dataExport.exportUrl);
}
}, [dataExport.exportUrl]);
React.useLayoutEffect(() => {
@@ -261,9 +265,14 @@ const Settings = () => {
-
+ {
+ profile.auth ?
+
+ :
+ null
+ }
{
profile.auth !== null && profile.auth.user !== null && typeof profile.auth.user._id === 'string' ?
diff --git a/src/routes/Settings/useProfileSettingsInputs.js b/src/routes/Settings/useProfileSettingsInputs.js
index 939e5e7cf..a90d0d483 100644
--- a/src/routes/Settings/useProfileSettingsInputs.js
+++ b/src/routes/Settings/useProfileSettingsInputs.js
@@ -3,11 +3,12 @@
const React = require('react');
const { useTranslation } = require('react-i18next');
const { useServices } = require('stremio/services');
-const { CONSTANTS, interfaceLanguages, languageNames, platform } = require('stremio/common');
+const { CONSTANTS, usePlatform, interfaceLanguages, languageNames } = require('stremio/common');
const useProfileSettingsInputs = (profile) => {
const { t } = useTranslation();
const { core } = useServices();
+ const platform = usePlatform();
// TODO combine those useMemo in one
const interfaceLanguageSelect = React.useMemo(() => ({
options: interfaceLanguages.map(({ name, codes }) => ({
diff --git a/src/routes/Settings/useStreamingServerSettingsInputs.js b/src/routes/Settings/useStreamingServerSettingsInputs.js
index 32fb971a5..1d4eee066 100644
--- a/src/routes/Settings/useStreamingServerSettingsInputs.js
+++ b/src/routes/Settings/useStreamingServerSettingsInputs.js
@@ -70,7 +70,7 @@ const useStreamingServerSettingsInputs = (streamingServer) => {
options: [
{
label: t('SETTINGS_DISABLED'),
- value: null,
+ value: '',
},
...streamingServer.networkInfo.content.availableInterfaces.map((address) => ({
label: address,
diff --git a/src/services/Core/Core.d.ts b/src/services/Core/Core.d.ts
index e9cfdef5b..ab03f3b1d 100644
--- a/src/services/Core/Core.d.ts
+++ b/src/services/Core/Core.d.ts
@@ -1,2 +1,2 @@
declare function Core(): Core;
-export = Core;
\ No newline at end of file
+export = Core;
diff --git a/src/services/Core/CoreTransport.d.ts b/src/services/Core/CoreTransport.d.ts
index ef9b606ca..8a58f7451 100644
--- a/src/services/Core/CoreTransport.d.ts
+++ b/src/services/Core/CoreTransport.d.ts
@@ -1,2 +1,2 @@
declare function CoreTransport(): CoreTransport;
-export = CoreTransport;
\ No newline at end of file
+export = CoreTransport;
diff --git a/src/services/Core/globals.d.ts b/src/services/Core/globals.d.ts
index ca2680a0e..dd7e39e4b 100644
--- a/src/services/Core/globals.d.ts
+++ b/src/services/Core/globals.d.ts
@@ -9,4 +9,4 @@ declare global {
}
}
-export {};
\ No newline at end of file
+export {};
diff --git a/src/services/Core/types.d.ts b/src/services/Core/types.d.ts
index 73875adf9..7e4249ac8 100644
--- a/src/services/Core/types.d.ts
+++ b/src/services/Core/types.d.ts
@@ -25,4 +25,4 @@ interface CoreTransport {
interface Core {
active: boolean,
transport: CoreTransport,
-}
\ No newline at end of file
+}
diff --git a/src/services/DragAndDrop/DragAndDrop.js b/src/services/DragAndDrop/DragAndDrop.js
index 477362bb5..bc54e2f35 100644
--- a/src/services/DragAndDrop/DragAndDrop.js
+++ b/src/services/DragAndDrop/DragAndDrop.js
@@ -25,7 +25,7 @@ function DragAndDrop({ core }) {
args: Array.from(new Uint8Array(torrent))
}
});
- } catch (error) {
+ } catch (_error) {
events.emit('error', {
message: 'Failed to process file',
file: {
diff --git a/src/services/ServicesContext/types.d.ts b/src/services/ServicesContext/types.d.ts
index 48a599ea2..432155719 100644
--- a/src/services/ServicesContext/types.d.ts
+++ b/src/services/ServicesContext/types.d.ts
@@ -4,4 +4,4 @@ type ServicesContext = {
chromecast: any,
keyboardShortcuts: any,
dragAndDrop: any,
-};
\ No newline at end of file
+};
diff --git a/src/services/ServicesContext/useServices.d.ts b/src/services/ServicesContext/useServices.d.ts
index bd4199743..710be6d01 100644
--- a/src/services/ServicesContext/useServices.d.ts
+++ b/src/services/ServicesContext/useServices.d.ts
@@ -1,2 +1,2 @@
declare const useService: () => ServicesContext;
-export = useService;
\ No newline at end of file
+export = useService;
diff --git a/src/services/Shell/ShellTransport.js b/src/services/Shell/ShellTransport.js
index 4fba3ac08..c70e28008 100644
--- a/src/services/Shell/ShellTransport.js
+++ b/src/services/Shell/ShellTransport.js
@@ -45,6 +45,7 @@ function ShellTransport() {
this.props = {};
+ // eslint-disable-next-line @typescript-eslint/no-this-alias
const shell = this;
initialize()
.then(() => {
diff --git a/src/types/Addon.d.ts b/src/types/Addon.d.ts
index 880ff2ca8..9274dd8b7 100644
--- a/src/types/Addon.d.ts
+++ b/src/types/Addon.d.ts
@@ -17,4 +17,4 @@ type Addon = {
type AddonsDeepLinks = {
addons: string,
-};
\ No newline at end of file
+};
diff --git a/src/types/LibraryItem.d.ts b/src/types/LibraryItem.d.ts
index 69a42c8a4..4981e1191 100644
--- a/src/types/LibraryItem.d.ts
+++ b/src/types/LibraryItem.d.ts
@@ -31,4 +31,4 @@ type LibraryItemDeepLinks = {
metaDetailsStreams: string | null,
player: string | null,
externalPlayer: ExternalPlayerLinks | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/MetaItem.d.ts b/src/types/MetaItem.d.ts
index ae7e2fe55..0d692a580 100644
--- a/src/types/MetaItem.d.ts
+++ b/src/types/MetaItem.d.ts
@@ -23,10 +23,10 @@ type MetaItemPreview = {
type MetaItem = MetaItemPreview & {
videos: Video[],
-}
+};
type MetaItemDeepLinks = {
metaDetailsVideos: string | null,
metaDetailsStreams: string | null,
player: string | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/Selectable.d.ts b/src/types/Selectable.d.ts
index 36d4be598..cbabdd697 100644
--- a/src/types/Selectable.d.ts
+++ b/src/types/Selectable.d.ts
@@ -24,4 +24,4 @@ type SelectableCatalog
= {
name: string,
selected: boolean,
deepLinks: T,
-};
\ No newline at end of file
+};
diff --git a/src/types/Stream.d.ts b/src/types/Stream.d.ts
index 9d9cdebf3..2400c9725 100644
--- a/src/types/Stream.d.ts
+++ b/src/types/Stream.d.ts
@@ -15,4 +15,4 @@ type Stream = {
player: string,
externalPlayer: ExternalPlayerLinks,
},
-};
\ No newline at end of file
+};
diff --git a/src/types/Video.d.ts b/src/types/Video.d.ts
index 645fa2a4c..92bc704f5 100644
--- a/src/types/Video.d.ts
+++ b/src/types/Video.d.ts
@@ -14,4 +14,4 @@ type Video = {
episode?: number,
streams: Stream[],
trailerStreams: TrailerStream[],
-};
\ No newline at end of file
+};
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
new file mode 100644
index 000000000..5effeffd4
--- /dev/null
+++ b/src/types/global.d.ts
@@ -0,0 +1,15 @@
+/* eslint-disable no-var */
+
+interface QtTransport {
+ send: (message: string) => void,
+}
+
+interface Qt {
+ webChannelTransport: QtTransport,
+}
+
+declare global {
+ var qt: Qt | undefined;
+}
+
+export { };
diff --git a/src/types/models/Board.d.ts b/src/types/models/Board.d.ts
index f03046102..4c9445e3a 100644
--- a/src/types/models/Board.d.ts
+++ b/src/types/models/Board.d.ts
@@ -1 +1 @@
-type Board = CatalogsWithExtra;
\ No newline at end of file
+type Board = CatalogsWithExtra;
diff --git a/src/types/models/CatalogsWithExtra.d.ts b/src/types/models/CatalogsWithExtra.d.ts
index 7a8a4efad..7931dc4b7 100644
--- a/src/types/models/CatalogsWithExtra.d.ts
+++ b/src/types/models/CatalogsWithExtra.d.ts
@@ -8,4 +8,4 @@ type CatalogsWithExtra = {
type: string | null,
extra: [string, string][]
} | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/Ctx.d.ts b/src/types/models/Ctx.d.ts
index 74f770698..fbb6caee4 100644
--- a/src/types/models/Ctx.d.ts
+++ b/src/types/models/Ctx.d.ts
@@ -56,7 +56,7 @@ type NotificationItem = {
metaId: string,
videoId: string,
videoReleased: string,
-}
+};
type SearchHistoryItem = {
query: string,
@@ -71,4 +71,4 @@ type Ctx = {
profile: Profile,
notifications: Notifications,
searchHistory: SearchHistory,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/Discover.d.ts b/src/types/models/Discover.d.ts
index 7c7d8d614..5f34c124e 100644
--- a/src/types/models/Discover.d.ts
+++ b/src/types/models/Discover.d.ts
@@ -23,4 +23,4 @@ type Discover = {
selected: {
request: ResourceRequest,
} | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/InstalledAddons.d.ts b/src/types/models/InstalledAddons.d.ts
index 0bce5cff8..d31f70829 100644
--- a/src/types/models/InstalledAddons.d.ts
+++ b/src/types/models/InstalledAddons.d.ts
@@ -9,4 +9,4 @@ type InstalledAddons = {
type: string,
}
} | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/Library.d.ts b/src/types/models/Library.d.ts
index 6599c2ccf..ffb693824 100644
--- a/src/types/models/Library.d.ts
+++ b/src/types/models/Library.d.ts
@@ -26,4 +26,4 @@ type Library = {
type: string | null,
}
} | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/LocalSearch.d.ts b/src/types/models/LocalSearch.d.ts
index 9862ebcd6..720173c0c 100644
--- a/src/types/models/LocalSearch.d.ts
+++ b/src/types/models/LocalSearch.d.ts
@@ -7,4 +7,4 @@ type LocalSearchItem = {
type LocalSearch = {
items: LocalSearchItem[],
-};
\ No newline at end of file
+};
diff --git a/src/types/models/MetaDetails.d.ts b/src/types/models/MetaDetails.d.ts
index efa7efc33..c7eeafb1b 100644
--- a/src/types/models/MetaDetails.d.ts
+++ b/src/types/models/MetaDetails.d.ts
@@ -24,4 +24,4 @@ type MetaDetails = {
content: Loadable
}[],
title: string | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/Player.d.ts b/src/types/models/Player.d.ts
index 3dff6e3ec..6664e83f5 100644
--- a/src/types/models/Player.d.ts
+++ b/src/types/models/Player.d.ts
@@ -42,4 +42,4 @@ type Player = {
} | null,
subtitles: Subtitle[],
title: string | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/RemoteAddons.d.ts b/src/types/models/RemoteAddons.d.ts
index 9c046e885..d745a5f15 100644
--- a/src/types/models/RemoteAddons.d.ts
+++ b/src/types/models/RemoteAddons.d.ts
@@ -7,4 +7,4 @@ type RemoteAddons = {
selected: {
request: ResourceRequest,
} | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/models/Search.d.ts b/src/types/models/Search.d.ts
index b9c91ba67..5859b1633 100644
--- a/src/types/models/Search.d.ts
+++ b/src/types/models/Search.d.ts
@@ -1 +1 @@
-type Search = CatalogsWithExtra;
\ No newline at end of file
+type Search = CatalogsWithExtra;
diff --git a/src/types/models/StremingServer.d.ts b/src/types/models/StremingServer.d.ts
index f44563d9b..d344755d6 100644
--- a/src/types/models/StremingServer.d.ts
+++ b/src/types/models/StremingServer.d.ts
@@ -38,23 +38,23 @@ type Source = {
numFoundUniq: number,
numRequests: number,
url: string,
-}
+};
type Growler = {
flood: number,
pulse: number,
-}
+};
type PeerSearch = {
max: number,
min: number,
sources: string[],
-}
+};
type SwarmCap = {
maxSpeed: number,
minPeers: number,
-}
+};
type Options = {
connections: number,
@@ -67,7 +67,7 @@ type Options = {
timeout: number,
tracker: boolean,
virtual: boolean,
-}
+};
type Statistics = {
name: string,
@@ -115,4 +115,4 @@ type StreamingServer = {
torrent: [string, Loadable] | null,
statistics: Loadable | null,
playbackDevices: Loadable | null,
-};
\ No newline at end of file
+};
diff --git a/src/types/types.d.ts b/src/types/types.d.ts
index 18c769a07..8b7a627b6 100644
--- a/src/types/types.d.ts
+++ b/src/types/types.d.ts
@@ -51,7 +51,7 @@ type BehaviorHints = {
hasScheduledVideos: boolean,
};
-type PosterShape = 'square' | 'landscape' | 'poster' | null;
+type PosterShape = 'square' | 'landscape' | 'poster' | null;
type Catalog = {
label?: string,
@@ -60,4 +60,4 @@ type Catalog = {
content: T,
installed?: boolean,
deepLinks?: D,
-};
\ No newline at end of file
+};
diff --git a/tsconfig.json b/tsconfig.json
index 896a7d197..fd930dbcf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,10 +2,11 @@
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable"],
"jsx": "react",
- "baseUrl": "src",
+ "baseUrl": "./src",
+ "outDir": "./dist",
"moduleResolution": "node",
"paths": {
- "stremio/*": ["src/*"],
+ "stremio/*": ["*"],
},
"resolveJsonModule": true,
"esModuleInterop": true,
@@ -15,6 +16,6 @@
"strict": true,
},
"include": [
- "src",
- ],
+ "src/",
+ ]
}
diff --git a/webpack.config.js b/webpack.config.js
index 8f62fa021..8e6cac439 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -194,7 +194,7 @@ module.exports = (env, argv) => ({
new CleanWebpackPlugin({
cleanOnceBeforeBuildPatterns: ['*']
}),
- argv.mode === 'production' &&
+ argv.mode === 'production' &&
new WorkboxPlugin.GenerateSW({
maximumFileSizeToCacheInBytes: 20000000,
clientsClaim: true,