Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow user to request new seasons of a already provided show #966

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

fix: allow user to request new seasons of a already provided show #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e0a923
fix(small brazilian-portuguese typo): fixing a really small typo
ToMattBan Sep 13, 2024
43d204c
feat(component): allow users to request new seasons
ToMattBan Sep 13, 2024
ddf581a
fix: reverting changes handled by weblate
ToMattBan Sep 13, 2024
3957f3d
Merge branch 'Fallenbagel:develop' into develop
ToMattBan Dec 29, 2024
3383675
Fix: Removing duplicates on request button
ToMattBan Dec 29, 2024
30a7486
Merge branch 'Fallenbagel:develop' into develop
ToMattBan Dec 30, 2024
ce64e43
fix: allow user to request new seasons of a already provided show
ToMattBan Dec 30, 2024
b45fac0
Merge branch 'develop' into develop
ToMattBan Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/components/RequestButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ const RequestButton = ({
onUpdate,
media,
mediaType,
isShowComplete = false,
is4kShowComplete = false,
}: RequestButtonProps) => {
const intl = useIntl();
const settings = useSettings();
Expand Down Expand Up @@ -300,8 +298,7 @@ const RequestButton = ({
}) &&
media &&
media.status !== MediaStatus.AVAILABLE &&
media.status !== MediaStatus.BLACKLISTED &&
!isShowComplete
media.status !== MediaStatus.BLACKLISTED
) {
buttons.push({
id: 'request-more',
Expand Down Expand Up @@ -347,7 +344,6 @@ const RequestButton = ({
media &&
media.status4k !== MediaStatus.AVAILABLE &&
media.status !== MediaStatus.BLACKLISTED &&
!is4kShowComplete &&
settings.currentSettings.series4kEnabled
) {
buttons.push({
Expand Down
46 changes: 1 addition & 45 deletions src/components/TvDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,49 +271,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
))
);
}

const getAllRequestedSeasons = (is4k: boolean): number[] => {
const requestedSeasons = (data?.mediaInfo?.requests ?? [])
.filter(
(request) =>
request.is4k === is4k &&
request.status !== MediaRequestStatus.DECLINED
)
.reduce((requestedSeasons, request) => {
return [
...requestedSeasons,
...request.seasons.map((sr) => sr.seasonNumber),
];
}, [] as number[]);

const availableSeasons = (data?.mediaInfo?.seasons ?? [])
.filter(
(season) =>
(season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE ||
season[is4k ? 'status4k' : 'status'] ===
MediaStatus.PARTIALLY_AVAILABLE ||
season[is4k ? 'status4k' : 'status'] === MediaStatus.PROCESSING) &&
!requestedSeasons.includes(season.seasonNumber)
)
.map((season) => season.seasonNumber);

return [...requestedSeasons, ...availableSeasons];
};

const showHasSpecials = data.seasons.some(
(season) =>
season.seasonNumber === 0 &&
settings.currentSettings.enableSpecialEpisodes
);

const isComplete =
(showHasSpecials ? seasonCount + 1 : seasonCount) <=
getAllRequestedSeasons(false).length;

const is4kComplete =
(showHasSpecials ? seasonCount + 1 : seasonCount) <=
getAllRequestedSeasons(true).length;


const streamingRegion = user?.settings?.streamingRegion
? user.settings.streamingRegion
: settings.currentSettings.streamingRegion
Expand Down Expand Up @@ -680,8 +638,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
onUpdate={() => revalidate()}
tmdbId={data?.id}
media={data?.mediaInfo}
isShowComplete={isComplete}
is4kShowComplete={is4kComplete}
/>
{(data.mediaInfo?.status === MediaStatus.AVAILABLE ||
data.mediaInfo?.status === MediaStatus.PARTIALLY_AVAILABLE ||
Expand Down
Loading