shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(requests): allow declined season requests to be re-requested

Browse Source 
fixes #690
This commit is contained in:
sct
2021-01-20 05:23:42 +00:00
parent e80920faa1
commit e1032ff5df
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/routes/request.ts
View File

@@ -160,7 +160,11 @@ requestRoutes.post(
// (Unless there are no seasons, in which case we abort)
if (media.requests) {
existingSeasons = media.requests
.filter((request) => request.is4k === req.body.is4k)
.filter(
(request) =>
request.is4k === req.body.is4k &&
request.status !== MediaRequestStatus.DECLINED
)
.reduce((seasons, request) => {
const combinedSeasons = request.seasons.map(
(season) => season.seasonNumber
@@ -303,7 +307,12 @@ requestRoutes.put<{ requestId: string }>(
// Get all requested seasons that are not part of this request we are editing
const existingSeasons = media.requests
.filter((r) => r.is4k === request.is4k && r.id !== request.id)
.filter(
(r) =>
r.is4k === request.is4k &&
r.id !== request.id &&
r.status !== MediaRequestStatus.DECLINED
)
.reduce((seasons, r) => {
const combinedSeasons = r.seasons.map(
(season) => season.seasonNumber

5
server/subscriber/MediaSubscriber.ts
View File

@@ -110,7 +110,10 @@ export class MediaSubscriber implements EntitySubscriberInterface {
});
for (const request of requests) {
if (request.is4k === is4k) {
if (
request.is4k === is4k &&
request.status === MediaRequestStatus.PENDING
) {
request.status = MediaRequestStatus.APPROVED;
await requestRepository.save(request);
}

13
src/components/RequestModal/TvRequestModal.tsx
View File

@@ -169,7 +169,11 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
const getAllRequestedSeasons = (): number[] => {
const requestedSeasons = (data?.mediaInfo?.requests ?? [])
.filter((request) => request.is4k === is4k)
.filter(
(request) =>
request.is4k === is4k &&
request.status !== MediaRequestStatus.DECLINED
)
.reduce((requestedSeasons, request) => {
return [
...requestedSeasons,
@@ -255,8 +259,11 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
if (
data?.mediaInfo &&
(data.mediaInfo.requests || []).filter((request) => request.is4k === is4k)
.length > 0
(data.mediaInfo.requests || []).filter(
(request) =>
request.is4k === is4k &&
request.status !== MediaRequestStatus.DECLINED
).length > 0
) {
data.mediaInfo.requests
.filter((request) => request.is4k === is4k)