Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2026-05-28 01:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Read `preferOriginal from jwt settings

Browse Source
This commit is contained in:
Zoe Roux
2025-04-08 00:54:23 +02:00
parent 9991da4fe1
commit c8742605ff
9 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/controllers/profiles/watchlist.ts
+4 -3
View File
@@ -100,7 +100,7 @@ export const watchlistH = new Elysia({ tags: ["profiles"] })
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
request: { url },
jwt: { sub },
jwt: { sub, settings },
}) => {
const langs = processLanguages(languages);
const items = await getShows({
@@ -114,7 +114,7 @@ export const watchlistH = new Elysia({ tags: ["profiles"] })
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
@@ -138,6 +138,7 @@ export const watchlistH = new Elysia({ tags: ["profiles"] })
async ({
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
jwt: { settings },
headers: { "accept-language": languages, authorization },
request: { url },
error,
@@ -157,7 +158,7 @@ export const watchlistH = new Elysia({ tags: ["profiles"] })
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: uInfo.id,
});
return createPage(items, { url, sort, limit });
api/src/controllers/shows/collections.ts
+10 -10
View File
@@ -40,7 +40,7 @@ export const collections = new Elysia({
params: { id },
headers: { "accept-language": languages },
query: { preferOriginal, with: relations },
jwt: { sub },
jwt: { sub, settings },
error,
set,
}) => {
@@ -53,7 +53,7 @@ export const collections = new Elysia({
),
languages: langs,
fallbackLanguage: langs.includes("*"),
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
relations,
userId: sub,
});
@@ -144,7 +144,7 @@ export const collections = new Elysia({
async ({
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
}) => {
const langs = processLanguages(languages);
@@ -155,7 +155,7 @@ export const collections = new Elysia({
sort,
filter: and(eq(shows.kind, "collection"), filter),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
@@ -228,7 +228,7 @@ export const collections = new Elysia({
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
error,
}) => {
@@ -262,7 +262,7 @@ export const collections = new Elysia({
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
@@ -285,7 +285,7 @@ export const collections = new Elysia({
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
error,
}) => {
@@ -319,7 +319,7 @@ export const collections = new Elysia({
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
@@ -342,7 +342,7 @@ export const collections = new Elysia({
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
error,
}) => {
@@ -372,7 +372,7 @@ export const collections = new Elysia({
sort,
filter: and(eq(shows.collectionPk, collection.pk), filter),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
api/src/controllers/shows/movies.ts
+4 -4
View File
@@ -30,7 +30,7 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
params: { id },
headers: { "accept-language": languages },
query: { preferOriginal, with: relations },
jwt: { sub },
jwt: { sub, settings },
error,
set,
}) => {
@@ -43,7 +43,7 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
),
languages: langs,
fallbackLanguage: langs.includes("*"),
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
relations,
userId: sub,
});
@@ -135,7 +135,7 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
request: { url },
jwt: { sub },
jwt: { sub, settings },
}) => {
const langs = processLanguages(languages);
const items = await getShows({
@@ -145,7 +145,7 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
sort,
filter: and(eq(shows.kind, "movie"), filter),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
api/src/controllers/shows/series.ts
+4 -4
View File
@@ -30,7 +30,7 @@ export const series = new Elysia({ prefix: "/series", tags: ["series"] })
params: { id },
headers: { "accept-language": languages },
query: { preferOriginal, with: relations },
jwt: { sub },
jwt: { sub, settings },
error,
set,
}) => {
@@ -43,7 +43,7 @@ export const series = new Elysia({ prefix: "/series", tags: ["series"] })
),
languages: langs,
fallbackLanguage: langs.includes("*"),
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
relations,
userId: sub,
});
@@ -138,7 +138,7 @@ export const series = new Elysia({ prefix: "/series", tags: ["series"] })
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
request: { url },
jwt: { sub },
jwt: { sub, settings },
}) => {
const langs = processLanguages(languages);
const items = await getShows({
@@ -148,7 +148,7 @@ export const series = new Elysia({ prefix: "/series", tags: ["series"] })
sort,
filter: and(eq(shows.kind, "serie"), filter),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
api/src/controllers/shows/shows.ts
+2 -2
View File
@@ -65,7 +65,7 @@ export const showsH = new Elysia({ prefix: "/shows", tags: ["shows"] })
},
headers: { "accept-language": languages },
request: { url },
jwt: { sub },
jwt: { sub, settings },
}) => {
const langs = processLanguages(languages);
const items = await getShows({
@@ -78,7 +78,7 @@ export const showsH = new Elysia({ prefix: "/shows", tags: ["shows"] })
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
api/src/controllers/staff.ts
+2 -2
View File
@@ -191,7 +191,7 @@ export const staffH = new Elysia({ tags: ["staff"] })
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
request: { url },
jwt: { sub },
jwt: { sub, settings },
error,
}) => {
const [member] = await db
@@ -243,7 +243,7 @@ export const staffH = new Elysia({ tags: ["staff"] })
kind: sql<any>`${shows.kind}`,
isAvailable: sql<boolean>`${shows.availableCount} != 0`,
...(preferOriginal && {
...((preferOriginal ?? settings.preferOriginal) && {
poster: sql<Image>`coalesce(nullif(${shows.original}->'poster', 'null'::jsonb), ${transQ.poster})`,
thumbnail: sql<Image>`coalesce(nullif(${shows.original}->'thumbnail', 'null'::jsonb), ${transQ.thumbnail})`,
banner: sql<Image>`coalesce(nullif(${shows.original}->'banner', 'null'::jsonb), ${transQ.banner})`,
api/src/controllers/studios.ts
+6 -6
View File
@@ -303,7 +303,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
error,
}) => {
@@ -341,7 +341,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
@@ -364,7 +364,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
error,
}) => {
@@ -403,7 +403,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });
@@ -426,7 +426,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
params: { id },
query: { limit, after, query, sort, filter, preferOriginal },
headers: { "accept-language": languages },
jwt: { sub },
jwt: { sub, settings },
request: { url },
error,
}) => {
@@ -465,7 +465,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
filter,
),
languages: langs,
preferOriginal,
preferOriginal: preferOriginal ?? settings.preferOriginal,
userId: sub,
});
return createPage(items, { url, sort, limit });