Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-08-07 09:01:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /videos/:id?with=show date formatting

Browse Source
This commit is contained in:
Zoe Roux 2025-07-26 23:08:46 +02:00
parent 16013766e0
commit a52807c565
No known key found for this signature in database
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/controllers/videos.ts
View File

@ -70,7 +70,6 @@ import {
updateAvailableCount, updateAvailableCount,
updateAvailableSince, updateAvailableSince,
} from "./seed/insert/shows"; } from "./seed/insert/shows";
import { watchStatusQ } from "./shows/logic";
async function linkVideos( async function linkVideos(
tx: Transaction, tx: Transaction,
@ -257,7 +256,7 @@ const videoRelations = {
'{"percent": 0, "time": 0, "playedDate": null, "videoId": null}'::jsonb '{"percent": 0, "time": 0, "playedDate": null, "videoId": null}'::jsonb
) )
as "progress" as "progress"
)`; )` as any;
}, },
entries: ({ languages }: { languages: string[] }) => { entries: ({ languages }: { languages: string[] }) => {
const transQ = getEntryTransQ(languages); const transQ = getEntryTransQ(languages);
@ -274,6 +273,7 @@ const videoRelations = {
progress: mapProgress({ aliased: false }), progress: mapProgress({ aliased: false }),
createdAt: sql`to_char(${entries.createdAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`, createdAt: sql`to_char(${entries.createdAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
updatedAt: sql`to_char(${entries.updatedAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`, updatedAt: sql`to_char(${entries.updatedAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
availableSince: sql`to_char(${entries.availableSince}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
}), }),
), ),
sql`'[]'::jsonb`, sql`'[]'::jsonb`,
@ -329,6 +329,8 @@ const videoRelations = {
airDate: shows.startAir, airDate: shows.startAir,
kind: sql<any>`${shows.kind}`, kind: sql<any>`${shows.kind}`,
isAvailable: sql<boolean>`${shows.availableCount} != 0`, isAvailable: sql<boolean>`${shows.availableCount} != 0`,
createdAt: sql`to_char(${shows.createdAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
updatedAt: sql`to_char(${shows.updatedAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
...(preferOriginal && { ...(preferOriginal && {
poster: sql<Image>`coalesce(nullif(${shows.original}->'poster', 'null'::jsonb), ${transQ.poster})`, poster: sql<Image>`coalesce(nullif(${shows.original}->'poster', 'null'::jsonb), ${transQ.poster})`,
@ -541,7 +543,12 @@ export const videosH = new Elysia({ prefix: "/videos", tags: ["videos"] })
}), }),
), ),
), ),
show: t.Optional(t.Union([Movie, Serie])), show: t.Optional(
t.Union([
t.Composite([t.Object({ kind: t.Literal("movie") }), Movie]),
t.Composite([t.Object({ kind: t.Literal("serie") }), Serie]),
]),
),
}), }),
]), ]),
404: { 404: {
@ -616,7 +623,9 @@ export const videosH = new Elysia({ prefix: "/videos", tags: ["videos"] })
return redirect(`/video/${path}/direct/${filename}`); return redirect(`/video/${path}/direct/${filename}`);
}, },
{ {
detail: { description: "Get redirected to the direct stream of the video" }, detail: {
description: "Get redirected to the direct stream of the video",
},
params: t.Object({ params: t.Object({
id: t.String({ id: t.String({
description: "The id or slug of the video to watch.", description: "The id or slug of the video to watch.",