mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-02 12:48:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'overseerr/develop' into develop

Browse Source
This commit is contained in:
notfakie
2022-12-29 13:37:07 +13:00
parent d18e3d185f 3309f77aa4
commit 2714cbcefd
14 changed files with 427 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/RequestList/RequestItem/index.tsx
View File

@@ -39,6 +39,7 @@ const messages = defineMessages({
cancelRequest: 'Cancel Request',
tmdbid: 'TMDB ID',
tvdbid: 'TheTVDB ID',
unknowntitle: 'Unknown Title',
});
const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -128,6 +129,12 @@ const RequestItemError = ({
requestData.is4k ? 'status4k' : 'status'
]
}
downloadItem={
requestData.media[
requestData.is4k ? 'downloadStatus4k' : 'downloadStatus'
]
}
title={intl.formatMessage(messages.unknowntitle)}
inProgress={
(
requestData.media[
@@ -138,6 +145,7 @@ const RequestItemError = ({
).length > 0
}
is4k={requestData.is4k}
mediaType={requestData.type}
plexUrl={requestData.is4k ? plexUrl4k : plexUrl}
serviceUrl={
requestData.is4k
@@ -463,6 +471,12 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
status={
requestData.media[requestData.is4k ? 'status4k' : 'status']
}
downloadItem={
requestData.media[
requestData.is4k ? 'downloadStatus4k' : 'downloadStatus'
]
}
title={isMovie(title) ? title.title : title.name}
inProgress={
(
requestData.media[