diff --git a/src/components/RequestButton/index.tsx b/src/components/RequestButton/index.tsx
index ff90da125..71d97b9ae 100644
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -268,7 +268,9 @@ const RequestButton = ({
// Standard request button
if (
- (!media || media.status === MediaStatus.UNKNOWN) &&
+ (!media ||
+ media.status === MediaStatus.UNKNOWN ||
+ (media.status === MediaStatus.DELETED && !activeRequest)) &&
hasPermission(
[
Permission.REQUEST,
@@ -295,7 +297,6 @@ const RequestButton = ({
type: 'or',
}) &&
media &&
- media.status !== MediaStatus.AVAILABLE &&
media.status !== MediaStatus.BLACKLISTED &&
!isShowComplete
) {
@@ -312,7 +313,9 @@ const RequestButton = ({
// 4K request button
if (
- (!media || media.status4k === MediaStatus.UNKNOWN) &&
+ (!media ||
+ media.status4k === MediaStatus.UNKNOWN ||
+ (media.status4k === MediaStatus.DELETED && !active4kRequest)) &&
hasPermission(
[
Permission.REQUEST_4K,
@@ -341,8 +344,7 @@ const RequestButton = ({
type: 'or',
}) &&
media &&
- media.status4k !== MediaStatus.AVAILABLE &&
- media.status !== MediaStatus.BLACKLISTED &&
+ media.status4k !== MediaStatus.BLACKLISTED &&
!is4kShowComplete &&
settings.currentSettings.series4kEnabled
) {
diff --git a/src/components/RequestCard/index.tsx b/src/components/RequestCard/index.tsx
index 33cd913bc..4a3b9d2c6 100644
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -18,7 +18,7 @@ import {
TrashIcon,
XMarkIcon,
} from '@heroicons/react/24/solid';
-import { MediaRequestStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
import type { MediaRequest } from '@server/entity/MediaRequest';
import type { NonFunctionProperties } from '@server/interfaces/api/common';
import type { MovieDetails } from '@server/models/Movie';
@@ -440,6 +440,15 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
>
{intl.formatMessage(globalMessages.failed)}
+ ) : requestData.status === MediaRequestStatus.PENDING &&
+ requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
+ MediaStatus.DELETED ? (
+
+ {intl.formatMessage(globalMessages.pending)}
+
) : (
{
>
{intl.formatMessage(globalMessages.failed)}
+ ) : requestData.status === MediaRequestStatus.PENDING &&
+ requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
+ MediaStatus.DELETED ? (
+
+ {intl.formatMessage(globalMessages.pending)}
+
) : (
{
+
@@ -190,6 +195,9 @@ const RequestList = () => {
+
diff --git a/src/components/RequestModal/CollectionRequestModal.tsx b/src/components/RequestModal/CollectionRequestModal.tsx
index 24a04e75a..21a44c0bf 100644
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -81,7 +81,8 @@ const CollectionRequestModal = ({
.filter(
(request) =>
request.is4k === is4k &&
- request.status !== MediaRequestStatus.DECLINED
+ request.status !== MediaRequestStatus.DECLINED &&
+ request.status !== MediaRequestStatus.COMPLETED
)
.map((part) => part.id),
];
@@ -170,7 +171,9 @@ const CollectionRequestModal = ({
return (part?.mediaInfo?.requests ?? []).find(
(request) =>
- request.is4k === is4k && request.status !== MediaRequestStatus.DECLINED
+ request.is4k === is4k &&
+ request.status !== MediaRequestStatus.DECLINED &&
+ request.status !== MediaRequestStatus.COMPLETED
);
};
@@ -368,7 +371,9 @@ const CollectionRequestModal = ({
const partMedia =
part.mediaInfo &&
part.mediaInfo[is4k ? 'status4k' : 'status'] !==
- MediaStatus.UNKNOWN
+ MediaStatus.UNKNOWN &&
+ part.mediaInfo[is4k ? 'status4k' : 'status'] !==
+ MediaStatus.DELETED
? part.mediaInfo
: undefined;
diff --git a/src/components/RequestModal/TvRequestModal.tsx b/src/components/RequestModal/TvRequestModal.tsx
index d2a84fd49..4124e3e4a 100644
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -249,7 +249,8 @@ const TvRequestModal = ({
.filter(
(request) =>
request.is4k === is4k &&
- request.status !== MediaRequestStatus.DECLINED
+ request.status !== MediaRequestStatus.DECLINED &&
+ request.status !== MediaRequestStatus.COMPLETED
)
.reduce((requestedSeasons, request) => {
return [
@@ -314,12 +315,16 @@ const TvRequestModal = ({
return;
}
+ const standardUnrequestedSeasons = unrequestedSeasons.filter(
+ (seasonNumber) => seasonNumber !== 0
+ );
+
if (
data &&
selectedSeasons.length >= 0 &&
- selectedSeasons.length < unrequestedSeasons.length
+ selectedSeasons.length < standardUnrequestedSeasons.length
) {
- setSelectedSeasons(unrequestedSeasons);
+ setSelectedSeasons(standardUnrequestedSeasons);
} else {
setSelectedSeasons([]);
}
@@ -330,9 +335,9 @@ const TvRequestModal = ({
return false;
}
return (
- selectedSeasons.length ===
+ selectedSeasons.filter((season) => season !== 0).length ===
getAllSeasons().filter(
- (season) => !getAllRequestedSeasons().includes(season)
+ (season) => !getAllRequestedSeasons().includes(season) && season !== 0
).length
);
};
@@ -347,7 +352,8 @@ const TvRequestModal = ({
(data.mediaInfo.requests || []).filter(
(request) =>
request.is4k === is4k &&
- request.status !== MediaRequestStatus.DECLINED
+ request.status !== MediaRequestStatus.DECLINED &&
+ request.status !== MediaRequestStatus.COMPLETED
).length > 0
) {
data.mediaInfo.requests
@@ -355,7 +361,9 @@ const TvRequestModal = ({
.forEach((request) => {
if (!seasonRequest) {
seasonRequest = request.seasons.find(
- (season) => season.seasonNumber === seasonNumber
+ (season) =>
+ season.seasonNumber === seasonNumber &&
+ season.status !== MediaRequestStatus.COMPLETED
);
}
});
@@ -577,7 +585,9 @@ const TvRequestModal = ({
(sn) =>
sn.seasonNumber === season.seasonNumber &&
sn[is4k ? 'status4k' : 'status'] !==
- MediaStatus.UNKNOWN
+ MediaStatus.UNKNOWN &&
+ sn[is4k ? 'status4k' : 'status'] !==
+ MediaStatus.DELETED
);
return (
diff --git a/src/components/StatusBadge/index.tsx b/src/components/StatusBadge/index.tsx
index 0821c0175..920df7227 100644
--- a/src/components/StatusBadge/index.tsx
+++ b/src/components/StatusBadge/index.tsx
@@ -371,6 +371,17 @@ const StatusBadge = ({
);
+ case MediaStatus.DELETED:
+ return (
+
+
+ {intl.formatMessage(is4k ? messages.status4k : messages.status, {
+ status: intl.formatMessage(globalMessages.deleted),
+ })}
+
+
+ );
+
default:
return null;
}
diff --git a/src/components/TitleCard/index.tsx b/src/components/TitleCard/index.tsx
index 865e82395..cffb95461 100644
--- a/src/components/TitleCard/index.tsx
+++ b/src/components/TitleCard/index.tsx
@@ -467,7 +467,9 @@ const TitleCard = ({
{showRequestButton &&
- (!currentStatus || currentStatus === MediaStatus.UNKNOWN) && (
+ (!currentStatus ||
+ currentStatus === MediaStatus.UNKNOWN ||
+ currentStatus === MediaStatus.DELETED) && (
{((!mSeason &&
request?.status === MediaRequestStatus.APPROVED) ||
- mSeason?.status === MediaStatus.PROCESSING) && (
+ mSeason?.status === MediaStatus.PROCESSING ||
+ (request?.status === MediaRequestStatus.APPROVED &&
+ mSeason?.status === MediaStatus.DELETED)) && (
<>
@@ -912,10 +927,28 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
)}
+ {mSeason?.status === MediaStatus.DELETED &&
+ request?.status !== MediaRequestStatus.APPROVED && (
+ <>
+
+
+ {intl.formatMessage(globalMessages.deleted)}
+
+
+
+
+
+
+ )}
{((!mSeason4k &&
request4k?.status ===
MediaRequestStatus.APPROVED) ||
- mSeason4k?.status4k === MediaStatus.PROCESSING) &&
+ mSeason4k?.status4k === MediaStatus.PROCESSING ||
+ (request4k?.status ===
+ MediaRequestStatus.APPROVED &&
+ mSeason4k?.status4k === MediaStatus.DELETED)) &&
show4k && (
<>
@@ -998,6 +1031,27 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
)}
+ {mSeason4k?.status4k === MediaStatus.DELETED &&
+ request4k?.status !== MediaRequestStatus.APPROVED &&
+ show4k && (
+ <>
+
+
+ {intl.formatMessage(messages.status4k, {
+ status: intl.formatMessage(
+ globalMessages.deleted
+ ),
+ })}
+
+
+
+
+
+
+ )}
= ({
clearAppBadge?: () => Promise;
};
- if ('setAppBadge' in navigator) {
- if (
- !router.pathname.match(/(login|setup|resetpassword)/) &&
- hasPermission(Permission.ADMIN)
- ) {
- requestsCount().then((data) =>
- newNavigator?.setAppBadge?.(data.pending)
- );
- } else {
- newNavigator?.clearAppBadge?.();
+ const handleBadgeUpdate = () => {
+ if ('setAppBadge' in newNavigator) {
+ if (
+ !router.pathname.match(/(login|setup|resetpassword)/) &&
+ hasPermission(Permission.ADMIN)
+ ) {
+ requestsCount().then((data) => {
+ if (data.pending > 0) {
+ newNavigator.setAppBadge?.(data.pending);
+ } else {
+ newNavigator.clearAppBadge?.();
+ }
+ });
+ } else {
+ newNavigator.clearAppBadge?.();
+ }
}
- }
+ };
+
+ handleBadgeUpdate();
+
+ window.addEventListener('focus', handleBadgeUpdate);
+
+ return () => {
+ window.removeEventListener('focus', handleBadgeUpdate);
+ };
}, [hasPermission, router.pathname]);
if (router.pathname.match(/(login|setup|resetpassword)/)) {
