Merge pull request #314 from Fallenbagel/upstream-fix
Merge upstream hotfix
This commit is contained in:
@@ -226,12 +226,13 @@ class PlexAPI {
|
|||||||
id: string,
|
id: string,
|
||||||
options: { addedAt: number } = {
|
options: { addedAt: number } = {
|
||||||
addedAt: Date.now() - 1000 * 60 * 60,
|
addedAt: Date.now() - 1000 * 60 * 60,
|
||||||
}
|
},
|
||||||
|
mediaType: 'movie' | 'show'
|
||||||
): Promise<PlexLibraryItem[]> {
|
): Promise<PlexLibraryItem[]> {
|
||||||
const response = await this.plexClient.query<PlexLibraryResponse>({
|
const response = await this.plexClient.query<PlexLibraryResponse>({
|
||||||
uri: `/library/sections/${id}/all?sort=addedAt%3Adesc&addedAt>>=${Math.floor(
|
uri: `/library/sections/${id}/all?type=${
|
||||||
options.addedAt / 1000
|
mediaType === 'show' ? '4' : '1'
|
||||||
)}`,
|
}&sort=addedAt%3Adesc&addedAt>>=${Math.floor(options.addedAt / 1000)}`,
|
||||||
extraHeaders: {
|
extraHeaders: {
|
||||||
'X-Plex-Container-Start': `0`,
|
'X-Plex-Container-Start': `0`,
|
||||||
'X-Plex-Container-Size': `500`,
|
'X-Plex-Container-Size': `500`,
|
||||||
|
|||||||
@@ -96,7 +96,8 @@ class PlexScanner
|
|||||||
// We remove 10 minutes from the last scan as a buffer
|
// We remove 10 minutes from the last scan as a buffer
|
||||||
addedAt: library.lastScan - 1000 * 60 * 10,
|
addedAt: library.lastScan - 1000 * 60 * 10,
|
||||||
}
|
}
|
||||||
: undefined
|
: undefined,
|
||||||
|
library.type
|
||||||
);
|
);
|
||||||
|
|
||||||
// Bundle items up by rating keys
|
// Bundle items up by rating keys
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
})}
|
})}
|
||||||
</Badge>
|
</Badge>
|
||||||
{showRelative && (
|
{showRelative && (
|
||||||
|
|||||||
@@ -167,7 +167,9 @@ const MobileMenu = () => {
|
|||||||
</Transition>
|
</Transition>
|
||||||
<div className="padding-bottom-safe border-t border-gray-600 bg-gray-800 bg-opacity-90 backdrop-blur">
|
<div className="padding-bottom-safe border-t border-gray-600 bg-gray-800 bg-opacity-90 backdrop-blur">
|
||||||
<div className="flex h-full items-center justify-between px-6 py-4 text-gray-100">
|
<div className="flex h-full items-center justify-between px-6 py-4 text-gray-100">
|
||||||
{filteredLinks.slice(0, 4).map((link) => {
|
{filteredLinks
|
||||||
|
.slice(0, filteredLinks.length === 5 ? 5 : 4)
|
||||||
|
.map((link) => {
|
||||||
const isActive =
|
const isActive =
|
||||||
router.pathname.match(link.activeRegExp) && !isOpen;
|
router.pathname.match(link.activeRegExp) && !isOpen;
|
||||||
return (
|
return (
|
||||||
@@ -187,7 +189,7 @@ const MobileMenu = () => {
|
|||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
{filteredLinks.length > 4 && (
|
{filteredLinks.length > 4 && filteredLinks.length !== 5 && (
|
||||||
<button
|
<button
|
||||||
className={`flex flex-col items-center space-y-1 ${
|
className={`flex flex-col items-center space-y-1 ${
|
||||||
isOpen ? 'text-indigo-500' : ''
|
isOpen ? 'text-indigo-500' : ''
|
||||||
|
|||||||
@@ -651,6 +651,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -670,6 +671,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -91,11 +91,13 @@ const PersonDetails = () => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
}),
|
}),
|
||||||
deathdate: intl.formatDate(data.deathday, {
|
deathdate: intl.formatDate(data.deathday, {
|
||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
@@ -106,6 +108,7 @@ const PersonDetails = () => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -876,6 +876,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -890,6 +891,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
|
|||||||
year: 'numeric',
|
year: 'numeric',
|
||||||
month: 'long',
|
month: 'long',
|
||||||
day: 'numeric',
|
day: 'numeric',
|
||||||
|
timeZone: 'UTC',
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -453,7 +453,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
input[type='range']::-webkit-slider-thumb {
|
input[type='range']::-webkit-slider-thumb {
|
||||||
@apply rounded-full bg-indigo-500;
|
@apply rounded-full border-0 bg-indigo-500;
|
||||||
|
pointer-events: all;
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
-webkit-appearance: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type='range']::-moz-range-thumb {
|
||||||
|
@apply rounded-full border-0 bg-indigo-500;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
|
|||||||
Reference in New Issue
Block a user