Compare commits

...

49 Commits

Author SHA1 Message Date
gauthier-th
ca9074b111 fix: add debug logs to plex watchlist 2025-10-02 16:05:21 +02:00
Gauthier
f2bd0abcd8 fix(api): add a migration script to rename *arr tags with spaces (#1946)
* fix(api): add a migration script to rename *arr tags with spaces

This PR adds a migration script that will run at the startup of the app to remove the spaces from
the *arr tags of Jellyseerr.

fix #1897
re #1913
re https://github.com/Radarr/Radarr/issues/11251

* fix: add error message to logs
2025-10-01 11:42:10 +02:00
fallenbagel
872fc4581e docs: rename kubernetes to state its an advanced step 2025-09-29 13:33:11 +08:00
Joe Harrison
53dc802696 ci: replace pnpm cache with custom cache (#1938)
* removed the node pnpm cache in favour of the cache we setup

* updated release to remove the cache:pnpm from the node setup step
2025-09-29 13:30:02 +08:00
fallenbagel
764f7b4270 docs(gen-docs): add in packagemanager (#1937)
This adds in packagemanager as recently workflows were revamped to get the pnpm version from the package.json
2025-09-29 05:51:23 +05:00
fallenbagel
82c583974f docs(blog): implement blog (#1935)
* docs(blog): implement blog

This enables blog with a simple welcome to the blog post.

* docs(blog): add authors page

* chore(docusaurus): update docusaurus to v3.9.1

* docs(blog): add a description for each author

* docs(blog): refactor the image url for each author

* docs: update author name

Co-authored-by: Gauthier <mail@gauthierth.fr>

---------

Co-authored-by: Gauthier <mail@gauthierth.fr>
2025-09-29 05:40:01 +05:00
fallenbagel
b10c57ce43 docs: update link to AI assistance policy in PR template (#1936) 2025-09-28 22:22:41 +02:00
fallenbagel
efba847452 docs: update weblate translations (#1934)
* Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/

* Translated using Weblate (French)
Currently translated at 94.7% (1409 of 1487 strings)
Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (Ukrainian)
Currently translated at 91.0% (1354 of 1487 strings)
Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/uk/

* Translated using Weblate (Turkish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/tr/

* Translated using Weblate (French)
Currently translated at 94.8% (1411 of 1487 strings)
Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (Dutch)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/nl/

* Translated using Weblate (Dutch)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/nl/

* Translated using Weblate (French)
Currently translated at 95.0% (1414 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (Dutch)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/nl/

* Translated using Weblate (Turkish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/tr/

* Translated using Weblate (French)
Currently translated at 99.9% (1486 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (French)
Currently translated at 99.9% (1486 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (German)
Currently translated at 98.6% (1467 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (Norwegian Bokmål)
Currently translated at 71.6% (1066 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/nb_NO/

* Translated using Weblate (French)
Currently translated at 99.9% (1486 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (Norwegian Bokmål)
Currently translated at 76.4% (1137 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/nb_NO/

* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 86.8% (1291 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/zh_Hans/

* Translated using Weblate (Spanish)
Currently translated at 87.2% (1297 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/es/

* Translated using Weblate (Basque)
Currently translated at 93.8% (1395 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/eu/

* Translated using Weblate (Polish)
Currently translated at 91.5% (1362 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/pl/

* Translated using Weblate (Basque)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/eu/

* Translated using Weblate (Russian)
Currently translated at 89.9% (1338 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/ru/

* Translated using Weblate (Ukrainian)
Currently translated at 91.0% (1354 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/uk/

* Translated using Weblate (Swedish)
Currently translated at 87.6% (1304 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 87.6% (1304 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (Bulgarian)
Currently translated at 83.3% (1239 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (French)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (French)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (Hebrew)
Currently translated at 43.2% (643 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/he/

* Translated using Weblate (Hebrew)
Currently translated at 44.3% (659 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/he/

* Translated using Weblate (Bulgarian)
Currently translated at 85.5% (1272 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Russian)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/ru/

* Translated using Weblate (Bulgarian)
Currently translated at 85.5% (1272 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Hebrew)
Currently translated at 44.4% (661 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/he/

* Translated using Weblate (Hebrew)
Currently translated at 46.9% (698 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/he/

* Translated using Weblate (Norwegian Bokmål)
Currently translated at 76.5% (1138 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/nb_NO/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Hebrew)
Currently translated at 50.8% (756 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/he/

* Translated using Weblate (Hebrew)
Currently translated at 51.1% (760 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/he/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (French)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fr/

* Translated using Weblate (Swedish)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/sv/

* Translated using Weblate (Polish)
Currently translated at 91.5% (1362 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/pl/

* Translated using Weblate (Polish)
Currently translated at 91.5% (1362 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/pl/

* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/zh_Hans/

* Translated using Weblate (Romanian)
Currently translated at 41.9% (624 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/ro/

* Translated using Weblate (German)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/de/

* Translated using Weblate (Bulgarian)
Currently translated at 87.6% (1304 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Bulgarian)
Currently translated at 87.7% (1305 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Bulgarian)
Currently translated at 87.8% (1306 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Bulgarian)
Currently translated at 87.8% (1307 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Bulgarian)
Currently translated at 88.8% (1321 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/bg/

* Translated using Weblate (Italian)
Currently translated at 87.4% (1300 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/it/

* Translated using Weblate (Italian)
Currently translated at 89.5% (1332 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/it/

* Translated using Weblate (Italian)
Currently translated at 90.0% (1339 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/it/

* Translated using Weblate (Italian)
Currently translated at 100.0% (1487 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/it/

* Translated using Weblate (Hungarian)
Currently translated at 79.6% (1184 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/hu/

* Translated using Weblate (Finnish)
Currently translated at 17.2% (257 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fi/

* Translated using Weblate (Finnish)
Currently translated at 24.8% (370 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fi/

* Translated using Weblate (Finnish)
Currently translated at 25.5% (380 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fi/

* Translated using Weblate (Finnish)
Currently translated at 34.9% (520 of 1487 strings)
Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/fi/

* Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translate-URL: http://translate.jellyseerr.dev/projects/jellyseerr/jellyseerr-frontend/

---------

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: HanaO00 <greenmalkak@gmail.com>
Co-authored-by: michael <michaelvelosk@gmail.com>
Co-authored-by: Gökhan GÜRBÜZ <gkhn.gurbuz@hotmail.com>
Co-authored-by: Julien Cordeau <julien-cg@hotmail.fr>
Co-authored-by: Bas <910100490+weblate@proton.me>
Co-authored-by: Dennis van J <weblate@amsx.net>
Co-authored-by: 0xsysr3ll <0xsysr3ll@protonmail.com>
Co-authored-by: bogomil22 <bogomil22@users.noreply.translate.jellyseerr.dev>
Co-authored-by: Mikael Wessel <post@mikaelkw.online>
Co-authored-by: chenhui_li <lichenhui1997@gmail.com>
Co-authored-by: Miguel Pacheco <runway-venus-kung@duck.com>
Co-authored-by: Thadah <thadahdenyse+borgcube@protonmail.com>
Co-authored-by: zulimazuli <zulimazuli@gmail.com>
Co-authored-by: Stefan <dev.stafloker@gmail.com>
Co-authored-by: Blackflexxy <blackflexxy@gmail.com>
Co-authored-by: Nik <niklas@olofsson.cc>
Co-authored-by: Mattias Magnusson <mattish.91@gmail.com>
Co-authored-by: NilsKarlssonPyssling <nisse@users.noreply.translate.jellyseerr.dev>
Co-authored-by: Manu <mswiss@bluewin.ch>
Co-authored-by: Georgi Sariev <sariev_g@icloud.com>
Co-authored-by: big man <commandfns1@gmail.com>
Co-authored-by: Veselin <vesko2345@gmail.com>
Co-authored-by: Gallyam <gallyamb@gmail.com>
Co-authored-by: Dj5YsFXf#!pc@DQA7#8j$cc*Z6tq9Xeq <przekichane@icloud.com>
Co-authored-by: uqlel <jellyseer.borgcube.de@uqlel.ovh>
Co-authored-by: 宿命 <331874545@qq.com>
Co-authored-by: enderice2 <enderice2@protonmail.com>
Co-authored-by: Jamal R. <jamal2362@googlemail.com>
Co-authored-by: ReDFiRe <wwsoft@abv.bg>
Co-authored-by: bunz <66bunz@gmail.com>
Co-authored-by: Gábor Pikó <pikogabor008@gmail.com>
Co-authored-by: dogiex <dogiex+weblate@gmail.com>
2025-09-28 17:30:41 +00:00
Gauthier
420e320f1f ci: fix pnpm version in Dockerfile (#1933) 2025-09-28 17:04:11 +00:00
Joe Harrison
f427bc26df ci: remove the with step from the pnpm setup steps (#1932) 2025-09-28 16:55:38 +00:00
Gauthier
eec3319ba6 chore: update to pnpm v10 (#1349) 2025-09-28 18:20:31 +02:00
Joe Harrison
da57ccc5a7 Update support.yml fixed the gh -R issue (#1928) 2025-09-27 16:20:45 +05:00
Joe Harrison
e9db34ea07 ci: updated support workflow concurrency and logic (#1926) 2025-09-27 13:20:05 +05:00
Joe Harrison
1143f88b6e test(cypress): added cypress cache and syntax fix (#1923)
* added cypress cache and syntax fix

* removal of pnpm version logic
2025-09-26 20:28:51 +05:00
allcontributors[bot]
0b1ad8ca1c docs: add ale183 as a contributor for code (#1920)
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

---------

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-09-25 19:37:02 +05:00
ale183
b209e7fdf9 feat: add anidb support to jellyfin scanner (#1533)
* feat: anidb on jellyfin scanner

* fix: handle 4k movies if the provider is anidb

* fix: add nullish coalescing for anidbId

* Update server/lib/scanners/jellyfin/index.ts

Co-authored-by: Gauthier <mail@gauthierth.fr>

* fix: await getEpisodes call in JellyfinScanner to handle async behavior

---------

Co-authored-by: Gauthier <mail@gauthierth.fr>
2025-09-25 19:04:42 +05:00
allcontributors[bot]
fed772a8e7 docs: add sudo-kraken as a contributor for infra (#1919)
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

---------

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-09-25 10:15:26 +05:00
Joe Harrison
f46a763152 ci: tidy up workflows and implement a consistent style (#1905)
* feat(ci): tidy up workflows and implement a consistent style

all workflows now use ubuntu-24.04 as the runner type to match the release workflows

codeql.yml
 - bump actions to v3
 - add least-privilege perms + concurrency to stop duplicate runs
 - ignore docs only changes

conflict_labeler.yml
 - run on opened, reopened, and synchronize
 - bump action version
 - add concurrency group to avoid duplicate labeling

cypress.yml
 - skip docs-only changes; don’t run on draft PRs
 - add concurrency to stop duplicate runs + 10m timeout

docs-deploy.yml
 - add configure-pages@v5 and bump upload-pages-artifact to v4
 - set explicit pages/id-token perms + concurrency
 - minor cleanups (working-directory, ubuntu-24.04)

helm.yml
 - switch oras discover to oras manifest fetch
 - add concurrency to stop duplicate runs

lint-helm-charts.yml
 - bump action versions
 - enforce version bumps (--check-version-increment=true)
 - add least-privilege perms + concurrency to stop duplicate runs

support.yml
 - add least-privilege perms

test-docs-deploy.yml
 - add least-privilege perms + concurrency to stop duplicate runs

* fixed line 5 syntax error

* Updated based on comments from @M0NsTeRRR in PR-1905 discussion

* updated based on 2nd review from @M0NsTeRRR in PR-1905

* Merge of PR-1904 and PR-1905

* chore(pnpm-lock.yaml): updated the pnpm-lockfile

* ci(release.yml): fix the latest tag to use context labels

* ci: fix new lines at eof, removed cypress timeout, removed legacy qemu actions

* @M0NsTeRRR self review

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>

* fix: support workflow

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>

* fix: newline

---------

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
Co-authored-by: Ludovic Ortega <github@mail.adminafk.fr>
2025-09-25 06:57:23 +05:00
0xsysr3ll
c024799dae feat(api): add completed count to request count API (#1824) 2025-09-24 14:03:33 +02:00
Gauthier
837629ec47 fix(api): remove spaces from tags in *arr (#1913)
This PR removes the spaces in the tags sent to *arr when the Tag Requests option is enabled. Spaces
in tags are an unintended behavior and are not longer supported.

fix #1897
2025-09-24 10:24:12 +05:00
Gauthier
f045274a30 docs: add AI assistance notice (#1917)
* docs: add AI assistance notice

* docs: add TODO item for AI disclosure
2025-09-23 17:14:50 +05:00
Sergii Bogomolov
1518dc01e5 chore(helm): switch from Deployment to StatefulSet (#1901)
Jellyseerr is not designed to support multiple concurrently running instances.
To ensure that only one instance can run at any given time we:

- Replace Deployment with StatefulSet: switch from running "at least N pods" to
  "at most N pods".
- Remove replicaCount value: default is 1, we do not want to support more.
2025-09-23 11:01:34 +02:00
Gauthier
328517cc0a fix(watchlist): handle undefined Guid for Plex watchlist metadata (#1914) 2025-09-21 20:46:29 +05:00
fallenbagel
9e737576de fix(dnscaching): check dnsCache before init & support forceipv4 with caching (#1910)
* fix: ensure dnsCache is checked for when its enabled before initialization

previously dnsCache was being initialized even if it was disabled because the previous check was
always returning truthy.

fix #1857

* chore: update dns-caching to 0.2.6

This will allow dns-caching to respect forceIpv4 flag.

* chore: update dns-caching to 0.2.7
2025-09-18 16:30:42 +05:00
0xsysr3ll
cd479d0d17 feat(api): add excludeKeywords parameter to discovery queries (#1908)
Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>
2025-09-17 03:32:39 +08:00
Gauthier
e9f2f4490f fix(api): catch error when watchlist item doesn't exist anymore (#1907) 2025-09-16 15:42:41 +02:00
Gauthier
d5bf17574f fix(prettier): include sw.js file in .prettierignore (#1885) 2025-09-15 10:23:59 +02:00
0xsysr3ll
17172e93f9 feat(webhook): add support for dynamic placeholders in webhook URL (#1491)
* feat(wehbook): add support for dynamic placeholders in webhook URL

* refactor(webhook): rename supportPlaceholders to supportVariables and update related logic

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>

* feat(i18n): add missing translations

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>

* refactor(notifications): simplify webhook URL validation logic

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>

* fix: wrong docs url

Co-authored-by: Gauthier <mail@gauthierth.fr>

* fix: update webhook documentation URL to point to Jellyseerr

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>

---------

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>
Co-authored-by: Gauthier <mail@gauthierth.fr>
2025-09-10 17:20:58 +08:00
THOMAS B
4878722030 fix(tvdb): respect display language when fetching metadata (#1889)
* fix(tvdb): respect display language when fetching metadata

* refactor(tvdb): use seasons translation

* refactor(tvdb): limit while loop

* fix(tvdb): fix translation with '-'

* refactor(tvdb): remove logs

* style(tvdb): remove useless logs

* refactor(tvdb): simplify wanted translation condition

* refactor(languages): move AvailableLocale  from context to types
2025-09-08 20:20:21 +08:00
Ishan Jain
479be0daeb feat(notifications): make embedded posters optional (#1364)
* feat(notifications): make images optional

* fix(notifications): added en i18n config

* fix: prettify

* fix(notifications): added embedImage support for ntfy

* fix(frontend): update embedImage on form state change and submission

* fix(locale): updated locale for embedImage

* fix: renamed embedImage to embedPoster
2025-09-08 14:11:31 +02:00
THOMAS B
6245dae3b3 fix(tvdb): return specials seasons (#1894) 2025-09-08 10:49:26 +02:00
Gauthier
d82c6f6222 fix(settings): correct port saving of proxy settings (#1890)
The port of the proxy settings was saved as a string instead of a number, causing the API to throw
an error and making it impossible to save the network settings.
2025-09-04 14:45:42 +02:00
0xsysr3ll
13fe4c890b feat(issue): add issue description preview (#1881)
* feat(issue): add issue description preview

This PR adds a description preview to the issues list page, allowing users to quickly view issue details without navigating to individual issue pages.

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>

* fix(issue): remove unnecessary user join

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>

---------

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>
2025-09-04 10:24:08 +02:00
THOMAS B
22b2824441 feat: add tvdb indexer (#899)
* feat(tvdb): get tv seasons/episodes with tvdb

* fix: fix rate limiter index tvdb indexer

* fix(usersettings): remove unused column tvdbtoken

* refactor(tvdb): replace tvdb api by skyhook

* fix: error during get episodes

* fix: error if tmdb poster is null

* refactor: clean tvdb indexer code

* fix: wrong language with tmdb indexer

* style: replace avalaible to available

* style: tvdb.login to tvdb.test

* fix(test): fix  discover test

* fix(test): wrong url tv-details

* test(tvdb): add tvdb tests

* style(tvdb): rename pokemon to correct tv show

* refactor(indexer): remove unused getSeasonIdentifier method

* refactor(settings): replace tvdb object to boolean type

* refactor(tmdb): reduce still path condition

* test(tvdb): change 'use' to 'tvdb' condition check

* fix(tmdb): fix build

fix build after rebase

* fix(build): revert package.json

* fix(tvdb): ensure that seasons contain data

* refactor(swagger): fix /tvdb/test response

* fix(scanner): add tvdb indexer for scanner

* refactor(tvdb): remove skyhook api

* refactor(tvdb): use tvdb api

* fix(tvdb): rename tvdb to medatada

* refactor(medata): add tvdb settings

* refactor(metadata): rewrite metadata settings

* refactor(metadata): refactor metadata routes

* refactor(metadata): remove french comments

* refactor(metadata): refactor tvdb api calls

* style(prettier): run prettier

* fix(scanner): fix jellyfin scanner with tvdb provider

* fix(scanner): fix plex scanner tvdb provider

* style(provider): change provider name in info section

* style(provider): full provider name in select

* style(provider): remove french comment

* fix(tests): fix all cypress tests

* refactor(tvdb): fix apikey

* refactor(tmdb): apply prettier

* refactor(tvdb): remove logger info

* feat(metadata): replace fetch with axios for API calls

* feat(provider): replace indexer by provider

* fix(tests): fix cypress test

* chore: add project-wide apikey for tvdb

* chore: add correct application-wide key

* fix(test): fix test with default provider tmdb anime

* style(cypress): fix anime name variable

* chore(i18n): remove french translation + apply i18n:extract

* style(wording): standardize naming to "Metadata Provider" in UI text

* docs(comments): translate from French to English

* refactor(tvdb): remove unnecessary try/catch block

* feat(i18n): add missing translations

* fix(scanner): correct metadata provider ID from Tmdb to Tvdb

* style(settings): clarify navigation label from "Metadata" to "Metadata Providers"

* style(logs): update error log label from "Metadata" to "MetadataProvider"

* refactor(tvdb): replace indexer by metadata providers

* refactor(settings): remove metadata providers logo

* fix(config): restore missing config/db/.gitkeep file

---------

Co-authored-by: TOomaAh <ubuntu@PC>
Co-authored-by: fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
2025-09-02 22:40:47 +02:00
Gauthier
368ecf8771 fix(dnscaching): display stats for DNS caching (#1858)
* fix(dnscaching): display stats for DNS caching

* fix: add missing translation
2025-08-20 17:32:59 +08:00
Georgy
d3fd5028dc feat: add IMDb rating votes count in tooltip (#1696)
* feat: add IMDb rating votes count in tooltip

* feat: add IMDb rating votes count in tooltip

* feat: add IMDb rating votes count in tooltip
2025-08-19 22:26:42 +02:00
Gauvain
c0fd81a5f0 fix: remove console warning (#1836)
* fix: remove a console warning

* fix: Adds id attribute to select element for accessibility

Fixes label association by adding missing id attribute to the select dropdown, ensuring proper accessibility compliance and screen reader functionality.
2025-08-19 21:49:06 +02:00
0xsysr3ll
af7ceaf7a2 feat(requests): add user's avatar next to Requested/Last Modified by icon (#1750)
* feat(requests): add user's avatar in front of Requested/Last Modified by

* refactor(requests): wrap both the avatar and the username in Link

* fix(requests): remove unnecessary margin between avatar and username
2025-08-20 03:43:51 +08:00
fallenbagel
b4adfd2ffa feat: dns caching manager (#1294)
* feat(dns): implement dns caching

* feat: simple implementation of dnscaching

* feat: dynamic ttl which is revalidated while using stale dns cache

This is done as tmdb ttl is very less like 40 seconds so to make sure
any issues wont be caused due to cached dns (previously we were caching
for 5 minutes no matter what ttl)

* feat(dns): improve DNS cache with multi-strategy fallback system

- multiple DNS resolution strategie
- graceful fallbacks between IPv6 and IPv4 addresses
- network error reporting in fetch fix
- compatibility with cypress testing (I HOPE)

* fix: typos

* feat: dns cache stats in jobs & cache page (and cleanup)

* feat(networksettings): cache dns off by default

* feat: make dnsCache optional and enable-able through network settings

* chore(i18n): extract translation keys

* test(cypress): fix cypress testing

* feat(dnscache): dns cache entries are now flushable

* style(cypress): run prettier

* chore(cypresssettings): git ignore cypress json settings

* chore: ignore cypress/config/settings.json

* fix(dnscache): use entry specific hits and misses not global

* refactor: clean up console logs

* fix(dnscache): fix miss counter

* feat(dnscache): global stats

* chore(i18n): extract translation keys

* refactor: use date-fns for formatting age and remove useless code

* refactor: remove cypress testing options in dnsCacheManager

* refactor: remove console logs

* refactor: removed useless condition when its always truthy

* fix: remove FetchAPI-related code

* fix: remove old ipv4first setting

* refactor: use our own dns-caching package instead

* fix: correct dns-caching module configuration

* fix: correct dns-caching module configuration

* fix: remove useless lru-cache dependency

* fix: update dns-caching to v0.2.0

* fix: add env variable for min/max ttl & update dns-caching

* fix: update dns-caching package

* fix: add force min/max TTL in network settings

* docs: add docs for dns caching

---------

Co-authored-by: Gauthier <mail@gauthierth.fr>
2025-08-20 03:02:21 +08:00
0xsysr3ll
5c1583cf56 fix(UserProfile): handle optional chaining for recentlyWatched data (#1852)
This PR fixes a client-side TypeError in the "Recently Watched" section of user profiles. The issue occurred when recentlyWatched was undefined. The fix adds optional chaining (?.) to prevent the app from crashing.

Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>
2025-08-19 19:00:09 +02:00
Gauthier
66d4cd63bb docs(notifications): add more documentation for notifications (#1856)
This PR adds more documentation methods for notifications. Most of it is taken from the Overseerr
documentation.
2025-08-20 00:46:04 +08:00
Ludovic Ortega
e8ec3473da chore(helm): bump jellyseerr to 2.7.3 (#1848)
Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
2025-08-14 23:24:09 +02:00
0xsysr3ll
17d4f13afe fix(api): update Plex Watchlist URL (#1847) 2025-08-15 03:57:30 +08:00
0xsysr3ll
3292f11308 fix(MediaRequestSubscriber): use event manager to get fresh media state for MEDIA_AVAILABLE notifications (#1825)
* fix(MediaRequestSubscriber): use event manager to get fresh media state for MEDIA_AVAILABLE notifications

* refactor(MediaRequestSubscriber): streamline media availability notifications
2025-08-10 21:33:06 +02:00
0xsysr3ll
c86ee0ddb1 fix(api): make username field nullable in UserSettings API schema (#1835) 2025-08-06 06:22:21 +08:00
0xsysr3ll
e02ee24f70 fix(media): update delete media file logic to include is4k parameter (#1832)
* fix(media): update delete media file logic to include is4k parameter

* fix(media): revert to MANAGE_REQUESTS permission
2025-08-05 11:42:11 +02:00
0xsysr3ll
ca1686425b fix(blacklist): handle invalid keywords gracefully (#1815)
* fix(blacklist): handle invalid keywords gracefully

* fix(blacklist): only remove keywords on 404 errors

* fix(blacklist): remove non-null assertion and add proper type annotation

* refactor(blacklist): return null instead of 404 for missing keywords

* fix(blacklist): add type annotation for validKeywords

* fix(selector): update type annotation for validKeywords
2025-08-01 11:03:22 +02:00
0xsysr3ll
e52c63164f fix(api): add missing user settings' api docs (#1820)
This PR adds new fields to the UserSettings schema, including username, email, discordId, and various quota limits for movies and TV shows.

It also updates API paths to reference the new UserSettings schema.
2025-07-30 23:44:49 +02:00
Gauthier
e98f31e66c fix(proxy): initialize image proxies after the proxy is set up (#1794)
The ImageProxy for TMDB and TheTVDB were initialized before the proxy settings were set up, so they
were ignoring the proxy settings.

fix #1787
2025-07-24 10:33:53 +02:00
159 changed files with 11044 additions and 6972 deletions

View File

@@ -642,6 +642,24 @@
"contributions": [ "contributions": [
"code" "code"
] ]
},
{
"login": "sudo-kraken",
"name": "Joe Harrison",
"avatar_url": "https://avatars.githubusercontent.com/u/53116754?v=4",
"profile": "https://sudo-kraken.github.io/docs/",
"contributions": [
"infra"
]
},
{
"login": "ale183",
"name": "ale183",
"avatar_url": "https://avatars.githubusercontent.com/u/8809439?v=4",
"profile": "https://github.com/ale183",
"contributions": [
"code"
]
} }
] ]
} }

View File

@@ -4,6 +4,7 @@
#### To-Dos #### To-Dos
- [ ] Disclosed any use of AI (see our [policy](https://github.com/fallenbagel/jellyseerr/blob/develop/CONTRIBUTING.md#ai-assistance-notice))
- [ ] Successful build `pnpm build` - [ ] Successful build `pnpm build`
- [ ] Translation keys `pnpm i18n:extract` - [ ] Translation keys `pnpm i18n:extract`
- [ ] Database migration (if required) - [ ] Database migration (if required)

View File

@@ -7,6 +7,14 @@ on:
push: push:
branches: branches:
- develop - develop
workflow_dispatch:
permissions:
contents: read
concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
test: test:
@@ -17,14 +25,17 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
persist-credentials: false
- name: Pnpm Setup - name: Pnpm Setup
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4
with:
version: 9
- name: Get pnpm store directory - name: Get pnpm store directory
shell: sh shell: sh
run: | run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Setup pnpm cache - name: Setup pnpm cache
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@@ -32,137 +43,144 @@ jobs:
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: | restore-keys: |
${{ runner.os }}-pnpm-store- ${{ runner.os }}-pnpm-store-
- name: Install dependencies - name: Install dependencies
env: env:
HUSKY: 0 HUSKY: 0
run: pnpm install run: pnpm install
- name: Lint - name: Lint
run: pnpm lint run: pnpm lint
- name: Formatting - name: Formatting
run: pnpm format:check run: pnpm format:check
- name: Build - name: Build
run: pnpm build run: pnpm build
build: build:
name: Build & Publish Docker Images name: Build (per-arch, native runners)
if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]') if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
strategy: strategy:
matrix: matrix:
include: include:
- runner: ubuntu-24.04 - runner: ubuntu-24.04
platform: linux/amd64 platform: linux/amd64
arch: amd64
- runner: ubuntu-24.04-arm - runner: ubuntu-24.04-arm
platform: linux/arm64 platform: linux/arm64
arch: arm64
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.runner }}
outputs:
digest-amd64: ${{ steps.set_outputs.outputs.digest-amd64 }}
digest-arm64: ${{ steps.set_outputs.outputs.digest-arm64 }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
persist-credentials: false
- name: Commit timestamp
id: ts
run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v3 - name: Warm cache (no push) — ${{ matrix.platform }}
with: uses: docker/build-push-action@v6
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set lower case owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: ${{ github.repository_owner }}
- name: Docker metadata
id: meta
uses: docker/metadata-action@v4
with:
images: |
fallenbagel/jellyseerr
ghcr.io/${{ env.OWNER_LC }}/jellyseerr
tags: |
type=ref,event=branch
type=sha,prefix=,suffix=,format=short
- name: Build and push by digest
id: build
uses: docker/build-push-action@v5
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
platforms: ${{ matrix.platform }} platforms: ${{ matrix.platform }}
push: true push: false
build-args: | build-args: |
COMMIT_TAG=${{ github.sha }} COMMIT_TAG=${{ github.sha }}
BUILD_VERSION=develop BUILD_VERSION=develop
BUILD_DATE=${{ github.event.repository.updated_at }} SOURCE_DATE_EPOCH=${{ steps.ts.outputs.TIMESTAMP }}
outputs: |
type=image,push-by-digest=true,name=fallenbagel/jellyseerr,push=true
type=image,push-by-digest=true,name=ghcr.io/${{ env.OWNER_LC }}/jellyseerr,push=true
cache-from: type=gha,scope=${{ matrix.platform }} cache-from: type=gha,scope=${{ matrix.platform }}
cache-to: type=gha,mode=max,scope=${{ matrix.platform }} cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
provenance: false provenance: false
- name: Set outputs
id: set_outputs
run: |
platform="${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}"
echo "digest-${platform}=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT
merge_and_push: publish:
name: Create and Push Multi-arch Manifest name: Publish multi-arch image
needs: build needs: build
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
id-token: write
steps: steps:
- name: Checkout
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Commit timestamp
id: ts
run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub - name: Log in to Docker Hub
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
- name: Log in to GitHub Container Registry - name: Log in to GitHub Container Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Set lower case owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: ${{ github.repository_owner }}
- name: Create and push manifest
run: |
docker manifest create fallenbagel/jellyseerr:develop \
--amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
--amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
docker manifest push fallenbagel/jellyseerr:develop
# GHCR manifest - name: Extract metadata
docker manifest create ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop \ id: meta
--amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \ uses: docker/metadata-action@v5
--amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-arm64 }} with:
docker manifest push ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop images: |
${{ github.repository }}
ghcr.io/${{ github.repository }}
tags: |
type=raw,value=develop
type=sha
labels: |
org.opencontainers.image.created=${{ steps.ts.outputs.TIMESTAMP }}
- name: Build & Push (multi-arch, single tag)
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
build-args: |
COMMIT_TAG=${{ github.sha }}
BUILD_VERSION=develop
SOURCE_DATE_EPOCH=${{ steps.ts.outputs.TIMESTAMP }}
labels: ${{ steps.meta.outputs.labels }}
tags: ${{ steps.meta.outputs.tags }}
cache-from: |
type=gha,scope=linux/amd64
type=gha,scope=linux/arm64
cache-to: type=gha,mode=max
provenance: false
discord: discord:
name: Send Discord Notification name: Send Discord Notification
needs: merge_and_push needs: publish
if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]') if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3
- name: Combine Job Status - name: Combine Job Status
id: status id: status
run: | run: |
failures=(neutral, skipped, timed_out, action_required) failures=(neutral, skipped, timed_out, action_required)
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then if [[ ${array[@]} =~ ${{ needs.publish.result }} ]]; then
echo "status=failure" >> $GITHUB_OUTPUT echo "status=failure" >> $GITHUB_OUTPUT
else else
echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT echo "status=${{ needs.publish.result }}" >> $GITHUB_OUTPUT
fi fi
- name: Post Status to Discord - name: Post Status to Discord
uses: sarisia/actions-status-discord@v1 uses: sarisia/actions-status-discord@v1
with: with:

View File

@@ -3,39 +3,52 @@ name: 'CodeQL'
on: on:
push: push:
branches: ['develop'] branches: ['develop']
paths-ignore:
- '**/*.md'
- 'docs/**'
pull_request: pull_request:
branches: ['develop'] branches: ['develop']
paths-ignore:
- '**/*.md'
- 'docs/**'
schedule: schedule:
- cron: '50 7 * * 5' - cron: '50 7 * * 5'
permissions:
contents: read
concurrency:
group: codeql-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
analyze: analyze:
name: Analyze name: Analyze
runs-on: ubuntu-latest runs-on: ubuntu-24.04
timeout-minutes: 10
permissions: permissions:
actions: read
contents: read contents: read
security-events: write security-events: write
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
language: [javascript] language: [actions, javascript]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
persist-credentials: false
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
queries: +security-and-quality queries: +security-and-quality
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@v2 uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v3
with: with:
category: '/language:${{ matrix.language }}' category: '/language:${{ matrix.language }}'

View File

@@ -2,18 +2,24 @@ name: Merge Conflict Labeler
on: on:
push: push:
branches: branches: [develop]
- develop
pull_request_target: pull_request_target:
branches: branches: [develop]
- develop types: [opened, synchronize, reopened]
types: [synchronize]
permissions:
contents: read
concurrency:
group: merge-conflict-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
label: label:
name: Labeling name: Labeling
runs-on: ubuntu-latest runs-on: ubuntu-24.04
if: ${{ github.repository == 'Fallenbagel/jellyseerr' }} timeout-minutes: 10
permissions: permissions:
contents: read contents: read
pull-requests: write pull-requests: write

View File

@@ -2,26 +2,49 @@ name: Cypress Tests
on: on:
pull_request: pull_request:
branches: branches: ['*']
- '*' paths-ignore:
- '**/*.md'
- 'docs/**'
push: push:
branches: branches: [develop]
- develop paths-ignore:
- '**/*.md'
- 'docs/**'
permissions:
contents: read
concurrency:
group: cypress-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
cypress-run: cypress-run:
runs-on: ubuntu-latest name: Cypress Run
runs-on: ubuntu-24.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up Node.js - name: Set up Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version-file: package.json
- name: Pnpm Setup - name: Pnpm Setup
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4
- name: Setup cypress cache
uses: actions/cache@v4
with: with:
version: 9 path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-cypress-store-
- name: Cypress run - name: Cypress run
uses: cypress-io/github-action@v6 uses: cypress-io/github-action@v6
with: with:
@@ -36,6 +59,7 @@ jobs:
# Fix test titles in cypress dashboard # Fix test titles in cypress dashboard
COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}} COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}} COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
- name: Upload video files - name: Upload video files
if: always() if: always()
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View File

@@ -8,24 +8,30 @@ on:
- 'docs/**' - 'docs/**'
- 'gen-docs/**' - 'gen-docs/**'
permissions:
contents: read
concurrency:
group: pages
cancel-in-progress: true
jobs: jobs:
build: build:
name: Build Docusaurus name: Build Docusaurus
runs-on: ubuntu-latest runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false
- name: Set up Node.js - name: Set up Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version-file: package.json
- name: Pnpm Setup - name: Pnpm Setup
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4
with:
version: 9
- name: Get pnpm store directory - name: Get pnpm store directory
shell: sh shell: sh
@@ -46,38 +52,26 @@ jobs:
pnpm install --frozen-lockfile pnpm install --frozen-lockfile
- name: Build website - name: Build website
run: | working-directory: gen-docs
cd gen-docs run: pnpm build
pnpm build
- name: Upload Build Artifact - name: Upload Build Artifact
uses: actions/upload-pages-artifact@v3 uses: actions/upload-pages-artifact@v4
with: with:
path: gen-docs/build path: gen-docs/build
deploy: deploy:
name: Deploy to GitHub Pages name: Deploy to GitHub Pages
needs: build needs: build
concurrency: build-deploy-pages runs-on: ubuntu-24.04
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions: permissions:
pages: write # to deploy to Pages contents: read
id-token: write # to verify the deployment originates from an appropriate source pages: write
id-token: write
# Deploy to the github-pages environment
environment: environment:
name: github-pages name: github-pages
url: ${{ steps.deployment.outputs.page_url }} url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps: steps:
# - name: Download Build Artifact
# uses: actions/download-artifact@v4
# with:
# name: docusaurus-build
# path: gen-docs/build
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v4 uses: actions/deploy-pages@v4

View File

@@ -4,11 +4,21 @@ on:
push: push:
branches: branches:
- develop - develop
paths:
- 'charts/**'
- '.github/workflows/release-charts.yml'
permissions:
contents: read
concurrency:
group: helm-charts
cancel-in-progress: true
jobs: jobs:
package-helm-chart: package-helm-chart:
name: Package helm chart name: Package helm chart
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions: permissions:
contents: read contents: read
packages: read packages: read
@@ -19,6 +29,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false
- name: Install helm - name: Install helm
uses: azure/setup-helm@v4 uses: azure/setup-helm@v4
@@ -42,16 +53,11 @@ jobs:
# get current version # get current version
current_version=$(grep '^version:' "$chart_path/Chart.yaml" | awk '{print $2}') current_version=$(grep '^version:' "$chart_path/Chart.yaml" | awk '{print $2}')
# try to get current release version # try to get current release version
set +e if oras manifest fetch "ghcr.io/${GITHUB_REPOSITORY@L}/${chart_name}:${current_version}" >/dev/null 2>&1; then
oras discover ghcr.io/${GITHUB_REPOSITORY@L}/${chart_name}:${current_version} echo "No version change for $chart_name. Skipping."
oras_exit_code=$? else
set -e
if [ $oras_exit_code -ne 0 ]; then
helm dependency build "$chart_path" helm dependency build "$chart_path"
helm package "$chart_path" --destination ./.cr-release-packages helm package "$chart_path" --destination ./.cr-release-packages
else
echo "No version change for $chart_name. Skipping."
fi fi
else else
echo "Skipping $chart_name: Not a valid Helm chart" echo "Skipping $chart_name: Not a valid Helm chart"
@@ -61,7 +67,7 @@ jobs:
- name: Check if artifacts exist - name: Check if artifacts exist
id: check-artifacts id: check-artifacts
run: | run: |
if ls .cr-release-packages/* >/dev/null 2>&1; then if ls .cr-release-packages/*.tgz >/dev/null 2>&1; then
echo "has_artifacts=true" >> $GITHUB_OUTPUT echo "has_artifacts=true" >> $GITHUB_OUTPUT
else else
echo "has_artifacts=false" >> $GITHUB_OUTPUT echo "has_artifacts=false" >> $GITHUB_OUTPUT
@@ -77,7 +83,7 @@ jobs:
publish: publish:
name: Publish to ghcr.io name: Publish to ghcr.io
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions: permissions:
packages: write # needed for pushing to github registry packages: write # needed for pushing to github registry
id-token: write # needed for signing the images with GitHub OIDC Token id-token: write # needed for signing the images with GitHub OIDC Token
@@ -88,6 +94,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false
- name: Install helm - name: Install helm
uses: azure/setup-helm@v4 uses: azure/setup-helm@v4

View File

@@ -7,27 +7,48 @@ on:
paths: paths:
- '.github/workflows/lint-helm-charts.yml' - '.github/workflows/lint-helm-charts.yml'
- 'charts/**' - 'charts/**'
push:
branches: [develop]
paths:
- 'charts/**'
permissions:
contents: read
concurrency:
group: charts-lint-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
lint-test: lint-test:
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions:
contents: read
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false
- name: Set up Helm - name: Set up Helm
uses: azure/setup-helm@v4.2.0 uses: azure/setup-helm@v4
- name: Set up chart-testing
uses: helm/chart-testing-action@v2
- name: Ensure documentation is updated - name: Ensure documentation is updated
uses: docker://jnorwood/helm-docs:v1.14.2 uses: docker://jnorwood/helm-docs:v1.14.2
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.1
- name: Run chart-testing (list-changed) - name: Run chart-testing (list-changed)
id: list-changed id: list-changed
run: | run: |
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
if [[ -n "$changed" ]]; then if [[ -n "$changed" ]]; then
echo "changed=true" >> "$GITHUB_OUTPUT" echo "changed=true" >> "$GITHUB_OUTPUT"
echo "$changed"
fi fi
- name: Run chart-testing - name: Run chart-testing
if: steps.list-changed.outputs.changed == 'true' if: steps.list-changed.outputs.changed == 'true'
run: ct lint --target-branch ${{ github.event.repository.default_branch }} --validate-maintainers=false run: ct lint --target-branch ${{ github.event.repository.default_branch }} --validate-maintainers=false

View File

@@ -4,28 +4,125 @@ on:
push: push:
tags: tags:
- 'preview-*' - 'preview-*'
workflow_dispatch:
permissions:
contents: read
concurrency:
group: preview-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
build_and_push: build:
name: Build & Publish Docker Preview Images name: Build (per-arch, native runners)
runs-on: ubuntu-22.04 strategy:
matrix:
include:
- runner: ubuntu-24.04
platform: linux/amd64
arch: amd64
- runner: ubuntu-24.04-arm
platform: linux/arm64
arch: arm64
runs-on: ${{ matrix.runner }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Get the version with:
id: get_version persist-credentials: false
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
- name: Set up QEMU - name: Commit timestamp
uses: docker/setup-qemu-action@v3 id: ts
run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Derive preview version from tag
id: ver
shell: bash
run: |
TAG="${GITHUB_REF_NAME}"
VER="${TAG#preview-}"
VER="${VER#v}"
echo "version=${VER}" >> "$GITHUB_OUTPUT"
echo "Building preview version: ${VER}"
- name: Warm cache (no push) — ${{ matrix.platform }}
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
platforms: ${{ matrix.platform }}
push: false
build-args: |
COMMIT_TAG=${{ github.sha }}
BUILD_VERSION=${{ steps.ver.outputs.version }}
SOURCE_DATE_EPOCH=${{ steps.ts.outputs.TIMESTAMP }}
cache-from: type=gha,scope=${{ matrix.platform }}
cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
provenance: false
publish:
name: Publish multi-arch image
needs: build
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Commit timestamp
id: ts
run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub - name: Log in to Docker Hub
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v5 - name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Derive preview version from tag
id: ver
shell: bash
run: |
TAG="${GITHUB_REF_NAME}"
VER="${TAG#preview-}"
VER="${VER#v}"
echo "version=${VER}" >> "$GITHUB_OUTPUT"
echo "Publishing preview version: ${VER}"
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ github.repository }}
ghcr.io/${{ github.repository }}
tags: |
type=raw,value=preview-${{ steps.ver.outputs.version }}
labels: |
org.opencontainers.image.version=preview-${{ steps.ver.outputs.version }}
org.opencontainers.image.created=${{ steps.ts.outputs.TIMESTAMP }}
- name: Build & Push (multi-arch, single tag)
uses: docker/build-push-action@v6
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
@@ -33,7 +130,12 @@ jobs:
push: true push: true
build-args: | build-args: |
COMMIT_TAG=${{ github.sha }} COMMIT_TAG=${{ github.sha }}
BUILD_VERSION=${{ steps.get_version.outputs.VERSION }} BUILD_VERSION=${{ steps.ver.outputs.version }}
BUILD_DATE=${{ github.event.repository.updated_at }} SOURCE_DATE_EPOCH=${{ steps.ts.outputs.TIMESTAMP }}
tags: | labels: ${{ steps.meta.outputs.labels }}
fallenbagel/jellyseerr:${{ steps.get_version.outputs.VERSION }} tags: ${{ steps.meta.outputs.tags }}
cache-from: |
type=gha,scope=linux/amd64
type=gha,scope=linux/arm64
cache-to: type=gha,mode=max
provenance: false

View File

@@ -1,6 +1,14 @@
name: Jellyseer Release name: Jellyseerr Release
on: workflow_dispatch on:
workflow_dispatch:
permissions:
contents: read
concurrency:
group: release-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
semantic-release: semantic-release:
@@ -8,38 +16,29 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
HUSKY: 0 HUSKY: 0
outputs:
new_release_published: ${{ steps.release.outputs.new_release_published }}
new_release_version: ${{ steps.release.outputs.new_release_version }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false
- name: Set up Node.js - name: Set up Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version-file: package.json
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GH_TOKEN }}
- name: Pnpm Setup - name: Pnpm Setup
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4
with:
version: 9
- name: Get pnpm store directory - name: Get pnpm store directory
shell: sh shell: sh
run: | run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Setup pnpm cache - name: Setup pnpm cache
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@@ -47,77 +46,151 @@ jobs:
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: | restore-keys: |
${{ runner.os }}-pnpm-store- ${{ runner.os }}-pnpm-store-
- name: Install dependencies - name: Install dependencies
run: pnpm install run: pnpm install
- name: Release - name: Release
id: release
uses: cycjimmy/semantic-release-action@v5
with:
extra_plugins: |
@semantic-release/git@10
@semantic-release/changelog@6
@codedependant/semantic-release-docker@5
env: env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: npx semantic-release
# build-snap: build:
# name: Build Snap Package (${{ matrix.architecture }}) name: Build (per-arch, native runners)
# needs: semantic-release needs: semantic-release
# runs-on: ubuntu-22.04 if: needs.semantic-release.outputs.new_release_published == 'true'
# strategy: strategy:
# fail-fast: false matrix:
# matrix: include:
# architecture: - runner: ubuntu-24.04
# - amd64 platform: linux/amd64
# - arm64 arch: amd64
# steps: - runner: ubuntu-24.04-arm
# - name: Checkout Code platform: linux/arm64
# uses: actions/checkout@v4 arch: arm64
# with: runs-on: ${{ matrix.runner }}
# fetch-depth: 0 steps:
# - name: Switch to main branch - name: Checkout
# run: git checkout main uses: actions/checkout@v4
# - name: Pull latest changes with:
# run: git pull persist-credentials: false
# - name: Prepare
# id: prepare - name: Commit timestamp
# run: | id: ts
# git fetch --prune --tags run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
# if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
# echo "RELEASE=stable" >> $GITHUB_OUTPUT - name: Set up Docker Buildx
# else uses: docker/setup-buildx-action@v3
# echo "RELEASE=edge" >> $GITHUB_OUTPUT
# fi - name: Warm cache (no push) — ${{ matrix.platform }}
# - name: Set Up QEMU uses: docker/build-push-action@v6
# uses: docker/setup-qemu-action@v3 with:
# with: context: .
# image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde file: ./Dockerfile
# - name: Build Snap Package platforms: ${{ matrix.platform }}
# uses: diddlesnaps/snapcraft-multiarch-action@v1 push: false
# id: build build-args: |
# with: COMMIT_TAG=${{ github.sha }}
# architecture: ${{ matrix.architecture }} BUILD_VERSION=${{ needs.semantic-release.outputs.new_release_version }}
# - name: Upload Snap Package SOURCE_DATE_EPOCH=${{ steps.ts.outputs.TIMESTAMP }}
# uses: actions/upload-artifact@v4 cache-from: type=gha,scope=${{ matrix.platform }}
# with: cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
# name: jellyseerr-snap-package-${{ matrix.architecture }} provenance: false
# path: ${{ steps.build.outputs.snap }}
# - name: Review Snap Package publish:
# uses: diddlesnaps/snapcraft-review-tools-action@v1 name: Publish multi-arch image
# with: needs: [semantic-release, build]
# snap: ${{ steps.build.outputs.snap }} if: needs.semantic-release.outputs.new_release_published == 'true'
# - name: Publish Snap Package runs-on: ubuntu-24.04
# uses: snapcore/action-publish@v1 permissions:
# env: contents: read
# SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }} id-token: write
# with: packages: write
# snap: ${{ steps.build.outputs.snap }} steps:
# release: ${{ steps.prepare.outputs.RELEASE }} - name: Checkout
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Commit timestamp
id: ts
run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ github.repository }}
ghcr.io/${{ github.repository }}
tags: |
type=raw,value=${{ needs.semantic-release.outputs.new_release_version }}
labels: |
org.opencontainers.image.created=${{ steps.ts.outputs.TIMESTAMP }}
- name: Build & Push (multi-arch, single tag)
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
build-args: |
COMMIT_TAG=${{ github.sha }}
BUILD_VERSION=${{ needs.semantic-release.outputs.new_release_version }}
SOURCE_DATE_EPOCH=${{ steps.ts.outputs.TIMESTAMP }}
labels: ${{ steps.meta.outputs.labels }}
tags: ${{ steps.meta.outputs.tags }}
cache-from: |
type=gha,scope=linux/amd64
type=gha,scope=linux/arm64
cache-to: type=gha,mode=max
provenance: false
- name: Also tag :latest (non-pre-release only)
shell: bash
run: |
VER="${{ needs.semantic-release.outputs.new_release_version }}"
if [[ "$VER" != *"-"* ]]; then
docker buildx imagetools create \
-t ${{ github.repository }}:latest \
${{ github.repository }}:${VER}
docker buildx imagetools create \
-t ghcr.io/${{ github.repository }}:latest \
ghcr.io/${{ github.repository }}:${VER}
fi
discord: discord:
name: Send Discord Notification name: Send Discord Notification
needs: semantic-release needs: publish
if: always() if: always()
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3
- name: Combine Job Status - name: Combine Job Status
id: status id: status
run: | run: |
@@ -127,6 +200,7 @@ jobs:
else else
echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
fi fi
- name: Post Status to Discord - name: Post Status to Discord
uses: sarisia/actions-status-discord@v1 uses: sarisia/actions-status-discord@v1
with: with:

View File

@@ -1,94 +0,0 @@
name: Publish Snap
# turn off edge snap builds temporarily and make it manual
# on:
# push:
# branches:
# - develop
on: workflow_dispatch
jobs:
jobs:
name: Job Check
runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
build-snap:
name: Build Snap Package (${{ matrix.architecture }})
needs: jobs
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
architecture:
- amd64
- arm64
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Prepare
id: prepare
run: |
git fetch --prune --unshallow --tags
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
echo "RELEASE=stable" >> $GITHUB_OUTPUT
else
echo "RELEASE=edge" >> $GITHUB_OUTPUT
fi
- name: Set Up QEMU
uses: docker/setup-qemu-action@v3
- name: Configure Git
run: git config --add safe.directory /data/parts/jellyseerr/src
- name: Build Snap Package
uses: diddlesnaps/snapcraft-multiarch-action@v1
id: build
with:
architecture: ${{ matrix.architecture }}
- name: Upload Snap Package
uses: actions/upload-artifact@v4
with:
name: jellyseerr-snap-package-${{ matrix.architecture }}
path: ${{ steps.build.outputs.snap }}
- name: Review Snap Package
uses: diddlesnaps/snapcraft-review-tools-action@v1
with:
snap: ${{ steps.build.outputs.snap }}
- name: Publish Snap Package
uses: snapcore/action-publish@v1
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
with:
snap: ${{ steps.build.outputs.snap }}
release: ${{ steps.prepare.outputs.RELEASE }}
discord:
name: Send Discord Notification
needs: build-snap
if: always() && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-22.04
steps:
- name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3
- name: Combine Job Status
id: status
run: |
failures=(neutral, skipped, timed_out, action_required)
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
echo "status=failure" >> $GITHUB_OUTPUT
else
echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
fi
- name: Post Status to Discord
uses: sarisia/actions-status-discord@v1
with:
webhook: ${{ secrets.DISCORD_WEBHOOK }}
status: ${{ steps.status.outputs.status }}
title: ${{ github.workflow }}
nofail: true

View File

@@ -4,22 +4,53 @@ on:
issues: issues:
types: [labeled, unlabeled, reopened] types: [labeled, unlabeled, reopened]
permissions:
issues: read
concurrency:
group: support-${{ github.event.issue.number }}
cancel-in-progress: true
jobs: jobs:
support: support:
runs-on: ubuntu-latest if: github.event.label.name == 'support' || github.event.action == 'reopened'
runs-on: ubuntu-24.04
permissions:
issues: write
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
NUMBER: ${{ github.event.issue.number }}
ISSUE_AUTHOR: ${{ github.event.issue.user.login }}
steps: steps:
- uses: dessant/support-requests@v4 - name: Label added, comment and close issue
with: if: github.event.action == 'labeled' && github.event.label.name == 'support'
github-token: ${{ github.token }} shell: bash
support-label: 'support' env:
issue-comment: > BODY: >
:wave: @{issue-author}, we use the issue tracker exclusively :wave: @${{ env.ISSUE_AUTHOR }}, we use the issue tracker exclusively
for bug reports and feature requests. However, this issue appears for bug reports and feature requests. However, this issue appears
to be a support request. Please use our support channels to be a support request. Please use our support channels
to get help with Jellyseerr. to get help with Jellyseerr.
- [Discord](https://discord.gg/ckbvBtDJgC) - [Discord](https://discord.gg/ckbvBtDJgC)
run: |
retry() { n=0; until "$@"; do n=$((n+1)); [ $n -ge 3 ] && break; echo "retry $n: $*" >&2; sleep 2; done; }
retry gh issue comment "$NUMBER" -R "$GH_REPO" -b "$BODY" || true
retry gh issue close "$NUMBER" -R "$GH_REPO" || true
gh issue lock "$NUMBER" -R "$GH_REPO" -r "off_topic" || true
close-issue: true - name: Reopened or label removed, unlock issue
lock-issue: true if: github.event.action == 'unlabeled' && github.event.label.name == 'support'
issue-lock-reason: 'off-topic' shell: bash
run: |
retry() { n=0; until "$@"; do n=$((n+1)); [ $n -ge 3 ] && break; echo "retry $n: $*" >&2; sleep 2; done; }
retry gh issue reopen "$NUMBER" -R "$GH_REPO" || true
gh issue unlock "$NUMBER" -R "$GH_REPO" || true
- name: Remove support label on manual reopen
if: github.event.action == 'reopened'
shell: bash
run: |
gh issue edit "$NUMBER" -R "$GH_REPO" --remove-label "support" || true
gh issue unlock "$NUMBER" -R "$GH_REPO" || true

View File

@@ -8,24 +8,32 @@ on:
- 'docs/**' - 'docs/**'
- 'gen-docs/**' - 'gen-docs/**'
permissions:
contents: read
concurrency:
group: docs-pr-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
test-deploy: test-deploy:
name: Test deployment name: Test deployment
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions:
contents: read
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false
- name: Set up Node.js - name: Set up Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version-file: package.json
- name: Pnpm Setup - name: Pnpm Setup
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4
with:
version: 9
- name: Get pnpm store directory - name: Get pnpm store directory
shell: sh shell: sh
@@ -42,7 +50,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
cd gen-docs cd gen-docs
pnpm install --frozen-lockfile pnpm install --frozen-lockfile
- name: Build website - name: Build website

View File

@@ -4,11 +4,16 @@ dist/
config/ config/
CHANGELOG.md CHANGELOG.md
pnpm-lock.yaml pnpm-lock.yaml
cypress/config/settings.cypress.json
# assets # assets
src/assets/ src/assets/
public/ public/
!public/sw.js
docs/ docs/
!/public/
/public/*
!/public/sw.js
# helm charts # helm charts
**/charts **/charts

View File

@@ -21,5 +21,11 @@ module.exports = {
rangeEnd: 0, // default: Infinity rangeEnd: 0, // default: Infinity
}, },
}, },
{
files: 'cypress/config/settings.cypress.json',
options: {
rangeEnd: 0,
},
},
], ],
}; };

View File

@@ -20,5 +20,8 @@
"files.associations": { "files.associations": {
"globals.css": "tailwindcss" "globals.css": "tailwindcss"
}, },
"i18n-ally.localesPaths": ["src/i18n/locale"] "i18n-ally.localesPaths": [
"src/i18n/locale"
],
"yaml.format.singleQuote": true
} }

View File

@@ -2,6 +2,45 @@
All help is welcome and greatly appreciated! If you would like to contribute to the project, the following instructions should get you started... All help is welcome and greatly appreciated! If you would like to contribute to the project, the following instructions should get you started...
## AI Assistance Notice
> [!IMPORTANT]
>
> If you are using **any kind of AI assistance** to contribute to Jellyseerr,
> it must be disclosed in the pull request.
If you are using any kind of AI assistance while contributing to Jellyseerr,
**this must be disclosed in the pull request**, along with the extent to
which AI assistance was used (e.g. docs only vs. code generation).
If PR responses are being generated by an AI, disclose that as well.
As a small exception, trivial tab-completion doesn't need to be disclosed,
so long as it is limited to single keywords or short phrases.
An example disclosure:
> This PR was written primarily by Claude Code.
Or a more detailed disclosure:
> I consulted ChatGPT to understand the codebase but the solution
> was fully authored manually by myself.
Failure to disclose this is first and foremost rude to the human operators
on the other end of the pull request, but it also makes it difficult to
determine how much scrutiny to apply to the contribution.
In a perfect world, AI assistance would produce equal or higher quality
work than any human. That isn't the world we live in today, and in most cases
it's generating slop. I say this despite being a fan of and using them
successfully myself (with heavy supervision)!
When using AI assistance, we expect contributors to understand the code
that is produced and be able to answer critical questions about it. It
isn't a maintainers job to review a PR so broken that it requires
significant rework to be acceptable.
Please be respectful to maintainers and disclose AI assistance.
## Development ## Development
### Tools Required ### Tools Required
@@ -158,4 +197,4 @@ DB_TYPE="postgres" DB_USER=postgres DB_PASS=postgres pnpm migration:generate ser
## Attribution ## Attribution
This contribution guide was inspired by the [Next.js](https://github.com/vercel/next.js), [Radarr](https://github.com/Radarr/Radarr), and [Overseerr](https://github.com/sct/Overseerr) contribution guides. This contribution guide was inspired by the [Next.js](https://github.com/vercel/next.js), [Radarr](https://github.com/Radarr/Radarr), [Overseerr](https://github.com/sct/Overseerr) and [Ghostty](https://github.com/ghostty-org/ghostty) contribution guides.

View File

@@ -2,8 +2,11 @@ FROM node:22-alpine AS BUILD_IMAGE
WORKDIR /app WORKDIR /app
ARG SOURCE_DATE_EPOCH
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG COMMIT_TAG
ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
ENV COMMIT_TAG=${COMMIT_TAG}
RUN \ RUN \
case "${TARGETPLATFORM}" in \ case "${TARGETPLATFORM}" in \
@@ -14,47 +17,27 @@ RUN \
;; \ ;; \
esac esac
RUN npm install --global pnpm@9 RUN npm install --global pnpm@10
COPY package.json pnpm-lock.yaml postinstall-win.js ./ COPY package.json pnpm-lock.yaml postinstall-win.js ./
RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
COPY . ./ COPY . ./
ARG COMMIT_TAG
ENV COMMIT_TAG=${COMMIT_TAG}
RUN pnpm build RUN pnpm build
# remove development dependencies # remove development dependencies
RUN pnpm prune --prod --ignore-scripts RUN pnpm prune --prod --ignore-scripts && \
rm -rf src server .next/cache charts gen-docs docs && \
RUN rm -rf src server .next/cache charts gen-docs docs touch config/DOCKER && \
echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
RUN touch config/DOCKER
RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
FROM node:22-alpine FROM node:22-alpine
# OCI Meta information
ARG BUILD_DATE
ARG BUILD_VERSION
LABEL \
org.opencontainers.image.authors="Fallenbagel" \
org.opencontainers.image.source="https://github.com/fallenbagel/jellyseerr" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.version=${BUILD_VERSION} \
org.opencontainers.image.title="Jellyseerr" \
org.opencontainers.image.description="Open-source media request and discovery manager for Jellyfin, Plex, and Emby." \
org.opencontainers.image.licenses="MIT"
WORKDIR /app WORKDIR /app
RUN apk add --no-cache tzdata tini && rm -rf /tmp/* RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
RUN npm install -g pnpm@9 RUN npm install -g pnpm@10
# copy from build image # copy from build image
COPY --from=BUILD_IMAGE /app ./ COPY --from=BUILD_IMAGE /app ./

View File

@@ -3,7 +3,7 @@ FROM node:22-alpine
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app
RUN npm install --global pnpm@9 RUN npm install --global pnpm@10
RUN pnpm install RUN pnpm install

View File

@@ -11,7 +11,7 @@
<a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a> <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
<a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a> <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-69-orange.svg"/></a> <a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-71-orange.svg"/></a>
<!-- ALL-CONTRIBUTORS-BADGE:END --> <!-- ALL-CONTRIBUTORS-BADGE:END -->
**Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**. **Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
@@ -173,6 +173,10 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JamsRepos"><img src="https://avatars.githubusercontent.com/u/1347620?v=4?s=100" width="100px;" alt="Jam"/><br /><sub><b>Jam</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JamsRepos" title="Code">💻</a></td> <td align="center" valign="top" width="14.28%"><a href="https://github.com/JamsRepos"><img src="https://avatars.githubusercontent.com/u/1347620?v=4?s=100" width="100px;" alt="Jam"/><br /><sub><b>Jam</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JamsRepos" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.joelowrance.com"><img src="https://avatars.githubusercontent.com/u/63176?v=4?s=100" width="100px;" alt="Joe Lowrance"/><br /><sub><b>Joe Lowrance</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=joelowrance" title="Code">💻</a></td> <td align="center" valign="top" width="14.28%"><a href="http://www.joelowrance.com"><img src="https://avatars.githubusercontent.com/u/63176?v=4?s=100" width="100px;" alt="Joe Lowrance"/><br /><sub><b>Joe Lowrance</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=joelowrance" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xSysR3ll"><img src="https://avatars.githubusercontent.com/u/31414959?v=4?s=100" width="100px;" alt="0xsysr3ll"/><br /><sub><b>0xsysr3ll</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=0xSysR3ll" title="Code">💻</a></td> <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xSysR3ll"><img src="https://avatars.githubusercontent.com/u/31414959?v=4?s=100" width="100px;" alt="0xsysr3ll"/><br /><sub><b>0xsysr3ll</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=0xSysR3ll" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://sudo-kraken.github.io/docs/"><img src="https://avatars.githubusercontent.com/u/53116754?v=4?s=100" width="100px;" alt="Joe Harrison"/><br /><sub><b>Joe Harrison</b></sub></a><br /><a href="#infra-sudo-kraken" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ale183"><img src="https://avatars.githubusercontent.com/u/8809439?v=4?s=100" width="100px;" alt="ale183"/><br /><sub><b>ale183</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=ale183" title="Code">💻</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
name: jellyseerr-chart name: jellyseerr-chart
description: Jellyseerr helm chart for Kubernetes description: Jellyseerr helm chart for Kubernetes
type: application type: application
version: 2.6.1 version: 2.7.0
appVersion: "2.7.1" appVersion: "2.7.3"
maintainers: maintainers:
- name: Jellyseerr - name: Jellyseerr
url: https://github.com/Fallenbagel/jellyseerr url: https://github.com/Fallenbagel/jellyseerr

View File

@@ -1,6 +1,6 @@
# jellyseerr-chart # jellyseerr-chart
![Version: 2.6.1](https://img.shields.io/badge/Version-2.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.1](https://img.shields.io/badge/AppVersion-2.7.1-informational?style=flat-square) ![Version: 2.7.0](https://img.shields.io/badge/Version-2.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square)
Jellyseerr helm chart for Kubernetes Jellyseerr helm chart for Kubernetes
@@ -20,6 +20,17 @@ Jellyseerr helm chart for Kubernetes
Kubernetes: `>=1.23.0-0` Kubernetes: `>=1.23.0-0`
## Update Notes
### Updating to 2.7.0
Jellyseerr is a stateful application and it is not designed to have multiple replicas. In version 2.7.0 we address this by:
- replacing `Deployment` with `StatefulSet`
- removing `replicaCount` value
If `replicaCount` value was used - remove it. Helm update should work fine after that.
## Values ## Values
| Key | Type | Default | Description | | Key | Type | Default | Description |
@@ -55,7 +66,6 @@ Kubernetes: `>=1.23.0-0`
| probes.livenessProbe | object | `{}` | Configure liveness probe | | probes.livenessProbe | object | `{}` | Configure liveness probe |
| probes.readinessProbe | object | `{}` | Configure readiness probe | | probes.readinessProbe | object | `{}` | Configure readiness probe |
| probes.startupProbe | string | `nil` | Configure startup probe | | probes.startupProbe | string | `nil` | Configure startup probe |
| replicaCount | int | `1` | |
| resources | object | `{}` | | | resources | object | `{}` | |
| securityContext | object | `{}` | | | securityContext | object | `{}` | |
| service.port | int | `80` | | | service.port | int | `80` | |
@@ -64,7 +74,6 @@ Kubernetes: `>=1.23.0-0`
| serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? | | serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
| serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
| serviceAccount.name | string | `""` | If not set and create is true, a name is generated using the fullname template | | serviceAccount.name | string | `""` | If not set and create is true, a name is generated using the fullname template |
| strategy | object | `{"type":"Recreate"}` | Deployment strategy |
| tolerations | list | `[]` | | | tolerations | list | `[]` | |
| volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. | | volumeMounts | list | `[]` | Additional volumeMounts on the output StatefulSet definition. |
| volumes | list | `[]` | Additional volumes on the output Deployment definition. | | volumes | list | `[]` | Additional volumes on the output StatefulSet definition. |

View File

@@ -14,4 +14,15 @@
{{ template "chart.requirementsSection" . }} {{ template "chart.requirementsSection" . }}
## Update Notes
### Updating to 2.7.0
Jellyseerr is a stateful application and it is not designed to have multiple replicas. In version 2.7.0 we address this by:
- replacing `Deployment` with `StatefulSet`
- removing `replicaCount` value
If `replicaCount` value was used - remove it. Helm update should work fine after that.
{{ template "chart.valuesSection" . }} {{ template "chart.valuesSection" . }}

View File

@@ -1,13 +1,11 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: StatefulSet
metadata: metadata:
name: {{ include "jellyseerr.fullname" . }} name: {{ include "jellyseerr.fullname" . }}
labels: labels:
{{- include "jellyseerr.labels" . | nindent 4 }} {{- include "jellyseerr.labels" . | nindent 4 }}
spec: spec:
replicas: {{ .Values.replicaCount }} serviceName: {{ include "jellyseerr.fullname" . }}
strategy:
type: {{ .Values.strategy.type }}
selector: selector:
matchLabels: matchLabels:
{{- include "jellyseerr.selectorLabels" . | nindent 6 }} {{- include "jellyseerr.selectorLabels" . | nindent 6 }}

View File

@@ -1,5 +1,3 @@
replicaCount: 1
image: image:
registry: ghcr.io registry: ghcr.io
repository: fallenbagel/jellyseerr repository: fallenbagel/jellyseerr
@@ -12,10 +10,6 @@ imagePullSecrets: []
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""
# -- Deployment strategy
strategy:
type: Recreate
# Liveness / Readiness / Startup Probes # Liveness / Readiness / Startup Probes
probes: probes:
# -- Configure liveness probe # -- Configure liveness probe
@@ -115,14 +109,14 @@ resources: {}
# cpu: 100m # cpu: 100m
# memory: 128Mi # memory: 128Mi
# -- Additional volumes on the output Deployment definition. # -- Additional volumes on the output StatefulSet definition.
volumes: [] volumes: []
# - name: foo # - name: foo
# secret: # secret:
# secretName: mysecret # secretName: mysecret
# optional: false # optional: false
# -- Additional volumeMounts on the output Deployment definition. # -- Additional volumeMounts on the output StatefulSet definition.
volumeMounts: [] volumeMounts: []
# - name: foo # - name: foo
# mountPath: "/etc/foo" # mountPath: "/etc/foo"

View File

@@ -6,7 +6,6 @@
"apiKey": "testkey", "apiKey": "testkey",
"applicationTitle": "Jellyseerr", "applicationTitle": "Jellyseerr",
"applicationUrl": "", "applicationUrl": "",
"csrfProtection": false,
"cacheImages": false, "cacheImages": false,
"defaultPermissions": 32, "defaultPermissions": 32,
"defaultQuotas": { "defaultQuotas": {
@@ -180,5 +179,26 @@
"image-cache-cleanup": { "image-cache-cleanup": {
"schedule": "0 0 5 * * *" "schedule": "0 0 5 * * *"
} }
},
"network": {
"csrfProtection": false,
"trustProxy": false,
"forceIpv4First": false,
"dnsServers": "",
"proxy": {
"enabled": false,
"hostname": "",
"port": 8080,
"useSsl": false,
"user": "",
"password": "",
"bypassFilter": "",
"bypassLocalAddresses": true
},
"dnsCache": {
"enabled": false,
"forceMinTtl": 0,
"forceMaxTtl": -1
}
} }
} }

View File

@@ -0,0 +1,148 @@
describe('TVDB Integration', () => {
// Constants for routes and selectors
const ROUTES = {
home: '/',
metadataSettings: '/settings/metadata',
tomorrowIsOursTvShow: '/tv/72879',
monsterTvShow: '/tv/225634',
dragonnBallZKaiAnime: '/tv/61709',
};
const SELECTORS = {
sidebarToggle: '[data-testid=sidebar-toggle]',
sidebarSettingsMobile: '[data-testid=sidebar-menu-settings-mobile]',
settingsNavDesktop: 'nav[data-testid="settings-nav-desktop"]',
metadataTestButton: 'button[type="button"]:contains("Test")',
metadataSaveButton: '[data-testid="metadata-save-button"]',
tmdbStatus: '[data-testid="tmdb-status"]',
tvdbStatus: '[data-testid="tvdb-status"]',
tvMetadataProviderSelector: '[data-testid="tv-metadata-provider-selector"]',
animeMetadataProviderSelector:
'[data-testid="anime-metadata-provider-selector"]',
seasonSelector: '[data-testid="season-selector"]',
season1: 'Season 1',
season2: 'Season 2',
season3: 'Season 3',
episodeList: '[data-testid="episode-list"]',
episode9: '9 - Hang Men',
};
// Reusable commands
const navigateToMetadataSettings = () => {
cy.visit(ROUTES.home);
cy.get(SELECTORS.sidebarToggle).click();
cy.get(SELECTORS.sidebarSettingsMobile).click();
cy.get(
`${SELECTORS.settingsNavDesktop} a[href="${ROUTES.metadataSettings}"]`
).click();
};
const testAndVerifyMetadataConnection = () => {
cy.intercept('POST', '/api/v1/settings/metadatas/test').as(
'testConnection'
);
cy.get(SELECTORS.metadataTestButton).click();
return cy.wait('@testConnection');
};
const saveMetadataSettings = (customBody = null) => {
if (customBody) {
cy.intercept('PUT', '/api/v1/settings/metadatas', (req) => {
req.body = customBody;
}).as('saveMetadata');
} else {
// Else just intercept without modifying body
cy.intercept('PUT', '/api/v1/settings/metadatas').as('saveMetadata');
}
cy.get(SELECTORS.metadataSaveButton).click();
return cy.wait('@saveMetadata');
};
beforeEach(() => {
// Perform login
cy.login(Cypress.env('ADMIN_EMAIL'), Cypress.env('ADMIN_PASSWORD'));
// Navigate to Metadata settings
navigateToMetadataSettings();
// Verify we're on the correct settings page
cy.contains('h3', 'Metadata Providers').should('be.visible');
// Configure TVDB as TV provider and test connection
cy.get(SELECTORS.tvMetadataProviderSelector).click();
// get id react-select-4-option-1
cy.get('[class*="react-select__option"]').contains('TheTVDB').click();
// Test the connection
testAndVerifyMetadataConnection().then(({ response }) => {
expect(response.statusCode).to.equal(200);
// Check TVDB connection status
cy.get(SELECTORS.tvdbStatus).should('contain', 'Operational');
});
// Save settings
saveMetadataSettings({
anime: 'tvdb',
tv: 'tvdb',
}).then(({ response }) => {
expect(response.statusCode).to.equal(200);
expect(response.body.tv).to.equal('tvdb');
});
});
it('should display "Tomorrow is Ours" show information with multiple seasons from TVDB', () => {
// Navigate to the TV show
cy.visit(ROUTES.tomorrowIsOursTvShow);
// Verify that multiple seasons are displayed (TMDB has only 1 season, TVDB has multiple)
// cy.get(SELECTORS.seasonSelector).should('exist');
cy.intercept('/api/v1/tv/225634/season/1').as('season1');
// Select Season 2 and verify it loads
cy.contains(SELECTORS.season2)
.should('be.visible')
.scrollIntoView()
.click();
// Verify that episodes are displayed for Season 2
cy.contains('260 - Episode 506').should('be.visible');
});
it('Should display "Monster" show information correctly when not existing on TVDB', () => {
// Navigate to the TV show
cy.visit(ROUTES.monsterTvShow);
// Intercept season 1 request
cy.intercept('/api/v1/tv/225634/season/1').as('season1');
// Select Season 1
cy.contains(SELECTORS.season1)
.should('be.visible')
.scrollIntoView()
.click();
// Wait for the season data to load
cy.wait('@season1');
// Verify specific episode exists
cy.contains(SELECTORS.episode9).should('be.visible');
});
it('should display "Dragon Ball Z Kai" show information with multiple only 2 seasons from TVDB', () => {
// Navigate to the TV show
cy.visit(ROUTES.dragonnBallZKaiAnime);
// Intercept season 1 request
cy.intercept('/api/v1/tv/61709/season/1').as('season1');
// Select Season 2 and verify it visible
cy.contains(SELECTORS.season2)
.should('be.visible')
.scrollIntoView()
.click();
// select season 3 and verify it not visible
cy.contains(SELECTORS.season3).should('not.exist');
});
});

View File

@@ -15,7 +15,7 @@ import TabItem from '@theme/TabItem';
### Prerequisites ### Prerequisites
- [Node.js 22.x](https://nodejs.org/en/download/) - [Node.js 22.x](https://nodejs.org/en/download/)
- [Pnpm 9.x](https://pnpm.io/installation) - [Pnpm 10.x](https://pnpm.io/installation)
- [Git](https://git-scm.com/downloads) - [Git](https://git-scm.com/downloads)
## Unix (Linux, macOS) ## Unix (Linux, macOS)

View File

@@ -1,5 +1,5 @@
--- ---
title: Kubernetes title: Kubernetes (Advanced)
description: Install Jellyseerr in Kubernetes description: Install Jellyseerr in Kubernetes
sidebar_position: 5 sidebar_position: 5
--- ---

View File

@@ -0,0 +1,21 @@
---
title: Gotify
description: Configure Gotify notifications.
sidebar_position: 5
---
# Gotify
## Configuration
### Server URL
Set this to the URL of your Gotify server.
### Application Token
Add an application to your Gotify server, and set this field to the generated application token.
:::info
Please refer to the [Gotify API documentation](https://gotify.net/docs) for more details on configuring these notifications.
:::

View File

@@ -0,0 +1,29 @@
---
title: ntfy.sh
description: Configure ntfy.sh notifications.
sidebar_position: 6
---
# ntfy.sh
## Configuration
### Server Root URL
Set this to the URL of your ntfy.sh server.
### Topic
Set this to the topic you want to send notifications to.
### Username + Password authentication (optional)
Set this to the username and password for your ntfy.sh server.
### Token authentication (optional)
Set this to the token for your ntfy.sh server.
:::info
Please refer to the [ntfy.sh API documentation](https://docs.ntfy.sh/) for more details on configuring these notifications.
:::

View File

@@ -0,0 +1,23 @@
---
title: Pushbullet
description: Configure Pushbullet notifications.
sidebar_position: 7
---
# Pushbullet
:::info
Users can optionally configure personal notifications in their user settings.
User notifications are separate from system notifications, and the available notification types are dependent on user permissions.
:::
## Configuration
### Access Token
[Create an access token](https://www.pushbullet.com/#settings) and set it here to grant Jellyseerr access to the Pushbullet API.
### Channel Tag (optional)
Optionally, [create a channel](https://www.pushbullet.com/my-channel) to allow other users to follow the notification feed using the specified channel tag.

View File

@@ -0,0 +1,27 @@
---
title: Pushover
description: Configure Pushover notifications.
sidebar_position: 8
---
# Pushover
:::info
Users can optionally configure personal notifications in their user settings.
User notifications are separate from system notifications, and the available notification types are dependent on user permissions.
:::
## Configuration
### Application/API Token
[Register an application](https://pushover.net/apps/build) and enter the API token in this field. (You can use one of the [official icons in our GitHub repository](https://github.com/fallenbagel/jellyseerr/tree/develop/public) when configuring the application.)
For more details on registering applications or the API token, please see the [Pushover API documentation](https://pushover.net/api#registration).
### User Key
Set this to the user key for your Pushover account. Alternatively, you can set this to a group key to deliver notifications to multiple users.
For more details, please see the [Pushover API documentation](https://pushover.net/api#identifiers).

View File

@@ -0,0 +1,17 @@
---
title: Slack
description: Configure Slack notifications.
sidebar_position: 9
---
# Slack
## Configuration
### Webhook URL
Simply [create a webhook](https://my.slack.com/services/new/incoming-webhook/) and enter the URL in this field.
:::info
Please refer to the [Slack API documentation](https://api.slack.com/messaging/webhooks) for more details on configuring these notifications.
:::

View File

@@ -0,0 +1,39 @@
---
title: Telegram
description: Configure Telegram notifications.
sidebar_position: 10
---
# Telegram
:::info
Users can optionally configure personal notifications in their user settings.
User notifications are separate from system notifications, and the available notification types are dependent on user permissions.
:::
## Configuration
:::info
In order to configure Telegram notifications, you first need to [create a bot](https://telegram.me/BotFather).
Bots **cannot** initiate conversations with users, so users must have your bot added to a conversation in order to receive notifications.
:::
### Bot Username (optional)
If this value is configured, users will be able to click a link to start a chat with your bot and configure their own personal notifications.
The bot username should end with `_bot`, and the `@` prefix should be omitted.
### Bot Authentication Token
At the end of the bot creation process, [@BotFather](https://telegram.me/botfather) will provide an authentication token.
### Chat ID
To obtain your chat ID, simply create a new group chat, add [@get_id_bot](https://telegram.me/get_id_bot), and issue the `/my_id` command.
### Send Silently (optional)
Optionally, notifications can be sent silently. Silent notifications send messages without notification sounds.

View File

@@ -0,0 +1,138 @@
---
title: Webhook
description: Configure webhook notifications.
sidebar_position: 4
---
# Webhook
The webhook notification agent enables you to send a custom JSON payload to any endpoint for specific notification events.
## Configuration
### Webhook URL
The URL you would like to post notifications to. Your JSON will be sent as the body of the request.
### Authorization Header (optional)
:::info
This is typically not needed. Please refer to your webhook provider's documentation for details.
:::
This value will be sent as an `Authorization` HTTP header.
### JSON Payload
Customize the JSON payload to suit your needs. Jellyseerr provides several [template variables](#template-variables) for use in the payload, which will be replaced with the relevant data when the notifications are triggered.
## Template Variables
### General
| Variable | Value |
| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
| `{{notification_type}}` | The type of notification (e.g. `MEDIA_PENDING` or `ISSUE_COMMENT`) |
| `{{event}}` | A friendly description of the notification event |
| `{{subject}}` | The notification subject (typically the media title) |
| `{{message}}` | The notification message body (the media overview/synopsis for request notifications; the issue description for issue notificatons) |
| `{{image}}` | The notification image (typically the media poster) |
### Notify User
These variables are for the target recipient of the notification.
| Variable | Value |
| ---------------------------------------- | ------------------------------------------------------------- |
| `{{notifyuser_username}}` | The target notification recipient's username |
| `{{notifyuser_email}}` | The target notification recipient's email address |
| `{{notifyuser_avatar}}` | The target notification recipient's avatar URL |
| `{{notifyuser_settings_discordId}}` | The target notification recipient's Discord ID (if set) |
| `{{notifyuser_settings_telegramChatId}}` | The target notification recipient's Telegram Chat ID (if set) |
:::info
The `notifyuser` variables are not defined for the following request notification types, as they are intended for application administrators rather than end users:
- Request Pending Approval
- Request Automatically Approved
- Request Processing Failed
On the other hand, the `notifyuser` variables _will_ be replaced with the requesting user's information for the below notification types:
- Request Approved
- Request Declined
- Request Available
If you would like to use the requesting user's information in your webhook, please instead include the relevant variables from the [Request](#request) section below.
:::
### Special
The following variables must be used as a key in the JSON payload (e.g., `"{{extra}}": []`).
| Variable | Value |
| ------------- | ------------------------------------------------------------------------------------------------------------------------------ |
| `{{media}}` | The relevant media object |
| `{{request}}` | The relevant request object |
| `{{issue}}` | The relevant issue object |
| `{{comment}}` | The relevant issue comment object |
| `{{extra}}` | The "extra" array of additional data for certain notifications (e.g., season/episode numbers for series-related notifications) |
#### Media
The `{{media}}` will be `null` if there is no relevant media object for the notification.
These following special variables are only included in media-related notifications, such as requests.
| Variable | Value |
| -------------------- | -------------------------------------------------------------------------------------------------------------- |
| `{{media_type}}` | The media type (`movie` or `tv`) |
| `{{media_tmdbid}}` | The media's TMDB ID |
| `{{media_tvdbid}}` | The media's TheTVDB ID |
| `{{media_status}}` | The media's availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`) |
| `{{media_status4k}}` | The media's 4K availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`) |
#### Request
The `{{request}}` will be `null` if there is no relevant media object for the notification.
The following special variables are only included in request-related notifications.
| Variable | Value |
| ----------------------------------------- | ----------------------------------------------- |
| `{{request_id}}` | The request ID |
| `{{requestedBy_username}}` | The requesting user's username |
| `{{requestedBy_email}}` | The requesting user's email address |
| `{{requestedBy_avatar}}` | The requesting user's avatar URL |
| `{{requestedBy_settings_discordId}}` | The requesting user's Discord ID (if set) |
| `{{requestedBy_settings_telegramChatId}}` | The requesting user's Telegram Chat ID (if set) |
#### Issue
The `{{issue}}` will be `null` if there is no relevant media object for the notification.
The following special variables are only included in issue-related notifications.
| Variable | Value |
| ---------------------------------------- | ----------------------------------------------- |
| `{{issue_id}}` | The issue ID |
| `{{reportedBy_username}}` | The requesting user's username |
| `{{reportedBy_email}}` | The requesting user's email address |
| `{{reportedBy_avatar}}` | The requesting user's avatar URL |
| `{{reportedBy_settings_discordId}}` | The requesting user's Discord ID (if set) |
| `{{reportedBy_settings_telegramChatId}}` | The requesting user's Telegram Chat ID (if set) |
#### Comment
The `{{comment}}` will be `null` if there is no relevant media object for the notification.
The following special variables are only included in issue comment-related notifications.
| Variable | Value |
| ----------------------------------------- | ----------------------------------------------- |
| `{{comment_message}}` | The comment message |
| `{{commentedBy_username}}` | The commenting user's username |
| `{{commentedBy_email}}` | The commenting user's email address |
| `{{commentedBy_avatar}}` | The commenting user's avatar URL |
| `{{commentedBy_settings_discordId}}` | The commenting user's Discord ID (if set) |
| `{{commentedBy_settings_telegramChatId}}` | The commenting user's Telegram Chat ID (if set) |

View File

@@ -0,0 +1,16 @@
---
title: DNS Caching
description: Configure DNS caching settings.
sidebar_position: 7
---
# DNS Caching
Jellyseerr uses DNS caching to improve performance and reduce the number of DNS lookups required for external API calls. This can help speed up response times and reduce load on DNS servers, when something like a Pi-hole is used as a DNS resolver.
## Configuration
You can enable the DNS caching settings in the Network tab of the Jellyseerr settings. The default values follow the standard DNS caching behavior.
- **Force Minimum TTL**: Set a minimum time-to-live (TTL) in seconds for DNS cache entries. This ensures that frequently accessed DNS records are cached for a longer period, reducing the need for repeated lookups. Default is 0.
- **Force Maximum TTL**: Set a maximum time-to-live (TTL) in seconds for DNS cache entries. This prevents infrequently accessed DNS records from being cached indefinitely, allowing for more up-to-date information to be retrieved. Default is -1 (unlimited).

View File

@@ -1,6 +1,7 @@
--- ---
title: Jobs & Cache title: Jobs & Cache
description: Configure jobs and cache settings. description: Configure jobs and cache settings.
sidebar_position: 6
--- ---
# Jobs & Cache # Jobs & Cache

View File

@@ -0,0 +1,24 @@
---
title: Welcome to the Jellyseerr Blog
description: The official Jellyseerr blog for release notes, technical updates, and community news.
slug: welcome
authors: [fallenbagel, gauthier-th]
tags: [announcement, jellyseerr, blog]
image: https://raw.githubusercontent.com/fallenbagel/jellyseerr/refs/heads/develop/gen-docs/static/img/logo.svg
hide_table_of_contents: false
---
We are pleased to introduce the official Jellyseerr blog.
This space will serve as the central place for:
- Release announcements
- Updates on new features and improvements
- Technical articles, such as details on our [**DNS caching package**](https://github.com/jellyseerr/dns-caching) and other enhancements
- Community-related news
<!--truncate-->
Our goal is to keep the community informed and provide deeper insights into the ongoing development of Jellyseerr.
Thank you for being part of the Jellyseerr project. More updates will follow soon.

21
gen-docs/blog/authors.yml Normal file
View File

@@ -0,0 +1,21 @@
fallenbagel:
name: Fallenbagel
page: true
title: Developer & Maintainer of Jellyseerr
description: Core Maintainer & Developer of Jellyseerr | Full-Stack Software Engineer | MSc Software Engineering Candidate.
url: https://github.com/fallenbagel
image_url: https://github.com/fallenbagel.png
email: hello@fallenbagel.com
socials:
github: fallenbagel
gauthier-th:
name: Gauthier
page: true
title: Co-Developer & Co-Maintainer of Jellyseerr
description: Co-Maintainer & Developer of Jellyseerr | PhD Student in AI at ICB, Dijon
url: https://gauthierth.fr
image_url: https://github.com/gauthier-th.png
email: mail@gauthierth.fr
socials:
github: gauthier-th

View File

@@ -34,7 +34,6 @@ const config: Config = {
editUrl: editUrl:
'https://github.com/fallenbagel/jellyseerr/edit/develop/docs/', 'https://github.com/fallenbagel/jellyseerr/edit/develop/docs/',
}, },
blog: false,
pages: false, pages: false,
theme: { theme: {
customCss: './src/css/custom.css', customCss: './src/css/custom.css',
@@ -69,6 +68,11 @@ const config: Config = {
src: 'img/logo.svg', src: 'img/logo.svg',
}, },
items: [ items: [
{
to: 'blog',
label: 'Blog',
position: 'right',
},
{ {
href: 'https://github.com/fallenbagel/jellyseerr', href: 'https://github.com/fallenbagel/jellyseerr',
label: 'GitHub', label: 'GitHub',
@@ -88,6 +92,19 @@ const config: Config = {
}, },
], ],
}, },
{
title: 'Project',
items: [
{
label: 'Blog',
to: '/blog',
},
{
label: 'GitHub',
href: 'https://github.com/fallenbagel/jellyseerr',
},
],
},
{ {
title: 'Community', title: 'Community',
items: [ items: [

View File

@@ -2,6 +2,7 @@
"name": "gen-docs", "name": "gen-docs",
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"packageManager": "pnpm@10.17.1",
"scripts": { "scripts": {
"docusaurus": "docusaurus", "docusaurus": "docusaurus",
"start": "docusaurus start", "start": "docusaurus start",
@@ -15,9 +16,9 @@
"typecheck": "tsc" "typecheck": "tsc"
}, },
"dependencies": { "dependencies": {
"@docusaurus/core": "3.4.0", "@docusaurus/core": "3.9.1",
"@docusaurus/preset-classic": "3.4.0", "@docusaurus/preset-classic": "3.9.1",
"@easyops-cn/docusaurus-search-local": "^0.44.2", "@easyops-cn/docusaurus-search-local": "^0.52.1",
"@mdx-js/react": "^3.0.0", "@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0", "clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0", "prism-react-renderer": "^2.3.0",
@@ -26,14 +27,11 @@
"tailwindcss": "^3.4.4" "tailwindcss": "^3.4.4"
}, },
"devDependencies": { "devDependencies": {
"@docusaurus/module-type-aliases": "3.4.0", "@docusaurus/module-type-aliases": "3.9.1",
"@docusaurus/tsconfig": "3.4.0", "@docusaurus/tsconfig": "3.9.1",
"@docusaurus/types": "3.4.0", "@docusaurus/types": "3.9.1",
"typescript": "~5.2.2" "typescript": "~5.2.2"
}, },
"resolutions": {
"prismjs": "PrismJS/prism"
},
"browserslist": { "browserslist": {
"production": [ "production": [
">0.5%", ">0.5%",

8764
gen-docs/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -141,14 +141,83 @@ components:
UserSettings: UserSettings:
type: object type: object
properties: properties:
username:
type: string
nullable: true
example: 'Mr User'
email:
type: string
example: 'user@example.com'
discordId:
type: string
nullable: true
example: '123456789'
locale: locale:
type: string type: string
nullable: true
example: 'en'
discoverRegion: discoverRegion:
type: string type: string
originalLanguage: nullable: true
type: string example: 'US'
streamingRegion: streamingRegion:
type: string type: string
nullable: true
example: 'US'
originalLanguage:
type: string
nullable: true
example: 'en'
movieQuotaLimit:
type: number
nullable: true
description: 'Maximum number of movie requests allowed'
example: 10
movieQuotaDays:
type: number
nullable: true
description: 'Time period in days for movie quota'
example: 30
tvQuotaLimit:
type: number
nullable: true
description: 'Maximum number of TV requests allowed'
example: 5
tvQuotaDays:
type: number
nullable: true
description: 'Time period in days for TV quota'
example: 14
globalMovieQuotaDays:
type: number
nullable: true
description: 'Global movie quota days setting'
example: 30
globalMovieQuotaLimit:
type: number
nullable: true
description: 'Global movie quota limit setting'
example: 10
globalTvQuotaLimit:
type: number
nullable: true
description: 'Global TV quota limit setting'
example: 5
globalTvQuotaDays:
type: number
nullable: true
description: 'Global TV quota days setting'
example: 14
watchlistSyncMovies:
type: boolean
nullable: true
description: 'Enable watchlist sync for movies'
example: true
watchlistSyncTv:
type: boolean
nullable: true
description: 'Enable watchlist sync for TV'
example: false
MainSettings: MainSettings:
type: object type: object
properties: properties:
@@ -191,9 +260,51 @@ components:
csrfProtection: csrfProtection:
type: boolean type: boolean
example: false example: false
forceIpv4First:
type: boolean
example: false
trustProxy: trustProxy:
type: boolean type: boolean
example: true example: false
proxy:
type: object
properties:
enabled:
type: boolean
example: false
hostname:
type: string
example: ''
port:
type: number
example: 8080
useSsl:
type: boolean
example: false
user:
type: string
example: ''
password:
type: string
example: ''
bypassFilter:
type: string
example: ''
bypassLocalAddresses:
type: boolean
example: true
dnsCache:
type: object
properties:
enabled:
type: boolean
example: false
forceMinTtl:
type: number
example: 0
forceMaxTtl:
type: number
example: -1
PlexLibrary: PlexLibrary:
type: object type: object
properties: properties:
@@ -408,6 +519,20 @@ components:
serverID: serverID:
type: string type: string
readOnly: true readOnly: true
MetadataSettings:
type: object
properties:
settings:
type: object
properties:
tv:
type: string
enum: [tvdb, tmdb]
example: 'tvdb'
anime:
type: string
enum: [tvdb, tmdb]
example: 'tvdb'
TautulliSettings: TautulliSettings:
type: object type: object
properties: properties:
@@ -1326,6 +1451,9 @@ components:
type: string type: string
jsonPayload: jsonPayload:
type: string type: string
supportVariables:
type: boolean
example: false
TelegramSettings: TelegramSettings:
type: object type: object
properties: properties:
@@ -2457,6 +2585,67 @@ paths:
type: string type: string
thumb: thumb:
type: string type: string
/settings/metadatas:
get:
summary: Get Metadata settings
description: Retrieves current Metadata settings.
tags:
- settings
responses:
'200':
description: OK
content:
application/json:
schema:
$ref: '#/components/schemas/MetadataSettings'
put:
summary: Update Metadata settings
description: Updates Metadata settings with the provided values.
tags:
- settings
requestBody:
required: true
content:
application/json:
schema:
$ref: '#/components/schemas/MetadataSettings'
responses:
'200':
description: 'Values were successfully updated'
content:
application/json:
schema:
$ref: '#/components/schemas/MetadataSettings'
/settings/metadatas/test:
post:
summary: Test Provider configuration
description: Tests if the TVDB configuration is valid. Returns a list of available languages on success.
tags:
- settings
requestBody:
required: true
content:
application/json:
schema:
type: object
properties:
tmdb:
type: boolean
example: true
tvdb:
type: boolean
example: true
responses:
'200':
description: Succesfully connected to TVDB
content:
application/json:
schema:
type: object
properties:
message:
type: string
example: 'Successfully connected to TVDB'
/settings/tautulli: /settings/tautulli:
get: get:
summary: Get Tautulli settings summary: Get Tautulli settings
@@ -2898,6 +3087,68 @@ paths:
imageCount: imageCount:
type: number type: number
example: 123 example: 123
dnsCache:
type: object
properties:
stats:
type: object
properties:
size:
type: number
example: 1
maxSize:
type: number
example: 500
hits:
type: number
example: 19
misses:
type: number
example: 1
failures:
type: number
example: 0
ipv4Fallbacks:
type: number
example: 0
hitRate:
type: number
example: 0.95
entries:
type: array
additionalProperties:
type: object
properties:
addresses:
type: object
properties:
ipv4:
type: number
example: 1
ipv6:
type: number
example: 1
activeAddress:
type: string
example: 127.0.0.1
family:
type: number
example: 4
age:
type: number
example: 10
ttl:
type: number
example: 10
networkErrors:
type: number
example: 0
hits:
type: number
example: 1
misses:
type: number
example: 1
apiCaches: apiCaches:
type: array type: array
items: items:
@@ -2937,6 +3188,21 @@ paths:
responses: responses:
'204': '204':
description: 'Flushed cache' description: 'Flushed cache'
/settings/cache/dns/{dnsEntry}/flush:
post:
summary: Flush a specific DNS cache entry
description: Flushes a specific DNS cache entry
tags:
- settings
parameters:
- in: path
name: dnsEntry
required: true
schema:
type: string
responses:
'204':
description: 'Flushed dns cache'
/settings/logs: /settings/logs:
get: get:
summary: Returns logs summary: Returns logs
@@ -4469,11 +4735,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/UserSettings'
properties:
username:
type: string
example: 'Mr User'
post: post:
summary: Update general settings for a user summary: Update general settings for a user
description: Updates and returns general settings for a specific user. Requires `MANAGE_USERS` permission if editing other users. description: Updates and returns general settings for a specific user. Requires `MANAGE_USERS` permission if editing other users.
@@ -4490,22 +4752,14 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/UserSettings'
properties:
username:
type: string
nullable: true
responses: responses:
'200': '200':
description: Updated user general settings returned description: Updated user general settings returned
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/UserSettings'
properties:
username:
type: string
example: 'Mr User'
/user/{userId}/settings/password: /user/{userId}/settings/password:
get: get:
summary: Get password page informatiom summary: Get password page informatiom
@@ -4944,6 +5198,12 @@ paths:
schema: schema:
type: string type: string
example: 1,2 example: 1,2
- in: query
name: excludeKeywords
schema:
type: string
example: 3,4
description: Comma-separated list of keyword IDs to exclude from results
- in: query - in: query
name: sortBy name: sortBy
schema: schema:
@@ -5264,6 +5524,12 @@ paths:
schema: schema:
type: string type: string
example: 1,2 example: 1,2
- in: query
name: excludeKeywords
schema:
type: string
example: 3,4
description: Comma-separated list of keyword IDs to exclude from results
- in: query - in: query
name: sortBy name: sortBy
schema: schema:
@@ -5887,7 +6153,7 @@ paths:
get: get:
summary: Gets request counts summary: Gets request counts
description: | description: |
Returns the number of pending and approved requests. Returns the number of requests by status including pending, approved, available, and completed requests.
tags: tags:
- request - request
responses: responses:
@@ -5914,6 +6180,8 @@ paths:
type: number type: number
available: available:
type: number type: number
completed:
type: number
/request/{requestId}: /request/{requestId}:
get: get:
summary: Get MediaRequest summary: Get MediaRequest
@@ -6296,7 +6564,7 @@ paths:
application/json: application/json:
schema: schema:
$ref: '#/components/schemas/TvDetails' $ref: '#/components/schemas/TvDetails'
/tv/{tvId}/season/{seasonId}: /tv/{tvId}/season/{seasonNumber}:
get: get:
summary: Get season details and episode list summary: Get season details and episode list
description: Returns season details with a list of episodes in a JSON object. description: Returns season details with a list of episodes in a JSON object.
@@ -6310,11 +6578,11 @@ paths:
type: number type: number
example: 76479 example: 76479
- in: path - in: path
name: seasonId name: seasonNumber
required: true required: true
schema: schema:
type: number type: number
example: 1 example: 123456
- in: query - in: query
name: language name: language
schema: schema:
@@ -6599,9 +6867,16 @@ paths:
example: '1' example: '1'
schema: schema:
type: string type: string
- in: query
name: is4k
description: Whether to remove from 4K service instance (true) or regular service instance (false)
required: false
example: false
schema:
type: boolean
responses: responses:
'204': '204':
description: Succesfully removed media item description: Successfully removed media item
/media/{mediaId}/{status}: /media/{mediaId}/{status}:
post: post:
summary: Update media status summary: Update media status
@@ -7268,11 +7543,22 @@ paths:
example: 1 example: 1
responses: responses:
'200': '200':
description: Keyword returned description: Keyword returned (null if not found)
content: content:
application/json: application/json:
schema: schema:
nullable: true
$ref: '#/components/schemas/Keyword' $ref: '#/components/schemas/Keyword'
'500':
description: Internal server error
content:
application/json:
schema:
type: object
properties:
message:
type: string
example: 'Unable to retrieve keyword data.'
/watchproviders/regions: /watchproviders/regions:
get: get:
summary: Get watch provider regions summary: Get watch provider regions

View File

@@ -2,6 +2,7 @@
"name": "jellyseerr", "name": "jellyseerr",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"packageManager": "pnpm@10.17.1",
"scripts": { "scripts": {
"preinstall": "npx only-allow pnpm", "preinstall": "npx only-allow pnpm",
"postinstall": "node postinstall-win.js", "postinstall": "node postinstall-win.js",
@@ -57,6 +58,7 @@
"cronstrue": "2.23.0", "cronstrue": "2.23.0",
"date-fns": "2.29.3", "date-fns": "2.29.3",
"dayjs": "1.11.7", "dayjs": "1.11.7",
"dns-caching": "^0.2.7",
"email-templates": "12.0.1", "email-templates": "12.0.1",
"email-validator": "2.0.4", "email-validator": "2.0.4",
"express": "4.21.2", "express": "4.21.2",
@@ -115,11 +117,8 @@
"zod": "3.24.2" "zod": "3.24.2"
}, },
"devDependencies": { "devDependencies": {
"@codedependant/semantic-release-docker": "^5.1.0",
"@commitlint/cli": "17.4.4", "@commitlint/cli": "17.4.4",
"@commitlint/config-conventional": "17.4.4", "@commitlint/config-conventional": "17.4.4",
"@semantic-release/changelog": "6.0.3",
"@semantic-release/git": "10.0.1",
"@tailwindcss/aspect-ratio": "0.4.2", "@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.10", "@tailwindcss/forms": "0.5.10",
"@tailwindcss/typography": "0.5.16", "@tailwindcss/typography": "0.5.16",
@@ -169,7 +168,6 @@
"prettier": "2.8.4", "prettier": "2.8.4",
"prettier-plugin-organize-imports": "3.2.2", "prettier-plugin-organize-imports": "3.2.2",
"prettier-plugin-tailwindcss": "0.2.3", "prettier-plugin-tailwindcss": "0.2.3",
"semantic-release": "24.2.7",
"tailwindcss": "3.2.7", "tailwindcss": "3.2.7",
"ts-node": "10.9.1", "ts-node": "10.9.1",
"tsc-alias": "1.8.2", "tsc-alias": "1.8.2",
@@ -178,7 +176,7 @@
}, },
"engines": { "engines": {
"node": "^22.0.0", "node": "^22.0.0",
"pnpm": "^9.0.0" "pnpm": "^10.0.0"
}, },
"overrides": { "overrides": {
"sqlite3/node-gyp": "8.4.1", "sqlite3/node-gyp": "8.4.1",
@@ -207,28 +205,12 @@
"plugins": [ "plugins": [
"@semantic-release/commit-analyzer", "@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator", "@semantic-release/release-notes-generator",
[
"@semantic-release/changelog",
{
"changelogFile": "CHANGELOG.md"
}
],
"@semantic-release/npm", "@semantic-release/npm",
[
"@semantic-release/git",
{
"assets": [
"package.json",
"CHANGELOG.md"
],
"message": "chore(release): ${nextRelease.version}"
}
],
[ [
"@codedependant/semantic-release-docker", "@codedependant/semantic-release-docker",
{ {
"dockerArgs": { "dockerArgs": {
"COMMIT_TAG": "$GIT_SHA" "COMMIT_TAG": "${GITHUB_SHA}"
}, },
"dockerLogin": false, "dockerLogin": false,
"dockerProject": "fallenbagel", "dockerProject": "fallenbagel",
@@ -249,7 +231,7 @@
"@codedependant/semantic-release-docker", "@codedependant/semantic-release-docker",
{ {
"dockerArgs": { "dockerArgs": {
"COMMIT_TAG": "$GIT_SHA" "COMMIT_TAG": "${GITHUB_SHA}"
}, },
"dockerLogin": false, "dockerLogin": false,
"dockerRegistry": "ghcr.io", "dockerRegistry": "ghcr.io",
@@ -282,5 +264,11 @@
"@codedependant/semantic-release-docker", "@codedependant/semantic-release-docker",
"@semantic-release/github" "@semantic-release/github"
] ]
},
"pnpm": {
"onlyBuiltDependencies": [
"sqlite3",
"bcrypt"
]
} }
} }

1961
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -48,6 +48,7 @@ export interface AnidbItem {
tvdbId?: number; tvdbId?: number;
tmdbId?: number; tmdbId?: number;
imdbId?: string; imdbId?: string;
tvdbSeason?: number;
} }
class AnimeListMapping { class AnimeListMapping {
@@ -97,6 +98,7 @@ class AnimeListMapping {
tvdbId: anime.$.defaulttvdbseason === '0' ? undefined : tvdbId, tvdbId: anime.$.defaulttvdbseason === '0' ? undefined : tvdbId,
tmdbId: tmdbId, tmdbId: tmdbId,
imdbId: imdbIds[0], // this is used for one AniDB -> one imdb movie mapping imdbId: imdbIds[0], // this is used for one AniDB -> one imdb movie mapping
tvdbSeason: Number(anime.$.defaulttvdbseason),
}; };
if (tvdbId) { if (tvdbId) {

View File

@@ -10,7 +10,7 @@ const DEFAULT_TTL = 300;
// 10 seconds default rolling buffer (in ms) // 10 seconds default rolling buffer (in ms)
const DEFAULT_ROLLING_BUFFER = 10000; const DEFAULT_ROLLING_BUFFER = 10000;
interface ExternalAPIOptions { export interface ExternalAPIOptions {
nodeCache?: NodeCache; nodeCache?: NodeCache;
headers?: Record<string, unknown>; headers?: Record<string, unknown>;
rateLimit?: { rateLimit?: {

View File

@@ -103,6 +103,7 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
Tmdb?: string; Tmdb?: string;
Imdb?: string; Imdb?: string;
Tvdb?: string; Tvdb?: string;
AniDB?: string;
}; };
MediaSources?: JellyfinMediaSource[]; MediaSources?: JellyfinMediaSource[];
Width?: number; Width?: number;

39
server/api/metadata.ts Normal file
View File

@@ -0,0 +1,39 @@
import type { TvShowProvider } from '@server/api/provider';
import TheMovieDb from '@server/api/themoviedb';
import Tvdb from '@server/api/tvdb';
import { getSettings, MetadataProviderType } from '@server/lib/settings';
import logger from '@server/logger';
export const getMetadataProvider = async (
mediaType: 'movie' | 'tv' | 'anime'
): Promise<TvShowProvider> => {
try {
const settings = await getSettings();
if (mediaType == 'movie') {
return new TheMovieDb();
}
if (
mediaType == 'tv' &&
settings.metadataSettings.tv == MetadataProviderType.TVDB
) {
return await Tvdb.getInstance();
}
if (
mediaType == 'anime' &&
settings.metadataSettings.anime == MetadataProviderType.TVDB
) {
return await Tvdb.getInstance();
}
return new TheMovieDb();
} catch (e) {
logger.error('Failed to get metadata provider', {
label: 'Metadata',
message: e.message,
});
return new TheMovieDb();
}
};

View File

@@ -113,7 +113,7 @@ interface MetadataResponse {
ratingKey: string; ratingKey: string;
type: 'movie' | 'show'; type: 'movie' | 'show';
title: string; title: string;
Guid: { Guid?: {
id: `imdb://tt${number}` | `tmdb://${number}` | `tvdb://${number}`; id: `imdb://tt${number}` | `tmdb://${number}` | `tvdb://${number}`;
}[]; }[];
}[]; }[];
@@ -277,9 +277,18 @@ class PlexTvAPI extends ExternalAPI {
}> { }> {
try { try {
const watchlistCache = cacheManager.getCache('plexwatchlist'); const watchlistCache = cacheManager.getCache('plexwatchlist');
logger.debug('Fetching watchlist from Plex.TV', {
offset,
size,
label: 'Plex.TV Metadata API',
});
let cachedWatchlist = watchlistCache.data.get<PlexWatchlistCache>( let cachedWatchlist = watchlistCache.data.get<PlexWatchlistCache>(
this.authToken this.authToken
); );
logger.debug(`Found cached watchlist: ${!!cachedWatchlist}`, {
cachedWatchlist,
label: 'Plex.TV Metadata API',
});
const response = await this.axios.get<WatchlistResponse>( const response = await this.axios.get<WatchlistResponse>(
'/library/sections/watchlist/all', '/library/sections/watchlist/all',
@@ -291,11 +300,15 @@ class PlexTvAPI extends ExternalAPI {
headers: { headers: {
'If-None-Match': cachedWatchlist?.etag, 'If-None-Match': cachedWatchlist?.etag,
}, },
baseURL: 'https://metadata.provider.plex.tv', baseURL: 'https://discover.provider.plex.tv',
validateStatus: (status) => status < 400, // Allow HTTP 304 to return without error validateStatus: (status) => status < 400, // Allow HTTP 304 to return without error
} }
); );
logger.debug(`Watchlist fetch returned status ${response.status}`, {
label: 'Plex.TV Metadata API',
});
// If we don't recieve HTTP 304, the watchlist has been updated and we need to update the cache. // If we don't recieve HTTP 304, the watchlist has been updated and we need to update the cache.
if (response.status >= 200 && response.status <= 299) { if (response.status >= 200 && response.status <= 299) {
cachedWatchlist = { cachedWatchlist = {
@@ -312,19 +325,32 @@ class PlexTvAPI extends ExternalAPI {
const watchlistDetails = await Promise.all( const watchlistDetails = await Promise.all(
(cachedWatchlist?.response.MediaContainer.Metadata ?? []).map( (cachedWatchlist?.response.MediaContainer.Metadata ?? []).map(
async (watchlistItem) => { async (watchlistItem) => {
const detailedResponse = await this.getRolling<MetadataResponse>( let detailedResponse: MetadataResponse;
`/library/metadata/${watchlistItem.ratingKey}`, try {
{ detailedResponse = await this.getRolling<MetadataResponse>(
baseURL: 'https://metadata.provider.plex.tv', `/library/metadata/${watchlistItem.ratingKey}`,
{
baseURL: 'https://discover.provider.plex.tv',
}
);
} catch (e) {
if (e.response?.status === 404) {
logger.warn(
`Item with ratingKey ${watchlistItem.ratingKey} not found, it may have been removed from the server.`,
{ label: 'Plex.TV Metadata API' }
);
return null;
} else {
throw e;
} }
); }
const metadata = detailedResponse.MediaContainer.Metadata[0]; const metadata = detailedResponse.MediaContainer.Metadata[0];
const tmdbString = metadata.Guid.find((guid) => const tmdbString = metadata.Guid?.find((guid) =>
guid.id.startsWith('tmdb') guid.id.startsWith('tmdb')
); );
const tvdbString = metadata.Guid.find((guid) => const tvdbString = metadata.Guid?.find((guid) =>
guid.id.startsWith('tvdb') guid.id.startsWith('tvdb')
); );
@@ -343,7 +369,9 @@ class PlexTvAPI extends ExternalAPI {
) )
); );
const filteredList = watchlistDetails.filter((detail) => detail.tmdbId); const filteredList = watchlistDetails.filter(
(detail) => detail?.tmdbId
) as PlexWatchlistItem[];
return { return {
offset, offset,

30
server/api/provider.ts Normal file
View File

@@ -0,0 +1,30 @@
import type {
TmdbSeasonWithEpisodes,
TmdbTvDetails,
} from '@server/api/themoviedb/interfaces';
export interface TvShowProvider {
getTvShow({
tvId,
language,
}: {
tvId: number;
language?: string;
}): Promise<TmdbTvDetails>;
getTvSeason({
tvId,
seasonNumber,
language,
}: {
tvId: number;
seasonNumber: number;
language?: string;
}): Promise<TmdbSeasonWithEpisodes>;
getShowByTvdbId({
tvdbId,
language,
}: {
tvdbId: number;
language?: string;
}): Promise<TmdbTvDetails>;
}

View File

@@ -145,6 +145,7 @@ export interface IMDBRating {
title: string; title: string;
url: string; url: string;
criticsScore: number; criticsScore: number;
criticsScoreCount: number;
} }
/** /**
@@ -187,6 +188,7 @@ class IMDBRadarrProxy extends ExternalAPI {
title: data[0].Title, title: data[0].Title,
url: `https://www.imdb.com/title/${data[0].ImdbId}`, url: `https://www.imdb.com/title/${data[0].ImdbId}`,
criticsScore: data[0].MovieRatings.Imdb.Value, criticsScore: data[0].MovieRatings.Imdb.Value,
criticsScoreCount: data[0].MovieRatings.Imdb.Count,
}; };
} catch (e) { } catch (e) {
throw new Error( throw new Error(

View File

@@ -198,6 +198,25 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
} }
}; };
public renameTag = async ({
id,
label,
}: {
id: number;
label: string;
}): Promise<Tag> => {
try {
const response = await this.axios.put<Tag>(`/tag/${id}`, {
id,
label,
});
return response.data;
} catch (e) {
throw new Error(`[${this.apiName}] Failed to rename tag: ${e.message}`);
}
};
async refreshMonitoredDownloads(): Promise<void> { async refreshMonitoredDownloads(): Promise<void> {
await this.runCommand('RefreshMonitoredDownloads', {}); await this.runCommand('RefreshMonitoredDownloads', {});
} }

View File

@@ -1,4 +1,5 @@
import ExternalAPI from '@server/api/externalapi'; import ExternalAPI from '@server/api/externalapi';
import type { TvShowProvider } from '@server/api/provider';
import cacheManager from '@server/lib/cache'; import cacheManager from '@server/lib/cache';
import { getSettings } from '@server/lib/settings'; import { getSettings } from '@server/lib/settings';
import { sortBy } from 'lodash'; import { sortBy } from 'lodash';
@@ -85,6 +86,7 @@ interface DiscoverMovieOptions {
genre?: string; genre?: string;
studio?: string; studio?: string;
keywords?: string; keywords?: string;
excludeKeywords?: string;
sortBy?: SortOptions; sortBy?: SortOptions;
watchRegion?: string; watchRegion?: string;
watchProviders?: string; watchProviders?: string;
@@ -110,6 +112,7 @@ interface DiscoverTvOptions {
genre?: string; genre?: string;
network?: number; network?: number;
keywords?: string; keywords?: string;
excludeKeywords?: string;
sortBy?: SortOptions; sortBy?: SortOptions;
watchRegion?: string; watchRegion?: string;
watchProviders?: string; watchProviders?: string;
@@ -120,7 +123,7 @@ interface DiscoverTvOptions {
certificationCountry?: string; certificationCountry?: string;
} }
class TheMovieDb extends ExternalAPI { class TheMovieDb extends ExternalAPI implements TvShowProvider {
private locale: string; private locale: string;
private discoverRegion?: string; private discoverRegion?: string;
private originalLanguage?: string; private originalLanguage?: string;
@@ -341,6 +344,13 @@ class TheMovieDb extends ExternalAPI {
} }
); );
data.episodes = data.episodes.map((episode) => {
if (episode.still_path) {
episode.still_path = `https://image.tmdb.org/t/p/original/${episode.still_path}`;
}
return episode;
});
return data; return data;
} catch (e) { } catch (e) {
throw new Error(`[TMDB] Failed to fetch TV show details: ${e.message}`); throw new Error(`[TMDB] Failed to fetch TV show details: ${e.message}`);
@@ -487,6 +497,7 @@ class TheMovieDb extends ExternalAPI {
genre, genre,
studio, studio,
keywords, keywords,
excludeKeywords,
withRuntimeGte, withRuntimeGte,
withRuntimeLte, withRuntimeLte,
voteAverageGte, voteAverageGte,
@@ -537,6 +548,7 @@ class TheMovieDb extends ExternalAPI {
with_genres: genre, with_genres: genre,
with_companies: studio, with_companies: studio,
with_keywords: keywords, with_keywords: keywords,
without_keywords: excludeKeywords,
'with_runtime.gte': withRuntimeGte, 'with_runtime.gte': withRuntimeGte,
'with_runtime.lte': withRuntimeLte, 'with_runtime.lte': withRuntimeLte,
'vote_average.gte': voteAverageGte, 'vote_average.gte': voteAverageGte,
@@ -569,6 +581,7 @@ class TheMovieDb extends ExternalAPI {
genre, genre,
network, network,
keywords, keywords,
excludeKeywords,
withRuntimeGte, withRuntimeGte,
withRuntimeLte, withRuntimeLte,
voteAverageGte, voteAverageGte,
@@ -620,6 +633,7 @@ class TheMovieDb extends ExternalAPI {
with_genres: genre, with_genres: genre,
with_networks: network, with_networks: network,
with_keywords: keywords, with_keywords: keywords,
without_keywords: excludeKeywords,
'with_runtime.gte': withRuntimeGte, 'with_runtime.gte': withRuntimeGte,
'with_runtime.lte': withRuntimeLte, 'with_runtime.lte': withRuntimeLte,
'vote_average.gte': voteAverageGte, 'vote_average.gte': voteAverageGte,
@@ -1054,7 +1068,7 @@ class TheMovieDb extends ExternalAPI {
keywordId, keywordId,
}: { }: {
keywordId: number; keywordId: number;
}): Promise<TmdbKeyword> { }): Promise<TmdbKeyword | null> {
try { try {
const data = await this.get<TmdbKeyword>( const data = await this.get<TmdbKeyword>(
`/keyword/${keywordId}`, `/keyword/${keywordId}`,
@@ -1064,6 +1078,9 @@ class TheMovieDb extends ExternalAPI {
return data; return data;
} catch (e) { } catch (e) {
if (e.response?.status === 404) {
return null;
}
throw new Error(`[TMDB] Failed to fetch keyword: ${e.message}`); throw new Error(`[TMDB] Failed to fetch keyword: ${e.message}`);
} }
} }

View File

@@ -220,7 +220,7 @@ export interface TmdbTvEpisodeResult {
show_id: number; show_id: number;
still_path: string; still_path: string;
vote_average: number; vote_average: number;
vote_cuont: number; vote_count: number;
} }
export interface TmdbTvSeasonResult { export interface TmdbTvSeasonResult {

563
server/api/tvdb/index.ts Normal file
View File

@@ -0,0 +1,563 @@
import ExternalAPI from '@server/api/externalapi';
import type { TvShowProvider } from '@server/api/provider';
import TheMovieDb from '@server/api/themoviedb';
import type {
TmdbSeasonWithEpisodes,
TmdbTvDetails,
TmdbTvEpisodeResult,
TmdbTvSeasonResult,
} from '@server/api/themoviedb/interfaces';
import {
convertTmdbLanguageToTvdbWithFallback,
type TvdbBaseResponse,
type TvdbEpisode,
type TvdbLoginResponse,
type TvdbSeasonDetails,
type TvdbTvDetails,
} from '@server/api/tvdb/interfaces';
import cacheManager, { type AvailableCacheIds } from '@server/lib/cache';
import logger from '@server/logger';
interface TvdbConfig {
baseUrl: string;
maxRequestsPerSecond: number;
maxRequests: number;
cachePrefix: AvailableCacheIds;
}
const DEFAULT_CONFIG: TvdbConfig = {
baseUrl: 'https://api4.thetvdb.com/v4',
maxRequestsPerSecond: 50,
maxRequests: 20,
cachePrefix: 'tvdb' as const,
};
const enum TvdbIdStatus {
INVALID = -1,
}
type TvdbId = number;
type ValidTvdbId = Exclude<TvdbId, TvdbIdStatus.INVALID>;
class Tvdb extends ExternalAPI implements TvShowProvider {
static instance: Tvdb;
private readonly tmdb: TheMovieDb;
private static readonly DEFAULT_CACHE_TTL = 43200;
private static readonly DEFAULT_LANGUAGE = 'eng';
private token: string;
private pin?: string;
constructor(pin?: string) {
const finalConfig = { ...DEFAULT_CONFIG };
super(
finalConfig.baseUrl,
{},
{
nodeCache: cacheManager.getCache(finalConfig.cachePrefix).data,
rateLimit: {
maxRequests: finalConfig.maxRequests,
maxRPS: finalConfig.maxRequestsPerSecond,
},
}
);
this.pin = pin;
this.tmdb = new TheMovieDb();
}
public static async getInstance(): Promise<Tvdb> {
if (!this.instance) {
this.instance = new Tvdb();
await this.instance.login();
}
return this.instance;
}
private async refreshToken(): Promise<void> {
try {
if (!this.token) {
await this.login();
return;
}
const base64Url = this.token.split('.')[1];
const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
const payload = JSON.parse(Buffer.from(base64, 'base64').toString());
if (!payload.exp) {
await this.login();
}
const now = Math.floor(Date.now() / 1000);
const diff = payload.exp - now;
// refresh token 1 week before expiration
if (diff < 604800) {
await this.login();
}
} catch (error) {
this.handleError('Failed to refresh token', error);
}
}
public async test(): Promise<void> {
try {
await this.login();
} catch (error) {
this.handleError('Login failed', error);
throw error;
}
}
async login(): Promise<TvdbLoginResponse> {
let body: { apiKey: string; pin?: string } = {
apiKey: 'd00d9ecb-a9d0-4860-958a-74b14a041405',
};
if (this.pin) {
body = {
...body,
pin: this.pin,
};
}
const response = await this.post<TvdbBaseResponse<TvdbLoginResponse>>(
'/login',
{
...body,
}
);
this.token = response.data.token;
return response.data;
}
public async getShowByTvdbId({
tvdbId,
language,
}: {
tvdbId: number;
language?: string;
}): Promise<TmdbTvDetails> {
try {
const tmdbTvShow = await this.tmdb.getShowByTvdbId({
tvdbId: tvdbId,
language,
});
try {
await this.refreshToken();
const validTvdbId = this.getTvdbIdFromTmdb(tmdbTvShow);
if (this.isValidTvdbId(validTvdbId)) {
return this.enrichTmdbShowWithTvdbData(tmdbTvShow, validTvdbId);
}
return tmdbTvShow;
} catch (error) {
return tmdbTvShow;
}
} catch (error) {
this.handleError('Failed to fetch TV show details', error);
throw error;
}
}
public async getTvShow({
tvId,
language,
}: {
tvId: number;
language?: string;
}): Promise<TmdbTvDetails> {
try {
const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language });
try {
await this.refreshToken();
const tvdbId = this.getTvdbIdFromTmdb(tmdbTvShow);
if (this.isValidTvdbId(tvdbId)) {
return await this.enrichTmdbShowWithTvdbData(tmdbTvShow, tvdbId);
}
return tmdbTvShow;
} catch (error) {
this.handleError('Failed to fetch TV show details', error);
return tmdbTvShow;
}
} catch (error) {
this.handleError('Failed to fetch TV show details', error);
return this.tmdb.getTvShow({ tvId, language });
}
}
public async getTvSeason({
tvId,
seasonNumber,
language = Tvdb.DEFAULT_LANGUAGE,
}: {
tvId: number;
seasonNumber: number;
language?: string;
}): Promise<TmdbSeasonWithEpisodes> {
try {
const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language });
try {
await this.refreshToken();
const tvdbId = this.getTvdbIdFromTmdb(tmdbTvShow);
if (!this.isValidTvdbId(tvdbId)) {
return await this.tmdb.getTvSeason({ tvId, seasonNumber, language });
}
return await this.getTvdbSeasonData(
tvdbId,
seasonNumber,
tvId,
language
);
} catch (error) {
this.handleError('Failed to fetch TV season details', error);
return await this.tmdb.getTvSeason({ tvId, seasonNumber, language });
}
} catch (error) {
logger.error(
`[TVDB] Failed to fetch TV season details: ${error.message}`
);
throw error;
}
}
private async enrichTmdbShowWithTvdbData(
tmdbTvShow: TmdbTvDetails,
tvdbId: ValidTvdbId
): Promise<TmdbTvDetails> {
try {
await this.refreshToken();
const tvdbData = await this.fetchTvdbShowData(tvdbId);
const seasons = this.processSeasons(tvdbData);
if (!seasons.length) {
return tmdbTvShow;
}
return { ...tmdbTvShow, seasons };
} catch (error) {
logger.error(
`Failed to enrich TMDB show with TVDB data: ${error.message} token: ${this.token}`
);
return tmdbTvShow;
}
}
private async fetchTvdbShowData(tvdbId: number): Promise<TvdbTvDetails> {
const resp = await this.get<TvdbBaseResponse<TvdbTvDetails>>(
`/series/${tvdbId}/extended?meta=episodes&short=true`,
{
headers: {
Authorization: `Bearer ${this.token}`,
},
},
Tvdb.DEFAULT_CACHE_TTL
);
return resp.data;
}
private processSeasons(tvdbData: TvdbTvDetails): TmdbTvSeasonResult[] {
if (!tvdbData || !tvdbData.seasons || !tvdbData.episodes) {
return [];
}
const seasons = tvdbData.seasons
.filter((season) => season.type && season.type.type === 'official')
.sort((a, b) => a.number - b.number)
.map((season) => this.createSeasonData(season, tvdbData))
.filter(
(season) => season && season.season_number >= 0
) as TmdbTvSeasonResult[];
return seasons;
}
private createSeasonData(
season: TvdbSeasonDetails,
tvdbData: TvdbTvDetails
): TmdbTvSeasonResult {
const seasonNumber = season.number ?? -1;
if (seasonNumber < 0) {
return {
id: 0,
episode_count: 0,
name: '',
overview: '',
season_number: -1,
poster_path: '',
air_date: '',
};
}
const episodeCount = tvdbData.episodes.filter(
(episode) => episode.seasonNumber === season.number
).length;
return {
id: tvdbData.id,
episode_count: episodeCount,
name: `${season.number}`,
overview: '',
season_number: season.number,
poster_path: '',
air_date: '',
};
}
private async getTvdbSeasonData(
tvdbId: number,
seasonNumber: number,
tvId: number,
language: string = Tvdb.DEFAULT_LANGUAGE
): Promise<TmdbSeasonWithEpisodes> {
const tvdbData = await this.fetchTvdbShowData(tvdbId);
if (!tvdbData) {
logger.error(`Failed to fetch TVDB data for ID: ${tvdbId}`);
return this.createEmptySeasonResponse(tvId);
}
// get season id
const season = tvdbData.seasons.find(
(season) =>
season.number === seasonNumber &&
season.type.type &&
season.type.type === 'official'
);
if (!season) {
logger.error(
`Failed to find season ${seasonNumber} for TVDB ID: ${tvdbId}`
);
return this.createEmptySeasonResponse(tvId);
}
const wantedTranslation = convertTmdbLanguageToTvdbWithFallback(
language,
Tvdb.DEFAULT_LANGUAGE
);
// check if translation is available for the season
const availableTranslation = season.nameTranslations.filter(
(translation) =>
translation === wantedTranslation ||
translation === Tvdb.DEFAULT_LANGUAGE
);
if (!availableTranslation) {
return this.getSeasonWithOriginalLanguage(
tvdbId,
tvId,
seasonNumber,
season
);
}
return this.getSeasonWithTranslation(
tvdbId,
tvId,
seasonNumber,
season,
wantedTranslation
);
}
private async getSeasonWithTranslation(
tvdbId: number,
tvId: number,
seasonNumber: number,
season: TvdbSeasonDetails,
language: string
): Promise<TmdbSeasonWithEpisodes> {
if (!season) {
logger.error(
`Failed to find season ${seasonNumber} for TVDB ID: ${tvdbId}`
);
return this.createEmptySeasonResponse(tvId);
}
const allEpisodes = [] as TvdbEpisode[];
let page = 0;
// Limit to max 50 pages to avoid infinite loops.
// 50 pages with 500 items per page = 25_000 episodes in a series which should be more than enough
const maxPages = 50;
while (page < maxPages) {
const resp = await this.get<TvdbBaseResponse<TvdbSeasonDetails>>(
`/series/${tvdbId}/episodes/default/${language}`,
{
headers: {
Authorization: `Bearer ${this.token}`,
},
params: {
page: page,
},
}
);
if (!resp?.data?.episodes) {
logger.warn(
`No episodes found for TVDB ID: ${tvdbId} on page ${page} for season ${seasonNumber}`
);
break;
}
const { episodes } = resp.data;
if (!episodes) {
logger.debug(
`No more episodes found for TVDB ID: ${tvdbId} on page ${page} for season ${seasonNumber}`
);
break;
}
allEpisodes.push(...episodes);
const hasNextPage = resp.links?.next && episodes.length > 0;
if (!hasNextPage) {
break;
}
page++;
}
if (page >= maxPages) {
logger.warn(
`Reached max pages (${maxPages}) for TVDB ID: ${tvdbId} on season ${seasonNumber} with language ${language}. There might be more episodes available.`
);
}
const episodes = this.processEpisodes(
{ ...season, episodes: allEpisodes },
seasonNumber,
tvId
);
return {
episodes,
external_ids: { tvdb_id: tvdbId },
name: '',
overview: '',
id: season.id,
air_date: season.firstAired,
season_number: episodes.length,
};
}
private async getSeasonWithOriginalLanguage(
tvdbId: number,
tvId: number,
seasonNumber: number,
season: TvdbSeasonDetails
): Promise<TmdbSeasonWithEpisodes> {
if (!season) {
logger.error(
`Failed to find season ${seasonNumber} for TVDB ID: ${tvdbId}`
);
return this.createEmptySeasonResponse(tvId);
}
const resp = await this.get<TvdbBaseResponse<TvdbSeasonDetails>>(
`/seasons/${season.id}/extended`,
{
headers: {
Authorization: `Bearer ${this.token}`,
},
}
);
const seasons = resp.data;
const episodes = this.processEpisodes(seasons, seasonNumber, tvId);
return {
episodes,
external_ids: { tvdb_id: tvdbId },
name: '',
overview: '',
id: seasons.id,
air_date: seasons.firstAired,
season_number: episodes.length,
};
}
private processEpisodes(
tvdbSeason: TvdbSeasonDetails,
seasonNumber: number,
tvId: number
): TmdbTvEpisodeResult[] {
if (!tvdbSeason || !tvdbSeason.episodes) {
logger.error('No episodes found in TVDB season data');
return [];
}
return tvdbSeason.episodes
.filter((episode) => episode.seasonNumber === seasonNumber)
.map((episode, index) => this.createEpisodeData(episode, index, tvId));
}
private createEpisodeData(
episode: TvdbEpisode,
index: number,
tvId: number
): TmdbTvEpisodeResult {
return {
id: episode.id,
air_date: episode.aired,
episode_number: episode.number,
name: episode.name || `Episode ${index + 1}`,
overview: episode.overview || '',
season_number: episode.seasonNumber,
production_code: '',
show_id: tvId,
still_path:
episode.image && !episode.image.startsWith('https://')
? 'https://artworks.thetvdb.com' + episode.image
: '',
vote_average: 1,
vote_count: 1,
};
}
private createEmptySeasonResponse(tvId: number): TmdbSeasonWithEpisodes {
return {
episodes: [],
external_ids: { tvdb_id: tvId },
name: '',
overview: '',
id: 0,
air_date: '',
season_number: 0,
};
}
private getTvdbIdFromTmdb(tmdbTvShow: TmdbTvDetails): TvdbId {
return tmdbTvShow?.external_ids?.tvdb_id ?? TvdbIdStatus.INVALID;
}
private isValidTvdbId(tvdbId: TvdbId): tvdbId is ValidTvdbId {
return tvdbId !== TvdbIdStatus.INVALID;
}
private handleError(context: string, error: Error): void {
throw new Error(`[TVDB] ${context}: ${error.message}`);
}
}
export default Tvdb;

View File

@@ -0,0 +1,216 @@
import { type AvailableLocale } from '@server/types/languages';
export interface TvdbBaseResponse<T> {
data: T;
errors: string;
links?: TvdbPagination;
}
export interface TvdbPagination {
prev?: string;
self: string;
next?: string;
totalItems: number;
pageSize: number;
}
export interface TvdbLoginResponse {
token: string;
}
interface TvDetailsAliases {
language: string;
name: string;
}
interface TvDetailsStatus {
id: number;
name: string;
recordType: string;
keepUpdated: boolean;
}
export interface TvdbTvDetails {
id: number;
name: string;
slug: string;
image: string;
nameTranslations: string[];
overwiewTranslations: string[];
aliases: TvDetailsAliases[];
firstAired: Date;
lastAired: Date;
nextAired: Date | string;
score: number;
status: TvDetailsStatus;
originalCountry: string;
originalLanguage: string;
defaultSeasonType: string;
isOrderRandomized: boolean;
lastUpdated: Date;
averageRuntime: number;
seasons: TvdbSeasonDetails[];
episodes: TvdbEpisode[];
}
interface TvdbCompanyType {
companyTypeId: number;
companyTypeName: string;
}
interface TvdbParentCompany {
id?: number;
name?: string;
relation?: {
id?: number;
typeName?: string;
};
}
interface TvdbCompany {
id: number;
name: string;
slug: string;
nameTranslations?: string[];
overviewTranslations?: string[];
aliases?: string[];
country: string;
primaryCompanyType: number;
activeDate: string;
inactiveDate?: string;
companyType: TvdbCompanyType;
parentCompany: TvdbParentCompany;
tagOptions?: string[];
}
interface TvdbType {
id: number;
name: string;
type: string;
alternateName?: string;
}
interface TvdbArtwork {
id: number;
image: string;
thumbnail: string;
language: string;
type: number;
score: number;
width: number;
height: number;
includesText: boolean;
}
export interface TvdbEpisode {
id: number;
seriesId: number;
name: string;
aired: string;
runtime: number;
nameTranslations: string[];
overview?: string;
overviewTranslations: string[];
image: string;
imageType: number;
isMovie: number;
seasons?: string[];
number: number;
absoluteNumber: number;
seasonNumber: number;
lastUpdated: string;
finaleType?: string;
year: string;
}
export interface TvdbSeasonDetails {
id: number;
seriesId: number;
type: TvdbType;
number: number;
nameTranslations: string[];
overviewTranslations: string[];
image: string;
imageType: number;
companies: {
studio: TvdbCompany[];
network: TvdbCompany[];
production: TvdbCompany[];
distributor: TvdbCompany[];
special_effects: TvdbCompany[];
};
lastUpdated: string;
year: string;
episodes: TvdbEpisode[];
trailers: string[];
artwork: TvdbArtwork[];
tagOptions?: string[];
firstAired: string;
}
export interface TvdbEpisodeTranslation {
name: string;
overview: string;
language: string;
}
const TMDB_TO_TVDB_MAPPING: Record<string, string> & {
[key in AvailableLocale]: string;
} = {
ar: 'ara', // Arabic
bg: 'bul', // Bulgarian
ca: 'cat', // Catalan
cs: 'ces', // Czech
da: 'dan', // Danish
de: 'deu', // German
el: 'ell', // Greek
en: 'eng', // English
es: 'spa', // Spanish
fi: 'fin', // Finnish
fr: 'fra', // French
he: 'heb', // Hebrew
hi: 'hin', // Hindi
hr: 'hrv', // Croatian
hu: 'hun', // Hungarian
it: 'ita', // Italian
ja: 'jpn', // Japanese
ko: 'kor', // Korean
lt: 'lit', // Lithuanian
nl: 'nld', // Dutch
pl: 'pol', // Polish
ro: 'ron', // Romanian
ru: 'rus', // Russian
sq: 'sqi', // Albanian
sr: 'srp', // Serbian
sv: 'swe', // Swedish
tr: 'tur', // Turkish
uk: 'ukr', // Ukrainian
'es-MX': 'spa', // Spanish (Latin America) -> Spanish
'nb-NO': 'nor', // Norwegian Bokmål -> Norwegian
'pt-BR': 'pt', // Portuguese (Brazil) -> Portuguese - Brazil (from TVDB data)
'pt-PT': 'por', // Portuguese (Portugal) -> Portuguese - Portugal (from TVDB data)
'zh-CN': 'zho', // Chinese (Simplified) -> Chinese - China
'zh-TW': 'zhtw', // Chinese (Traditional) -> Chinese - Taiwan
};
export function convertTMDBToTVDB(tmdbCode: string): string | null {
const normalizedCode = tmdbCode.toLowerCase();
return (
TMDB_TO_TVDB_MAPPING[tmdbCode] ||
TMDB_TO_TVDB_MAPPING[normalizedCode] ||
null
);
}
export function convertTmdbLanguageToTvdbWithFallback(
tmdbCode: string,
fallback: string
): string {
// First try exact match
const tvdbCode = convertTMDBToTVDB(tmdbCode);
if (tvdbCode) return tvdbCode;
return tvdbCode || fallback || 'eng'; // Default to English if no match found
}

View File

@@ -25,6 +25,7 @@ import imageproxy from '@server/routes/imageproxy';
import { appDataPermissions } from '@server/utils/appDataVolume'; import { appDataPermissions } from '@server/utils/appDataVolume';
import { getAppVersion } from '@server/utils/appVersion'; import { getAppVersion } from '@server/utils/appVersion';
import createCustomProxyAgent from '@server/utils/customProxyAgent'; import createCustomProxyAgent from '@server/utils/customProxyAgent';
import { initializeDnsCache } from '@server/utils/dnsCache';
import restartFlag from '@server/utils/restartFlag'; import restartFlag from '@server/utils/restartFlag';
import { getClientIp } from '@supercharge/request-ip'; import { getClientIp } from '@supercharge/request-ip';
import axios from 'axios'; import axios from 'axios';
@@ -80,6 +81,14 @@ app
axios.defaults.httpsAgent = new https.Agent({ family: 4 }); axios.defaults.httpsAgent = new https.Agent({ family: 4 });
} }
// Add DNS caching
if (settings.network.dnsCache?.enabled) {
initializeDnsCache({
forceMinTtl: settings.network.dnsCache.forceMinTtl,
forceMaxTtl: settings.network.dnsCache.forceMaxTtl,
});
}
// Register HTTP proxy // Register HTTP proxy
if (settings.network.proxy.enabled) { if (settings.network.proxy.enabled) {
await createCustomProxyAgent(settings.network.proxy); await createCustomProxyAgent(settings.network.proxy);

View File

@@ -1,3 +1,4 @@
import type { DnsEntries, DnsStats } from 'dns-caching';
import type { PaginatedResponse } from './common'; import type { PaginatedResponse } from './common';
export type LogMessage = { export type LogMessage = {
@@ -64,6 +65,10 @@ export interface CacheItem {
export interface CacheResponse { export interface CacheResponse {
apiCaches: CacheItem[]; apiCaches: CacheItem[];
imageCache: Record<'tmdb' | 'avatar', { size: number; imageCount: number }>; imageCache: Record<'tmdb' | 'avatar', { size: number; imageCount: number }>;
dnsCache: {
stats: DnsStats | undefined;
entries: DnsEntries | undefined;
};
} }
export interface StatusResponse { export interface StatusResponse {

View File

@@ -72,6 +72,7 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
const blacklistedTagsArr = blacklistedTags.split(','); const blacklistedTagsArr = blacklistedTags.split(',');
const pageLimit = settings.main.blacklistedTagsLimit; const pageLimit = settings.main.blacklistedTagsLimit;
const invalidKeywords = new Set<string>();
if (blacklistedTags.length === 0) { if (blacklistedTags.length === 0) {
return; return;
@@ -87,6 +88,19 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
// Iterate for each tag // Iterate for each tag
for (const tag of blacklistedTagsArr) { for (const tag of blacklistedTagsArr) {
const keywordDetails = await tmdb.getKeywordDetails({
keywordId: Number(tag),
});
if (keywordDetails === null) {
logger.warn('Skipping invalid keyword in blacklisted tags', {
label: 'Blacklisted Tags Processor',
keywordId: tag,
});
invalidKeywords.add(tag);
continue;
}
let queryMax = pageLimit * SortOptionsIterable.length; let queryMax = pageLimit * SortOptionsIterable.length;
let fixedSortMode = false; // Set to true when the page limit allows for getting every page of tag let fixedSortMode = false; // Set to true when the page limit allows for getting every page of tag
@@ -102,24 +116,51 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
throw new AbortTransaction(); throw new AbortTransaction();
} }
const response = await getDiscover({ try {
page, const response = await getDiscover({
sortBy, page,
keywords: tag, sortBy,
}); keywords: tag,
await this.processResults(response, tag, type, em); });
await new Promise((res) => setTimeout(res, TMDB_API_DELAY_MS));
this.progress++; await this.processResults(response, tag, type, em);
if (page === 1 && response.total_pages <= queryMax) { await new Promise((res) => setTimeout(res, TMDB_API_DELAY_MS));
// We will finish the tag with less queries than expected, move progress accordingly
this.progress += queryMax - response.total_pages; this.progress++;
fixedSortMode = true; if (page === 1 && response.total_pages <= queryMax) {
queryMax = response.total_pages; // We will finish the tag with less queries than expected, move progress accordingly
this.progress += queryMax - response.total_pages;
fixedSortMode = true;
queryMax = response.total_pages;
}
} catch (error) {
logger.error('Error processing keyword in blacklisted tags', {
label: 'Blacklisted Tags Processor',
keywordId: tag,
errorMessage: error.message,
});
} }
} }
} }
} }
if (invalidKeywords.size > 0) {
const currentTags = blacklistedTagsArr.filter(
(tag) => !invalidKeywords.has(tag)
);
const cleanedTags = currentTags.join(',');
if (cleanedTags !== blacklistedTags) {
settings.main.blacklistedTags = cleanedTags;
await settings.save();
logger.info('Cleaned up invalid keywords from settings', {
label: 'Blacklisted Tags Processor',
removedKeywords: Array.from(invalidKeywords),
newBlacklistedTags: cleanedTags,
});
}
}
} }
private async processResults( private async processResults(

View File

@@ -9,7 +9,8 @@ export type AvailableCacheIds =
| 'github' | 'github'
| 'plexguid' | 'plexguid'
| 'plextv' | 'plextv'
| 'plexwatchlist'; | 'plexwatchlist'
| 'tvdb';
const DEFAULT_TTL = 300; const DEFAULT_TTL = 300;
const DEFAULT_CHECK_PERIOD = 120; const DEFAULT_CHECK_PERIOD = 120;
@@ -70,6 +71,10 @@ class CacheManager {
checkPeriod: 60, checkPeriod: 60,
}), }),
plexwatchlist: new Cache('plexwatchlist', 'Plex Watchlist'), plexwatchlist: new Cache('plexwatchlist', 'Plex Watchlist'),
tvdb: new Cache('tvdb', 'The TVDB API', {
stdTtl: 21600,
checkPeriod: 60 * 30,
}),
}; };
public getCache(id: AvailableCacheIds): Cache { public getCache(id: AvailableCacheIds): Cache {

View File

@@ -109,7 +109,9 @@ class DiscordAgent
type: Notification, type: Notification,
payload: NotificationPayload payload: NotificationPayload
): DiscordRichEmbed { ): DiscordRichEmbed {
const { applicationUrl } = getSettings().main; const settings = getSettings();
const { applicationUrl } = settings.main;
const { embedPoster } = settings.notifications.agents.discord;
const appUrl = const appUrl =
applicationUrl || `http://localhost:${process.env.port || 5055}`; applicationUrl || `http://localhost:${process.env.port || 5055}`;
@@ -223,9 +225,11 @@ class DiscordAgent
} }
: undefined, : undefined,
fields, fields,
thumbnail: { thumbnail: embedPoster
url: payload.image, ? {
}, url: payload.image,
}
: undefined,
}; };
} }

View File

@@ -48,7 +48,9 @@ class EmailAgent
recipientEmail: string, recipientEmail: string,
recipientName?: string recipientName?: string
): EmailOptions | undefined { ): EmailOptions | undefined {
const { applicationUrl, applicationTitle } = getSettings().main; const settings = getSettings();
const { applicationUrl, applicationTitle } = settings.main;
const { embedPoster } = settings.notifications.agents.email;
if (type === Notification.TEST_NOTIFICATION) { if (type === Notification.TEST_NOTIFICATION) {
return { return {
@@ -129,7 +131,7 @@ class EmailAgent
body, body,
mediaName: payload.subject, mediaName: payload.subject,
mediaExtra: payload.extra ?? [], mediaExtra: payload.extra ?? [],
imageUrl: payload.image, imageUrl: embedPoster ? payload.image : undefined,
timestamp: new Date().toTimeString(), timestamp: new Date().toTimeString(),
requestedBy: payload.request.requestedBy.displayName, requestedBy: payload.request.requestedBy.displayName,
actionUrl: applicationUrl actionUrl: applicationUrl
@@ -176,7 +178,7 @@ class EmailAgent
issueComment: payload.comment?.message, issueComment: payload.comment?.message,
mediaName: payload.subject, mediaName: payload.subject,
extra: payload.extra ?? [], extra: payload.extra ?? [],
imageUrl: payload.image, imageUrl: embedPoster ? payload.image : undefined,
timestamp: new Date().toTimeString(), timestamp: new Date().toTimeString(),
actionUrl: applicationUrl actionUrl: applicationUrl
? `${applicationUrl}/issues/${payload.issue.id}` ? `${applicationUrl}/issues/${payload.issue.id}`

View File

@@ -22,7 +22,9 @@ class NtfyAgent
} }
private buildPayload(type: Notification, payload: NotificationPayload) { private buildPayload(type: Notification, payload: NotificationPayload) {
const { applicationUrl } = getSettings().main; const settings = getSettings();
const { applicationUrl } = settings.main;
const { embedPoster } = settings.notifications.agents.ntfy;
const topic = this.getSettings().options.topic; const topic = this.getSettings().options.topic;
const priority = 3; const priority = 3;
@@ -72,7 +74,7 @@ class NtfyAgent
message += `\n\n**${extra.name}**\n${extra.value}`; message += `\n\n**${extra.name}**\n${extra.value}`;
} }
const attach = payload.image; const attach = embedPoster ? payload.image : undefined;
let click; let click;
if (applicationUrl && payload.media) { if (applicationUrl && payload.media) {

View File

@@ -78,7 +78,9 @@ class PushoverAgent
type: Notification, type: Notification,
payload: NotificationPayload payload: NotificationPayload
): Promise<Partial<PushoverPayload>> { ): Promise<Partial<PushoverPayload>> {
const { applicationUrl, applicationTitle } = getSettings().main; const settings = getSettings();
const { applicationUrl, applicationTitle } = settings.main;
const { embedPoster } = settings.notifications.agents.pushover;
const title = payload.event ?? payload.subject; const title = payload.event ?? payload.subject;
let message = payload.event ? `<b>${payload.subject}</b>` : ''; let message = payload.event ? `<b>${payload.subject}</b>` : '';
@@ -155,7 +157,7 @@ class PushoverAgent
let attachment_base64; let attachment_base64;
let attachment_type; let attachment_type;
if (payload.image) { if (embedPoster && payload.image) {
const imagePayload = await this.getImagePayload(payload.image); const imagePayload = await this.getImagePayload(payload.image);
if (imagePayload.attachment_base64 && imagePayload.attachment_type) { if (imagePayload.attachment_base64 && imagePayload.attachment_type) {
attachment_base64 = imagePayload.attachment_base64; attachment_base64 = imagePayload.attachment_base64;

View File

@@ -63,7 +63,9 @@ class SlackAgent
type: Notification, type: Notification,
payload: NotificationPayload payload: NotificationPayload
): SlackBlockEmbed { ): SlackBlockEmbed {
const { applicationUrl, applicationTitle } = getSettings().main; const settings = getSettings();
const { applicationUrl, applicationTitle } = settings.main;
const { embedPoster } = settings.notifications.agents.slack;
const fields: EmbedField[] = []; const fields: EmbedField[] = [];
@@ -159,13 +161,14 @@ class SlackAgent
type: 'mrkdwn', type: 'mrkdwn',
text: payload.message, text: payload.message,
}, },
accessory: payload.image accessory:
? { embedPoster && payload.image
type: 'image', ? {
image_url: payload.image, type: 'image',
alt_text: payload.subject, image_url: payload.image,
} alt_text: payload.subject,
: undefined, }
: undefined,
}); });
} }

View File

@@ -65,7 +65,9 @@ class TelegramAgent
type: Notification, type: Notification,
payload: NotificationPayload payload: NotificationPayload
): Partial<TelegramMessagePayload | TelegramPhotoPayload> { ): Partial<TelegramMessagePayload | TelegramPhotoPayload> {
const { applicationUrl, applicationTitle } = getSettings().main; const settings = getSettings();
const { applicationUrl, applicationTitle } = settings.main;
const { embedPoster } = settings.notifications.agents.telegram;
/* eslint-disable no-useless-escape */ /* eslint-disable no-useless-escape */
let message = `\*${this.escapeText( let message = `\*${this.escapeText(
@@ -142,7 +144,7 @@ class TelegramAgent
} }
/* eslint-enable */ /* eslint-enable */
return payload.image return embedPoster && payload.image
? { ? {
photo: payload.image, photo: payload.image,
caption: message, caption: message,
@@ -160,7 +162,7 @@ class TelegramAgent
): Promise<boolean> { ): Promise<boolean> {
const settings = this.getSettings(); const settings = this.getSettings();
const endpoint = `${this.baseUrl}bot${settings.options.botAPI}/${ const endpoint = `${this.baseUrl}bot${settings.options.botAPI}/${
payload.image ? 'sendPhoto' : 'sendMessage' settings.embedPoster && payload.image ? 'sendPhoto' : 'sendMessage'
}`; }`;
const notificationPayload = this.getNotificationPayload(type, payload); const notificationPayload = this.getNotificationPayload(type, payload);

View File

@@ -177,9 +177,27 @@ class WebhookAgent
subject: payload.subject, subject: payload.subject,
}); });
let webhookUrl = settings.options.webhookUrl;
if (settings.options.supportVariables) {
Object.keys(KeyMap).forEach((keymapKey) => {
const keymapValue = KeyMap[keymapKey as keyof typeof KeyMap];
const variableValue =
type === Notification.TEST_NOTIFICATION
? 'test'
: typeof keymapValue === 'function'
? keymapValue(payload, type)
: get(payload, keymapValue) || 'test';
webhookUrl = webhookUrl.replace(
new RegExp(`{{${keymapKey}}}`, 'g'),
encodeURIComponent(variableValue)
);
});
}
try { try {
await axios.post( await axios.post(
settings.options.webhookUrl, webhookUrl,
this.buildPayload(type, payload), this.buildPayload(type, payload),
settings.options.authHeader settings.options.authHeader
? { ? {

View File

@@ -42,6 +42,8 @@ class WebPushAgent
type: Notification, type: Notification,
payload: NotificationPayload payload: NotificationPayload
): PushNotificationPayload { ): PushNotificationPayload {
const { embedPoster } = getSettings().notifications.agents.webpush;
const mediaType = payload.media const mediaType = payload.media
? payload.media.mediaType === MediaType.MOVIE ? payload.media.mediaType === MediaType.MOVIE
? 'movie' ? 'movie'
@@ -128,7 +130,7 @@ class WebPushAgent
notificationType: Notification[type], notificationType: Notification[type],
subject: payload.subject, subject: payload.subject,
message, message,
image: payload.image, image: embedPoster ? payload.image : undefined,
requestId: payload.request?.id, requestId: payload.request?.id,
actionUrl, actionUrl,
actionUrlTitle, actionUrlTitle,

View File

@@ -1,7 +1,13 @@
import animeList from '@server/api/animelist';
import type { JellyfinLibraryItem } from '@server/api/jellyfin'; import type { JellyfinLibraryItem } from '@server/api/jellyfin';
import JellyfinAPI from '@server/api/jellyfin'; import JellyfinAPI from '@server/api/jellyfin';
import { getMetadataProvider } from '@server/api/metadata';
import TheMovieDb from '@server/api/themoviedb'; import TheMovieDb from '@server/api/themoviedb';
import type { TmdbTvDetails } from '@server/api/themoviedb/interfaces'; import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
import type {
TmdbKeyword,
TmdbTvDetails,
} from '@server/api/themoviedb/interfaces';
import { MediaStatus, MediaType } from '@server/constants/media'; import { MediaStatus, MediaType } from '@server/constants/media';
import { MediaServerType } from '@server/constants/server'; import { MediaServerType } from '@server/constants/server';
import { getRepository } from '@server/datasource'; import { getRepository } from '@server/datasource';
@@ -40,9 +46,11 @@ class JellyfinScanner {
private enable4kMovie = false; private enable4kMovie = false;
private enable4kShow = false; private enable4kShow = false;
private asyncLock = new AsyncLock(); private asyncLock = new AsyncLock();
private processedAnidbSeason: Map<number, Map<number, number>>;
constructor({ isRecentOnly }: { isRecentOnly?: boolean } = {}) { constructor({ isRecentOnly }: { isRecentOnly?: boolean } = {}) {
this.tmdb = new TheMovieDb(); this.tmdb = new TheMovieDb();
this.isRecentOnly = isRecentOnly ?? false; this.isRecentOnly = isRecentOnly ?? false;
} }
@@ -60,7 +68,7 @@ class JellyfinScanner {
const mediaRepository = getRepository(Media); const mediaRepository = getRepository(Media);
try { try {
const metadata = await this.jfClient.getItemData(jellyfinitem.Id); let metadata = await this.jfClient.getItemData(jellyfinitem.Id);
const newMedia = new Media(); const newMedia = new Media();
if (!metadata?.Id) { if (!metadata?.Id) {
@@ -71,8 +79,18 @@ class JellyfinScanner {
return; return;
} }
const anidbId = Number(metadata.ProviderIds.AniDB ?? null);
newMedia.tmdbId = Number(metadata.ProviderIds.Tmdb ?? null); newMedia.tmdbId = Number(metadata.ProviderIds.Tmdb ?? null);
newMedia.imdbId = metadata.ProviderIds.Imdb; newMedia.imdbId = metadata.ProviderIds.Imdb;
// We use anidb only if we have the anidbId and nothing else
if (anidbId && !newMedia.imdbId && !newMedia.tmdbId) {
const result = animeList.getFromAnidbId(anidbId);
newMedia.tmdbId = Number(result?.tmdbId ?? null);
newMedia.imdbId = result?.imdbId;
}
if (newMedia.imdbId && !isNaN(newMedia.tmdbId)) { if (newMedia.imdbId && !isNaN(newMedia.tmdbId)) {
const tmdbMovie = await this.tmdb.getMediaByImdbId({ const tmdbMovie = await this.tmdb.getMediaByImdbId({
imdbId: newMedia.imdbId, imdbId: newMedia.imdbId,
@@ -83,6 +101,40 @@ class JellyfinScanner {
throw new Error('Unable to find TMDb ID'); throw new Error('Unable to find TMDb ID');
} }
// With AniDB we can have mixed libraries with movies in a "show" library
// We take the first episode of the first season (the movie) and use it to
// get more information, like the MediaSource
if (anidbId && metadata.Type === 'Series') {
const season = (await this.jfClient.getSeasons(jellyfinitem.Id)).find(
(md) => {
return md.IndexNumber === 1;
}
);
if (!season) {
this.log('No season found for anidb movie', 'debug', {
jellyfinitem,
});
return;
}
const episodes = await this.jfClient.getEpisodes(
jellyfinitem.Id,
season.Id
);
if (!episodes[0]) {
this.log('No episode found for anidb movie', 'debug', {
jellyfinitem,
});
return;
}
metadata = await this.jfClient.getItemData(episodes[0].Id);
if (!metadata) {
this.log('No metadata found for anidb movie', 'debug', {
jellyfinitem,
});
return;
}
}
const has4k = metadata.MediaSources?.some((MediaSource) => { const has4k = metadata.MediaSources?.some((MediaSource) => {
return MediaSource.MediaStreams.filter( return MediaSource.MediaStreams.filter(
(MediaStream) => MediaStream.Type === 'Video' (MediaStream) => MediaStream.Type === 'Video'
@@ -100,6 +152,12 @@ class JellyfinScanner {
}); });
await this.asyncLock.dispatch(newMedia.tmdbId, async () => { await this.asyncLock.dispatch(newMedia.tmdbId, async () => {
if (!metadata) {
// this will never execute, but typescript thinks somebody could reset tvShow from
// outer scope back to null before this async gets called
return;
}
const existing = await this.getExisting( const existing = await this.getExisting(
newMedia.tmdbId, newMedia.tmdbId,
MediaType.MOVIE MediaType.MOVIE
@@ -192,6 +250,42 @@ class JellyfinScanner {
} }
} }
private async getTvShow({
tmdbId,
tvdbId,
}: {
tmdbId?: number;
tvdbId?: number;
}): Promise<TmdbTvDetails> {
let tvShow;
if (tmdbId) {
tvShow = await this.tmdb.getTvShow({
tvId: Number(tmdbId),
});
} else if (tvdbId) {
tvShow = await this.tmdb.getShowByTvdbId({
tvdbId: Number(tvdbId),
});
} else {
throw new Error('No ID provided');
}
const metadataProvider = tvShow.keywords.results.some(
(keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
)
? await getMetadataProvider('anime')
: await getMetadataProvider('tv');
if (!(metadataProvider instanceof TheMovieDb)) {
tvShow = await metadataProvider.getTvShow({
tvId: Number(tmdbId),
});
}
return tvShow;
}
private async processShow(jellyfinitem: JellyfinLibraryItem) { private async processShow(jellyfinitem: JellyfinLibraryItem) {
const mediaRepository = getRepository(Media); const mediaRepository = getRepository(Media);
@@ -212,8 +306,8 @@ class JellyfinScanner {
if (metadata.ProviderIds.Tmdb) { if (metadata.ProviderIds.Tmdb) {
try { try {
tvShow = await this.tmdb.getTvShow({ tvShow = await this.getTvShow({
tvId: Number(metadata.ProviderIds.Tmdb), tmdbId: Number(metadata.ProviderIds.Tmdb),
}); });
} catch { } catch {
this.log('Unable to find TMDb ID for this title.', 'debug', { this.log('Unable to find TMDb ID for this title.', 'debug', {
@@ -223,7 +317,7 @@ class JellyfinScanner {
} }
if (!tvShow && metadata.ProviderIds.Tvdb) { if (!tvShow && metadata.ProviderIds.Tvdb) {
try { try {
tvShow = await this.tmdb.getShowByTvdbId({ tvShow = await this.getTvShow({
tvdbId: Number(metadata.ProviderIds.Tvdb), tvdbId: Number(metadata.ProviderIds.Tvdb),
}); });
} catch { } catch {
@@ -232,6 +326,28 @@ class JellyfinScanner {
}); });
} }
} }
let tvdbSeasonFromAnidb: number | undefined;
if (!tvShow && metadata.ProviderIds.AniDB) {
const anidbId = Number(metadata.ProviderIds.AniDB);
const result = animeList.getFromAnidbId(anidbId);
tvdbSeasonFromAnidb = result?.tvdbSeason;
if (result?.tvdbId) {
try {
tvShow = await this.tmdb.getShowByTvdbId({
tvdbId: result.tvdbId,
});
} catch {
this.log('Unable to find AniDB ID for this title.', 'debug', {
jellyfinitem,
});
}
}
// With AniDB we can have mixed libraries with movies in a "show" library
else if (result?.imdbId || result?.tmdbId) {
await this.processMovie(jellyfinitem);
return;
}
}
if (tvShow) { if (tvShow) {
await this.asyncLock.dispatch(tvShow.id, async () => { await this.asyncLock.dispatch(tvShow.id, async () => {
@@ -260,9 +376,20 @@ class JellyfinScanner {
for (const season of seasons) { for (const season of seasons) {
const JellyfinSeasons = await this.jfClient.getSeasons(Id); const JellyfinSeasons = await this.jfClient.getSeasons(Id);
const matchedJellyfinSeason = JellyfinSeasons.find( const matchedJellyfinSeason = JellyfinSeasons.find((md) => {
(md) => Number(md.IndexNumber) === season.season_number if (tvdbSeasonFromAnidb) {
); // In AniDB we don't have the concept of seasons,
// we have multiple shows with only Season 1 (and sometimes a season with index 0 for specials).
// We use tvdbSeasonFromAnidb to check if we are on the correct TMDB season and
// md.IndexNumber === 1 to be sure to find the correct season on jellyfin
return (
tvdbSeasonFromAnidb === season.season_number &&
md.IndexNumber === 1
);
} else {
return Number(md.IndexNumber) === season.season_number;
}
});
const existingSeason = media?.seasons.find( const existingSeason = media?.seasons.find(
(es) => es.seasonNumber === season.season_number (es) => es.seasonNumber === season.season_number
@@ -315,6 +442,29 @@ class JellyfinScanner {
} }
} }
// With AniDB we can have multiple shows for one season, so we need to save
// the episode from all the jellyfin entries to get the total
if (tvdbSeasonFromAnidb) {
if (this.processedAnidbSeason.has(tvShow.id)) {
const show = this.processedAnidbSeason.get(tvShow.id)!;
if (show.has(season.season_number)) {
show.set(
season.season_number,
show.get(season.season_number)! + totalStandard
);
totalStandard = show.get(season.season_number)!;
} else {
show.set(season.season_number, totalStandard);
}
} else {
this.processedAnidbSeason.set(
tvShow.id,
new Map([[season.season_number, totalStandard]])
);
}
}
if ( if (
media && media &&
(totalStandard > 0 || (total4k > 0 && !this.enable4kShow)) && (totalStandard > 0 || (total4k > 0 && !this.enable4kShow)) &&
@@ -527,6 +677,7 @@ class JellyfinScanner {
} }
private async processItems(slicedItems: JellyfinLibraryItem[]) { private async processItems(slicedItems: JellyfinLibraryItem[]) {
this.processedAnidbSeason = new Map();
await Promise.all( await Promise.all(
slicedItems.map(async (item) => { slicedItems.map(async (item) => {
if (item.Type === 'Movie') { if (item.Type === 'Movie') {
@@ -624,6 +775,8 @@ class JellyfinScanner {
(library) => library.enabled (library) => library.enabled
); );
await animeList.sync();
this.enable4kMovie = settings.radarr.some((radarr) => radarr.is4k); this.enable4kMovie = settings.radarr.some((radarr) => radarr.is4k);
if (this.enable4kMovie) { if (this.enable4kMovie) {
this.log( this.log(

View File

@@ -1,7 +1,13 @@
import animeList from '@server/api/animelist'; import animeList from '@server/api/animelist';
import { getMetadataProvider } from '@server/api/metadata';
import type { PlexLibraryItem, PlexMetadata } from '@server/api/plexapi'; import type { PlexLibraryItem, PlexMetadata } from '@server/api/plexapi';
import PlexAPI from '@server/api/plexapi'; import PlexAPI from '@server/api/plexapi';
import type { TmdbTvDetails } from '@server/api/themoviedb/interfaces'; import TheMovieDb from '@server/api/themoviedb';
import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
import type {
TmdbKeyword,
TmdbTvDetails,
} from '@server/api/themoviedb/interfaces';
import { getRepository } from '@server/datasource'; import { getRepository } from '@server/datasource';
import { User } from '@server/entity/User'; import { User } from '@server/entity/User';
import cacheManager from '@server/lib/cache'; import cacheManager from '@server/lib/cache';
@@ -249,6 +255,42 @@ class PlexScanner
}); });
} }
private async getTvShow({
tmdbId,
tvdbId,
}: {
tmdbId?: number;
tvdbId?: number;
}): Promise<TmdbTvDetails> {
let tvShow;
if (tmdbId) {
tvShow = await this.tmdb.getTvShow({
tvId: Number(tmdbId),
});
} else if (tvdbId) {
tvShow = await this.tmdb.getShowByTvdbId({
tvdbId: Number(tvdbId),
});
} else {
throw new Error('No ID provided');
}
const metadataProvider = tvShow.keywords.results.some(
(keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
)
? await getMetadataProvider('anime')
: await getMetadataProvider('tv');
if (!(metadataProvider instanceof TheMovieDb)) {
tvShow = await metadataProvider.getTvShow({
tvId: Number(tmdbId),
});
}
return tvShow;
}
private async processPlexShow(plexitem: PlexLibraryItem) { private async processPlexShow(plexitem: PlexLibraryItem) {
const ratingKey = const ratingKey =
plexitem.grandparentRatingKey ?? plexitem.grandparentRatingKey ??
@@ -273,7 +315,9 @@ class PlexScanner
await this.processHamaSpecials(metadata, mediaIds.tvdbId); await this.processHamaSpecials(metadata, mediaIds.tvdbId);
} }
const tvShow = await this.tmdb.getTvShow({ tvId: mediaIds.tmdbId }); const tvShow = await this.getTvShow({
tmdbId: mediaIds.tmdbId,
});
const seasons = tvShow.seasons; const seasons = tvShow.seasons;
const processableSeasons: ProcessableSeason[] = []; const processableSeasons: ProcessableSeason[] = [];

View File

@@ -100,6 +100,16 @@ interface Quota {
quotaDays?: number; quotaDays?: number;
} }
export enum MetadataProviderType {
TMDB = 'tmdb',
TVDB = 'tvdb',
}
export interface MetadataSettings {
tv: MetadataProviderType;
anime: MetadataProviderType;
}
export interface ProxySettings { export interface ProxySettings {
enabled: boolean; enabled: boolean;
hostname: string; hostname: string;
@@ -138,11 +148,29 @@ export interface MainSettings {
youtubeUrl: string; youtubeUrl: string;
} }
export interface ProxySettings {
enabled: boolean;
hostname: string;
port: number;
useSsl: boolean;
user: string;
password: string;
bypassFilter: string;
bypassLocalAddresses: boolean;
}
export interface DnsCacheSettings {
enabled: boolean;
forceMinTtl?: number;
forceMaxTtl?: number;
}
export interface NetworkSettings { export interface NetworkSettings {
csrfProtection: boolean; csrfProtection: boolean;
forceIpv4First: boolean; forceIpv4First: boolean;
trustProxy: boolean; trustProxy: boolean;
proxy: ProxySettings; proxy: ProxySettings;
dnsCache: DnsCacheSettings;
} }
interface PublicSettings { interface PublicSettings {
@@ -179,6 +207,7 @@ interface FullPublicSettings extends PublicSettings {
export interface NotificationAgentConfig { export interface NotificationAgentConfig {
enabled: boolean; enabled: boolean;
embedPoster: boolean;
types?: number; types?: number;
options: Record<string, unknown>; options: Record<string, unknown>;
} }
@@ -246,6 +275,7 @@ export interface NotificationAgentWebhook extends NotificationAgentConfig {
webhookUrl: string; webhookUrl: string;
jsonPayload: string; jsonPayload: string;
authHeader?: string; authHeader?: string;
supportVariables?: boolean;
}; };
} }
@@ -332,6 +362,8 @@ export interface AllSettings {
notifications: NotificationSettings; notifications: NotificationSettings;
jobs: Record<JobId, JobSettings>; jobs: Record<JobId, JobSettings>;
network: NetworkSettings; network: NetworkSettings;
metadataSettings: MetadataSettings;
migrations: string[];
} }
const SETTINGS_PATH = process.env.CONFIG_DIRECTORY const SETTINGS_PATH = process.env.CONFIG_DIRECTORY
@@ -392,6 +424,10 @@ class Settings {
apiKey: '', apiKey: '',
}, },
tautulli: {}, tautulli: {},
metadataSettings: {
tv: MetadataProviderType.TMDB,
anime: MetadataProviderType.TMDB,
},
radarr: [], radarr: [],
sonarr: [], sonarr: [],
public: { public: {
@@ -401,6 +437,7 @@ class Settings {
agents: { agents: {
email: { email: {
enabled: false, enabled: false,
embedPoster: true,
options: { options: {
userEmailRequired: false, userEmailRequired: false,
emailFrom: '', emailFrom: '',
@@ -415,6 +452,7 @@ class Settings {
}, },
discord: { discord: {
enabled: false, enabled: false,
embedPoster: true,
types: 0, types: 0,
options: { options: {
webhookUrl: '', webhookUrl: '',
@@ -424,6 +462,7 @@ class Settings {
}, },
slack: { slack: {
enabled: false, enabled: false,
embedPoster: true,
types: 0, types: 0,
options: { options: {
webhookUrl: '', webhookUrl: '',
@@ -431,6 +470,7 @@ class Settings {
}, },
telegram: { telegram: {
enabled: false, enabled: false,
embedPoster: true,
types: 0, types: 0,
options: { options: {
botAPI: '', botAPI: '',
@@ -441,6 +481,7 @@ class Settings {
}, },
pushbullet: { pushbullet: {
enabled: false, enabled: false,
embedPoster: false,
types: 0, types: 0,
options: { options: {
accessToken: '', accessToken: '',
@@ -448,6 +489,7 @@ class Settings {
}, },
pushover: { pushover: {
enabled: false, enabled: false,
embedPoster: true,
types: 0, types: 0,
options: { options: {
accessToken: '', accessToken: '',
@@ -457,6 +499,7 @@ class Settings {
}, },
webhook: { webhook: {
enabled: false, enabled: false,
embedPoster: true,
types: 0, types: 0,
options: { options: {
webhookUrl: '', webhookUrl: '',
@@ -466,10 +509,12 @@ class Settings {
}, },
webpush: { webpush: {
enabled: false, enabled: false,
embedPoster: true,
options: {}, options: {},
}, },
gotify: { gotify: {
enabled: false, enabled: false,
embedPoster: false,
types: 0, types: 0,
options: { options: {
url: '', url: '',
@@ -479,6 +524,7 @@ class Settings {
}, },
ntfy: { ntfy: {
enabled: false, enabled: false,
embedPoster: true,
types: 0, types: 0,
options: { options: {
url: '', url: '',
@@ -542,7 +588,13 @@ class Settings {
bypassFilter: '', bypassFilter: '',
bypassLocalAddresses: true, bypassLocalAddresses: true,
}, },
dnsCache: {
enabled: false,
forceMinTtl: 0,
forceMaxTtl: -1,
},
}, },
migrations: [],
}; };
if (initialSettings) { if (initialSettings) {
this.data = merge(this.data, initialSettings); this.data = merge(this.data, initialSettings);
@@ -581,6 +633,14 @@ class Settings {
this.data.tautulli = data; this.data.tautulli = data;
} }
get metadataSettings(): MetadataSettings {
return this.data.metadataSettings;
}
set metadataSettings(data: MetadataSettings) {
this.data.metadataSettings = data;
}
get radarr(): RadarrSettings[] { get radarr(): RadarrSettings[] {
return this.data.radarr; return this.data.radarr;
} }
@@ -664,6 +724,14 @@ class Settings {
this.data.network = data; this.data.network = data;
} }
get migrations(): string[] {
return this.data.migrations;
}
set migrations(data: string[]) {
this.data.migrations = data;
}
get clientId(): string { get clientId(): string {
return this.data.clientId; return this.data.clientId;
} }

View File

@@ -0,0 +1,93 @@
import RadarrAPI from '@server/api/servarr/radarr';
import SonarrAPI from '@server/api/servarr/sonarr';
import { getRepository } from '@server/datasource';
import { User } from '@server/entity/User';
import type { AllSettings } from '@server/lib/settings';
const migrationArrTags = async (settings: any): Promise<AllSettings> => {
if (
Array.isArray(settings.migrations) &&
settings.migrations.includes('0007_migrate_arr_tags')
) {
return settings;
}
const userRepository = getRepository(User);
const users = await userRepository.find({
select: ['id'],
});
let errorOccurred = false;
for (const radarrSettings of settings.radarr || []) {
if (!radarrSettings.tagRequests) {
continue;
}
try {
const radarr = new RadarrAPI({
apiKey: radarrSettings.apiKey,
url: RadarrAPI.buildUrl(radarrSettings, '/api/v3'),
});
const radarrTags = await radarr.getTags();
for (const user of users) {
const userTag = radarrTags.find((v) =>
v.label.startsWith(user.id + ' - ')
);
if (!userTag) {
continue;
}
await radarr.renameTag({
id: userTag.id,
label: userTag.label.replace(`${user.id} - `, `${user.id}-`),
});
}
} catch (error) {
console.error(
`Unable to rename Radarr tags to the new format. Please check your Radarr connection settings for the instance "${radarrSettings.name}".`,
error.message
);
errorOccurred = true;
}
}
for (const sonarrSettings of settings.sonarr || []) {
if (!sonarrSettings.tagRequests) {
continue;
}
try {
const sonarr = new SonarrAPI({
apiKey: sonarrSettings.apiKey,
url: SonarrAPI.buildUrl(sonarrSettings, '/api/v3'),
});
const sonarrTags = await sonarr.getTags();
for (const user of users) {
const userTag = sonarrTags.find((v) =>
v.label.startsWith(user.id + ' - ')
);
if (!userTag) {
continue;
}
await sonarr.renameTag({
id: userTag.id,
label: userTag.label.replace(`${user.id} - `, `${user.id}-`),
});
}
} catch (error) {
console.error(
`Unable to rename Sonarr tags to the new format. Please check your Sonarr connection settings for the instance "${sonarrSettings.name}".`,
error.message
);
errorOccurred = true;
}
}
if (!errorOccurred) {
if (!Array.isArray(settings.migrations)) {
settings.migrations = [];
}
settings.migrations.push('0007_migrate_arr_tags');
}
return settings;
};
export default migrationArrTags;

View File

@@ -124,7 +124,7 @@ const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
seasonNumber: episode.season_number, seasonNumber: episode.season_number,
showId: episode.show_id, showId: episode.show_id,
voteAverage: episode.vote_average, voteAverage: episode.vote_average,
voteCount: episode.vote_cuont, voteCount: episode.vote_count,
stillPath: episode.still_path, stillPath: episode.still_path,
}); });

View File

@@ -61,6 +61,7 @@ const QueryFilterOptions = z.object({
studio: z.coerce.string().optional(), studio: z.coerce.string().optional(),
genre: z.coerce.string().optional(), genre: z.coerce.string().optional(),
keywords: z.coerce.string().optional(), keywords: z.coerce.string().optional(),
excludeKeywords: z.coerce.string().optional(),
language: z.coerce.string().optional(), language: z.coerce.string().optional(),
withRuntimeGte: z.coerce.string().optional(), withRuntimeGte: z.coerce.string().optional(),
withRuntimeLte: z.coerce.string().optional(), withRuntimeLte: z.coerce.string().optional(),
@@ -90,6 +91,7 @@ discoverRoutes.get('/movies', async (req, res, next) => {
try { try {
const query = ApiQuerySchema.parse(req.query); const query = ApiQuerySchema.parse(req.query);
const keywords = query.keywords; const keywords = query.keywords;
const excludeKeywords = query.excludeKeywords;
const data = await tmdb.getDiscoverMovies({ const data = await tmdb.getDiscoverMovies({
page: Number(query.page), page: Number(query.page),
@@ -105,6 +107,7 @@ discoverRoutes.get('/movies', async (req, res, next) => {
? new Date(query.primaryReleaseDateGte).toISOString().split('T')[0] ? new Date(query.primaryReleaseDateGte).toISOString().split('T')[0]
: undefined, : undefined,
keywords, keywords,
excludeKeywords,
withRuntimeGte: query.withRuntimeGte, withRuntimeGte: query.withRuntimeGte,
withRuntimeLte: query.withRuntimeLte, withRuntimeLte: query.withRuntimeLte,
voteAverageGte: query.voteAverageGte, voteAverageGte: query.voteAverageGte,
@@ -128,11 +131,15 @@ discoverRoutes.get('/movies', async (req, res, next) => {
if (keywords) { if (keywords) {
const splitKeywords = keywords.split(','); const splitKeywords = keywords.split(',');
keywordData = await Promise.all( const keywordResults = await Promise.all(
splitKeywords.map(async (keywordId) => { splitKeywords.map(async (keywordId) => {
return await tmdb.getKeywordDetails({ keywordId: Number(keywordId) }); return await tmdb.getKeywordDetails({ keywordId: Number(keywordId) });
}) })
); );
keywordData = keywordResults.filter(
(keyword): keyword is TmdbKeyword => keyword !== null
);
} }
return res.status(200).json({ return res.status(200).json({
@@ -377,6 +384,7 @@ discoverRoutes.get('/tv', async (req, res, next) => {
try { try {
const query = ApiQuerySchema.parse(req.query); const query = ApiQuerySchema.parse(req.query);
const keywords = query.keywords; const keywords = query.keywords;
const excludeKeywords = query.excludeKeywords;
const data = await tmdb.getDiscoverTv({ const data = await tmdb.getDiscoverTv({
page: Number(query.page), page: Number(query.page),
sortBy: query.sortBy as SortOptions, sortBy: query.sortBy as SortOptions,
@@ -391,6 +399,7 @@ discoverRoutes.get('/tv', async (req, res, next) => {
: undefined, : undefined,
originalLanguage: query.language, originalLanguage: query.language,
keywords, keywords,
excludeKeywords,
withRuntimeGte: query.withRuntimeGte, withRuntimeGte: query.withRuntimeGte,
withRuntimeLte: query.withRuntimeLte, withRuntimeLte: query.withRuntimeLte,
voteAverageGte: query.voteAverageGte, voteAverageGte: query.voteAverageGte,
@@ -415,11 +424,15 @@ discoverRoutes.get('/tv', async (req, res, next) => {
if (keywords) { if (keywords) {
const splitKeywords = keywords.split(','); const splitKeywords = keywords.split(',');
keywordData = await Promise.all( const keywordResults = await Promise.all(
splitKeywords.map(async (keywordId) => { splitKeywords.map(async (keywordId) => {
return await tmdb.getKeywordDetails({ keywordId: Number(keywordId) }); return await tmdb.getKeywordDetails({ keywordId: Number(keywordId) });
}) })
); );
keywordData = keywordResults.filter(
(keyword): keyword is TmdbKeyword => keyword !== null
);
} }
return res.status(200).json({ return res.status(200).json({

View File

@@ -4,27 +4,40 @@ import { Router } from 'express';
const router = Router(); const router = Router();
const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', { // Delay the initialization of ImageProxy instances until the proxy (if any) is properly configured
rateLimitOptions: { let _tmdbImageProxy: ImageProxy;
maxRequests: 20, function initTmdbImageProxy() {
maxRPS: 50, if (!_tmdbImageProxy) {
}, _tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
}); rateLimitOptions: {
const tvdbImageProxy = new ImageProxy('tvdb', 'https://artworks.thetvdb.com', { maxRequests: 20,
rateLimitOptions: { maxRPS: 50,
maxRequests: 20, },
maxRPS: 50, });
}, }
}); return _tmdbImageProxy;
}
let _tvdbImageProxy: ImageProxy;
function initTvdbImageProxy() {
if (!_tvdbImageProxy) {
_tvdbImageProxy = new ImageProxy('tvdb', 'https://artworks.thetvdb.com', {
rateLimitOptions: {
maxRequests: 20,
maxRPS: 50,
},
});
}
return _tvdbImageProxy;
}
router.get('/:type/*', async (req, res) => { router.get('/:type/*', async (req, res) => {
const imagePath = req.path.replace(/^\/\w+/, ''); const imagePath = req.path.replace(/^\/\w+/, '');
try { try {
let imageData; let imageData;
if (req.params.type === 'tmdb') { if (req.params.type === 'tmdb') {
imageData = await tmdbImageProxy.getImage(imagePath); imageData = await initTmdbImageProxy().getImage(imagePath);
} else if (req.params.type === 'tvdb') { } else if (req.params.type === 'tvdb') {
imageData = await tvdbImageProxy.getImage(imagePath); imageData = await initTvdbImageProxy().getImage(imagePath);
} else { } else {
logger.error('Unsupported image type', { logger.error('Unsupported image type', {
imagePath, imagePath,

View File

@@ -54,6 +54,7 @@ issueRoutes.get<Record<string, string>, IssueResultsResponse>(
.leftJoinAndSelect('issue.createdBy', 'createdBy') .leftJoinAndSelect('issue.createdBy', 'createdBy')
.leftJoinAndSelect('issue.media', 'media') .leftJoinAndSelect('issue.media', 'media')
.leftJoinAndSelect('issue.modifiedBy', 'modifiedBy') .leftJoinAndSelect('issue.modifiedBy', 'modifiedBy')
.leftJoinAndSelect('issue.comments', 'comments')
.where('issue.status IN (:...issueStatus)', { .where('issue.status IN (:...issueStatus)', {
issueStatus: statusFilter, issueStatus: statusFilter,
}); });

View File

@@ -197,8 +197,10 @@ mediaRoutes.delete(
const media = await mediaRepository.findOneOrFail({ const media = await mediaRepository.findOneOrFail({
where: { id: Number(req.params.id) }, where: { id: Number(req.params.id) },
}); });
const is4k = media.serviceUrl4k !== undefined;
const is4k = req.query.is4k === 'true';
const isMovie = media.mediaType === MediaType.MOVIE; const isMovie = media.mediaType === MediaType.MOVIE;
let serviceSettings; let serviceSettings;
if (isMovie) { if (isMovie) {
serviceSettings = settings.radarr.find( serviceSettings = settings.radarr.find(
@@ -225,6 +227,7 @@ mediaRoutes.delete(
); );
} }
} }
if (!serviceSettings) { if (!serviceSettings) {
logger.warn( logger.warn(
`There is no default ${ `There is no default ${
@@ -239,6 +242,7 @@ mediaRoutes.delete(
); );
return; return;
} }
let service; let service;
if (isMovie) { if (isMovie) {
service = new RadarrAPI({ service = new RadarrAPI({

View File

@@ -381,6 +381,12 @@ requestRoutes.get('/count', async (_req, res, next) => {
) )
.getCount(); .getCount();
const completedCount = await query
.where('request.status = :requestStatus', {
requestStatus: MediaRequestStatus.COMPLETED,
})
.getCount();
return res.status(200).json({ return res.status(200).json({
total: totalCount, total: totalCount,
movie: movieCount, movie: movieCount,
@@ -390,6 +396,7 @@ requestRoutes.get('/count', async (_req, res, next) => {
declined: declinedCount, declined: declinedCount,
processing: processingCount, processing: processingCount,
available: availableCount, available: availableCount,
completed: completedCount,
}); });
} catch (e) { } catch (e) {
logger.error('Something went wrong retrieving request counts', { logger.error('Something went wrong retrieving request counts', {

View File

@@ -28,7 +28,9 @@ import discoverSettingRoutes from '@server/routes/settings/discover';
import { ApiError } from '@server/types/error'; import { ApiError } from '@server/types/error';
import { appDataPath } from '@server/utils/appDataVolume'; import { appDataPath } from '@server/utils/appDataVolume';
import { getAppVersion } from '@server/utils/appVersion'; import { getAppVersion } from '@server/utils/appVersion';
import { dnsCache } from '@server/utils/dnsCache';
import { getHostname } from '@server/utils/getHostname'; import { getHostname } from '@server/utils/getHostname';
import type { DnsEntries, DnsStats } from 'dns-caching';
import { Router } from 'express'; import { Router } from 'express';
import rateLimit from 'express-rate-limit'; import rateLimit from 'express-rate-limit';
import fs from 'fs'; import fs from 'fs';
@@ -37,6 +39,7 @@ import { rescheduleJob } from 'node-schedule';
import path from 'path'; import path from 'path';
import semver from 'semver'; import semver from 'semver';
import { URL } from 'url'; import { URL } from 'url';
import metadataRoutes from './metadata';
import notificationRoutes from './notifications'; import notificationRoutes from './notifications';
import radarrRoutes from './radarr'; import radarrRoutes from './radarr';
import sonarrRoutes from './sonarr'; import sonarrRoutes from './sonarr';
@@ -47,6 +50,7 @@ settingsRoutes.use('/notifications', notificationRoutes);
settingsRoutes.use('/radarr', radarrRoutes); settingsRoutes.use('/radarr', radarrRoutes);
settingsRoutes.use('/sonarr', sonarrRoutes); settingsRoutes.use('/sonarr', sonarrRoutes);
settingsRoutes.use('/discover', discoverSettingRoutes); settingsRoutes.use('/discover', discoverSettingRoutes);
settingsRoutes.use('/metadatas', metadataRoutes);
const filteredMainSettings = ( const filteredMainSettings = (
user: User, user: User,
@@ -755,12 +759,19 @@ settingsRoutes.get('/cache', async (_req, res) => {
const tmdbImageCache = await ImageProxy.getImageStats('tmdb'); const tmdbImageCache = await ImageProxy.getImageStats('tmdb');
const avatarImageCache = await ImageProxy.getImageStats('avatar'); const avatarImageCache = await ImageProxy.getImageStats('avatar');
const stats: DnsStats | undefined = dnsCache?.getStats();
const entries: DnsEntries | undefined = dnsCache?.getCacheEntries();
return res.status(200).json({ return res.status(200).json({
apiCaches, apiCaches,
imageCache: { imageCache: {
tmdb: tmdbImageCache, tmdb: tmdbImageCache,
avatar: avatarImageCache, avatar: avatarImageCache,
}, },
dnsCache: {
stats,
entries,
},
}); });
}); });
@@ -778,6 +789,20 @@ settingsRoutes.post<{ cacheId: AvailableCacheIds }>(
} }
); );
settingsRoutes.post<{ dnsEntry: string }>(
'/cache/dns/:dnsEntry/flush',
(req, res, next) => {
const dnsEntry = req.params.dnsEntry;
if (dnsCache) {
dnsCache.clear(dnsEntry);
return res.status(204).send();
}
next({ status: 404, message: 'Cache not found.' });
}
);
settingsRoutes.post( settingsRoutes.post(
'/initialize', '/initialize',
isAuthenticated(Permission.ADMIN), isAuthenticated(Permission.ADMIN),

View File

@@ -0,0 +1,153 @@
import TheMovieDb from '@server/api/themoviedb';
import Tvdb from '@server/api/tvdb';
import {
getSettings,
MetadataProviderType,
type MetadataSettings,
} from '@server/lib/settings';
import logger from '@server/logger';
import { Router } from 'express';
function getTestResultString(testValue: number): string {
if (testValue === -1) return 'not tested';
if (testValue === 0) return 'failed';
return 'ok';
}
const metadataRoutes = Router();
metadataRoutes.get('/', (_req, res) => {
const settings = getSettings();
res.status(200).json({
tv: settings.metadataSettings.tv,
anime: settings.metadataSettings.anime,
});
});
metadataRoutes.put('/', async (req, res) => {
const settings = getSettings();
const body = req.body as MetadataSettings;
let tvdbTest = -1;
let tmdbTest = -1;
try {
if (
body.tv === MetadataProviderType.TVDB ||
body.anime === MetadataProviderType.TVDB
) {
tvdbTest = 0;
const tvdb = await Tvdb.getInstance();
await tvdb.test();
tvdbTest = 1;
}
} catch (e) {
logger.error('Failed to test metadata provider', {
label: 'Metadata',
message: e.message,
});
}
try {
if (
body.tv === MetadataProviderType.TMDB ||
body.anime === MetadataProviderType.TMDB
) {
tmdbTest = 0;
const tmdb = new TheMovieDb();
await tmdb.getTvShow({ tvId: 1054 });
tmdbTest = 1;
}
} catch (e) {
logger.error('Failed to test metadata provider', {
label: 'MetadataProvider',
message: e.message,
});
}
// If a test failed, return the test results
if (tvdbTest === 0 || tmdbTest === 0) {
return res.status(500).json({
success: false,
tests: {
tvdb: getTestResultString(tvdbTest),
tmdb: getTestResultString(tmdbTest),
},
});
}
settings.metadataSettings = {
tv: body.tv,
anime: body.anime,
};
await settings.save();
res.status(200).json({
success: true,
tv: body.tv,
anime: body.anime,
tests: {
tvdb: getTestResultString(tvdbTest),
tmdb: getTestResultString(tmdbTest),
},
});
});
metadataRoutes.post('/test', async (req, res) => {
let tvdbTest = -1;
let tmdbTest = -1;
try {
const body = req.body as { tmdb: boolean; tvdb: boolean };
try {
if (body.tmdb) {
tmdbTest = 0;
const tmdb = new TheMovieDb();
await tmdb.getTvShow({ tvId: 1054 });
tmdbTest = 1;
}
} catch (e) {
logger.error('Failed to test metadata provider', {
label: 'MetadataProvider',
message: e.message,
});
}
try {
if (body.tvdb) {
tvdbTest = 0;
const tvdb = await Tvdb.getInstance();
await tvdb.test();
tvdbTest = 1;
}
} catch (e) {
logger.error('Failed to test metadata provider', {
label: 'MetadataProvider',
message: e.message,
});
}
const success = !(tvdbTest === 0 || tmdbTest === 0);
const statusCode = success ? 200 : 500;
return res.status(statusCode).json({
success: success,
tests: {
tmdb: getTestResultString(tmdbTest),
tvdb: getTestResultString(tvdbTest),
},
});
} catch (e) {
return res.status(500).json({
success: false,
tests: {
tmdb: getTestResultString(tmdbTest),
tvdb: getTestResultString(tvdbTest),
},
error: e.message,
});
}
});
export default metadataRoutes;

View File

@@ -270,6 +270,7 @@ notificationRoutes.get('/webhook', (_req, res) => {
const response: typeof webhookSettings = { const response: typeof webhookSettings = {
enabled: webhookSettings.enabled, enabled: webhookSettings.enabled,
embedPoster: webhookSettings.embedPoster,
types: webhookSettings.types, types: webhookSettings.types,
options: { options: {
...webhookSettings.options, ...webhookSettings.options,
@@ -278,6 +279,7 @@ notificationRoutes.get('/webhook', (_req, res) => {
'utf8' 'utf8'
) )
), ),
supportVariables: webhookSettings.options.supportVariables ?? false,
}, },
}; };
@@ -291,6 +293,7 @@ notificationRoutes.post('/webhook', async (req, res, next) => {
settings.notifications.agents.webhook = { settings.notifications.agents.webhook = {
enabled: req.body.enabled, enabled: req.body.enabled,
embedPoster: req.body.embedPoster,
types: req.body.types, types: req.body.types,
options: { options: {
jsonPayload: Buffer.from(req.body.options.jsonPayload).toString( jsonPayload: Buffer.from(req.body.options.jsonPayload).toString(
@@ -298,6 +301,7 @@ notificationRoutes.post('/webhook', async (req, res, next) => {
), ),
webhookUrl: req.body.options.webhookUrl, webhookUrl: req.body.options.webhookUrl,
authHeader: req.body.options.authHeader, authHeader: req.body.options.authHeader,
supportVariables: req.body.options.supportVariables ?? false,
}, },
}; };
await settings.save(); await settings.save();
@@ -321,6 +325,7 @@ notificationRoutes.post('/webhook/test', async (req, res, next) => {
const testBody = { const testBody = {
enabled: req.body.enabled, enabled: req.body.enabled,
embedPoster: req.body.embedPoster,
types: req.body.types, types: req.body.types,
options: { options: {
jsonPayload: Buffer.from(req.body.options.jsonPayload).toString( jsonPayload: Buffer.from(req.body.options.jsonPayload).toString(
@@ -328,6 +333,7 @@ notificationRoutes.post('/webhook/test', async (req, res, next) => {
), ),
webhookUrl: req.body.options.webhookUrl, webhookUrl: req.body.options.webhookUrl,
authHeader: req.body.options.authHeader, authHeader: req.body.options.authHeader,
supportVariables: req.body.options.supportVariables ?? false,
}, },
}; };

View File

@@ -1,5 +1,8 @@
import { getMetadataProvider } from '@server/api/metadata';
import RottenTomatoes from '@server/api/rating/rottentomatoes'; import RottenTomatoes from '@server/api/rating/rottentomatoes';
import TheMovieDb from '@server/api/themoviedb'; import TheMovieDb from '@server/api/themoviedb';
import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
import { MediaType } from '@server/constants/media'; import { MediaType } from '@server/constants/media';
import { getRepository } from '@server/datasource'; import { getRepository } from '@server/datasource';
import Media from '@server/entity/Media'; import Media from '@server/entity/Media';
@@ -13,12 +16,20 @@ const tvRoutes = Router();
tvRoutes.get('/:id', async (req, res, next) => { tvRoutes.get('/:id', async (req, res, next) => {
const tmdb = new TheMovieDb(); const tmdb = new TheMovieDb();
try { try {
const tv = await tmdb.getTvShow({ const tmdbTv = await tmdb.getTvShow({
tvId: Number(req.params.id),
});
const metadataProvider = tmdbTv.keywords.results.some(
(keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
)
? await getMetadataProvider('anime')
: await getMetadataProvider('tv');
const tv = await metadataProvider.getTvShow({
tvId: Number(req.params.id), tvId: Number(req.params.id),
language: (req.query.language as string) ?? req.locale, language: (req.query.language as string) ?? req.locale,
}); });
const media = await Media.getMedia(tv.id, MediaType.TV); const media = await Media.getMedia(tv.id, MediaType.TV);
const onUserWatchlist = await getRepository(Watchlist).exist({ const onUserWatchlist = await getRepository(Watchlist).exist({
@@ -34,7 +45,9 @@ tvRoutes.get('/:id', async (req, res, next) => {
// TMDB issue where it doesnt fallback to English when no overview is available in requested locale. // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
if (!data.overview) { if (!data.overview) {
const tvEnglish = await tmdb.getTvShow({ tvId: Number(req.params.id) }); const tvEnglish = await metadataProvider.getTvShow({
tvId: Number(req.params.id),
});
data.overview = tvEnglish.overview; data.overview = tvEnglish.overview;
} }
@@ -53,10 +66,18 @@ tvRoutes.get('/:id', async (req, res, next) => {
}); });
tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => { tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => {
const tmdb = new TheMovieDb();
try { try {
const season = await tmdb.getTvSeason({ const tmdb = new TheMovieDb();
const tmdbTv = await tmdb.getTvShow({
tvId: Number(req.params.id),
});
const metadataProvider = tmdbTv.keywords.results.some(
(keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
)
? await getMetadataProvider('anime')
: await getMetadataProvider('tv');
const season = await metadataProvider.getTvSeason({
tvId: Number(req.params.id), tvId: Number(req.params.id),
seasonNumber: Number(req.params.seasonNumber), seasonNumber: Number(req.params.seasonNumber),
language: (req.query.language as string) ?? req.locale, language: (req.query.language as string) ?? req.locale,

View File

@@ -33,52 +33,93 @@ import { EventSubscriber } from 'typeorm';
export class MediaRequestSubscriber export class MediaRequestSubscriber
implements EntitySubscriberInterface<MediaRequest> implements EntitySubscriberInterface<MediaRequest>
{ {
private async notifyAvailableMovie(entity: MediaRequest) { private async notifyAvailableMovie(
entity: MediaRequest,
event?: UpdateEvent<MediaRequest>
) {
// Get fresh media state using event manager
let latestMedia: Media | null = null;
if (event?.manager) {
latestMedia = await event.manager.findOne(Media, {
where: { id: entity.media.id },
});
}
if (!latestMedia) {
const mediaRepository = getRepository(Media);
latestMedia = await mediaRepository.findOne({
where: { id: entity.media.id },
});
}
// Check availability using fresh media state
if ( if (
entity.media[entity.is4k ? 'status4k' : 'status'] === !latestMedia ||
MediaStatus.AVAILABLE latestMedia[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE
) { ) {
const tmdb = new TheMovieDb(); return;
}
try { const tmdb = new TheMovieDb();
const movie = await tmdb.getMovie({
movieId: entity.media.tmdbId,
});
notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, { try {
event: `${entity.is4k ? '4K ' : ''}Movie Request Now Available`, const movie = await tmdb.getMovie({
notifyAdmin: false, movieId: entity.media.tmdbId,
notifySystem: true, });
notifyUser: entity.requestedBy,
subject: `${movie.title}${ notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : '' event: `${entity.is4k ? '4K ' : ''}Movie Request Now Available`,
}`, notifyAdmin: false,
message: truncate(movie.overview, { notifySystem: true,
length: 500, notifyUser: entity.requestedBy,
separator: /\s/, subject: `${movie.title}${
omission: '…', movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
}), }`,
media: entity.media, message: truncate(movie.overview, {
image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`, length: 500,
request: entity, separator: /\s/,
}); omission: '…',
} catch (e) { }),
logger.error('Something went wrong sending media notification(s)', { media: latestMedia,
label: 'Notifications', image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
errorMessage: e.message, request: entity,
mediaId: entity.id, });
}); } catch (e) {
} logger.error('Something went wrong sending media notification(s)', {
label: 'Notifications',
errorMessage: e.message,
mediaId: entity.id,
});
} }
} }
private async notifyAvailableSeries(entity: MediaRequest) { private async notifyAvailableSeries(
// Find all seasons in the related media entity entity: MediaRequest,
// and see if they are available, then we can check event?: UpdateEvent<MediaRequest>
// if the request contains the same seasons ) {
// Get fresh media state with seasons using event manager
let latestMedia: Media | null = null;
if (event?.manager) {
latestMedia = await event.manager.findOne(Media, {
where: { id: entity.media.id },
relations: { seasons: true },
});
}
if (!latestMedia) {
const mediaRepository = getRepository(Media);
latestMedia = await mediaRepository.findOne({
where: { id: entity.media.id },
relations: { seasons: true },
});
}
if (!latestMedia) {
return;
}
// Check availability using fresh media state
const requestedSeasons = const requestedSeasons =
entity.seasons?.map((entitySeason) => entitySeason.seasonNumber) ?? []; entity.seasons?.map((entitySeason) => entitySeason.seasonNumber) ?? [];
const availableSeasons = entity.media.seasons.filter( const availableSeasons = latestMedia.seasons.filter(
(season) => (season) =>
season[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE && season[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE &&
requestedSeasons.includes(season.seasonNumber) requestedSeasons.includes(season.seasonNumber)
@@ -87,44 +128,46 @@ export class MediaRequestSubscriber
availableSeasons.length > 0 && availableSeasons.length > 0 &&
availableSeasons.length === requestedSeasons.length; availableSeasons.length === requestedSeasons.length;
if (isMediaAvailable) { if (!isMediaAvailable) {
const tmdb = new TheMovieDb(); return;
}
try { const tmdb = new TheMovieDb();
const tv = await tmdb.getTvShow({ tvId: entity.media.tmdbId });
notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, { try {
event: `${entity.is4k ? '4K ' : ''}Series Request Now Available`, const tv = await tmdb.getTvShow({ tvId: entity.media.tmdbId });
subject: `${tv.name}${
tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : '' notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
}`, event: `${entity.is4k ? '4K ' : ''}Series Request Now Available`,
message: truncate(tv.overview, { subject: `${tv.name}${
length: 500, tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
separator: /\s/, }`,
omission: '…', message: truncate(tv.overview, {
}), length: 500,
notifyAdmin: false, separator: /\s/,
notifySystem: true, omission: '…',
notifyUser: entity.requestedBy, }),
image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`, notifyAdmin: false,
media: entity.media, notifySystem: true,
extra: [ notifyUser: entity.requestedBy,
{ image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
name: 'Requested Seasons', media: latestMedia,
value: entity.seasons extra: [
.map((season) => season.seasonNumber) {
.join(', '), name: 'Requested Seasons',
}, value: entity.seasons
], .map((season) => season.seasonNumber)
request: entity, .join(', '),
}); },
} catch (e) { ],
logger.error('Something went wrong sending media notification(s)', { request: entity,
label: 'Notifications', });
errorMessage: e.message, } catch (e) {
mediaId: entity.id, logger.error('Something went wrong sending media notification(s)', {
}); label: 'Notifications',
} errorMessage: e.message,
mediaId: entity.id,
});
} }
} }
@@ -249,9 +292,17 @@ export class MediaRequestSubscriber
} }
if (radarrSettings.tagRequests) { if (radarrSettings.tagRequests) {
let userTag = (await radarr.getTags()).find((v) => const radarrTags = await radarr.getTags();
// old tags had space around the hyphen
let userTag = radarrTags.find((v) =>
v.label.startsWith(entity.requestedBy.id + ' - ') v.label.startsWith(entity.requestedBy.id + ' - ')
); );
// new tags do not have spaces around the hyphen, since spaces are not allowed anymore
if (!userTag) {
userTag = radarrTags.find((v) =>
v.label.startsWith(entity.requestedBy.id + '-')
);
}
if (!userTag) { if (!userTag) {
logger.info(`Requester has no active tag. Creating new`, { logger.info(`Requester has no active tag. Creating new`, {
label: 'Media Request', label: 'Media Request',
@@ -259,11 +310,11 @@ export class MediaRequestSubscriber
mediaId: entity.media.id, mediaId: entity.media.id,
userId: entity.requestedBy.id, userId: entity.requestedBy.id,
newTag: newTag:
entity.requestedBy.id + ' - ' + entity.requestedBy.displayName, entity.requestedBy.id + '-' + entity.requestedBy.displayName,
}); });
userTag = await radarr.createTag({ userTag = await radarr.createTag({
label: label:
entity.requestedBy.id + ' - ' + entity.requestedBy.displayName, entity.requestedBy.id + '-' + entity.requestedBy.displayName,
}); });
} }
if (userTag.id) { if (userTag.id) {
@@ -558,9 +609,17 @@ export class MediaRequestSubscriber
} }
if (sonarrSettings.tagRequests) { if (sonarrSettings.tagRequests) {
let userTag = (await sonarr.getTags()).find((v) => const sonarrTags = await sonarr.getTags();
// old tags had space around the hyphen
let userTag = sonarrTags.find((v) =>
v.label.startsWith(entity.requestedBy.id + ' - ') v.label.startsWith(entity.requestedBy.id + ' - ')
); );
// new tags do not have spaces around the hyphen, since spaces are not allowed anymore
if (!userTag) {
userTag = sonarrTags.find((v) =>
v.label.startsWith(entity.requestedBy.id + '-')
);
}
if (!userTag) { if (!userTag) {
logger.info(`Requester has no active tag. Creating new`, { logger.info(`Requester has no active tag. Creating new`, {
label: 'Media Request', label: 'Media Request',
@@ -568,11 +627,11 @@ export class MediaRequestSubscriber
mediaId: entity.media.id, mediaId: entity.media.id,
userId: entity.requestedBy.id, userId: entity.requestedBy.id,
newTag: newTag:
entity.requestedBy.id + ' - ' + entity.requestedBy.displayName, entity.requestedBy.id + '-' + entity.requestedBy.displayName,
}); });
userTag = await sonarr.createTag({ userTag = await sonarr.createTag({
label: label:
entity.requestedBy.id + ' - ' + entity.requestedBy.displayName, entity.requestedBy.id + '-' + entity.requestedBy.displayName,
}); });
} }
if (userTag.id) { if (userTag.id) {
@@ -782,10 +841,10 @@ export class MediaRequestSubscriber
if (event.entity.status === MediaRequestStatus.COMPLETED) { if (event.entity.status === MediaRequestStatus.COMPLETED) {
if (event.entity.media.mediaType === MediaType.MOVIE) { if (event.entity.media.mediaType === MediaType.MOVIE) {
this.notifyAvailableMovie(event.entity as MediaRequest); this.notifyAvailableMovie(event.entity as MediaRequest, event);
} }
if (event.entity.media.mediaType === MediaType.TV) { if (event.entity.media.mediaType === MediaType.TV) {
this.notifyAvailableSeries(event.entity as MediaRequest); this.notifyAvailableSeries(event.entity as MediaRequest, event);
} }
} }
} }

View File

@@ -53,10 +53,11 @@ div(style='display: block; background-color: #111827; padding: 2.5rem 0;')
b(style='color: #9ca3af; font-weight: 700;') b(style='color: #9ca3af; font-weight: 700;')
| #{extra.name}&nbsp; | #{extra.name}&nbsp;
| #{extra.value} | #{extra.value}
td(rowspan='2' style='width: 7rem;') if imageUrl
a(style='display: block; width: 7rem; overflow: hidden; border-radius: .375rem;' href=actionUrl) td(rowspan='2' style='width: 7rem;')
div(style='overflow: hidden; box-sizing: border-box; margin: 0px;') a(style='display: block; width: 7rem; overflow: hidden; border-radius: .375rem;' href=actionUrl)
img(alt='' src=imageUrl style='box-sizing: border-box; padding: 0px; border: none; margin: auto; display: block; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%;') div(style='overflow: hidden; box-sizing: border-box; margin: 0px;')
img(alt='' src=imageUrl style='box-sizing: border-box; padding: 0px; border: none; margin: auto; display: block; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%;')
tr tr
td(style='font-size: .85em; color: #9ca3af; line-height: 1em; vertical-align: bottom; margin-right: 1rem') td(style='font-size: .85em; color: #9ca3af; line-height: 1em; vertical-align: bottom; margin-right: 1rem')
span span

35
server/types/languages.d.ts vendored Normal file
View File

@@ -0,0 +1,35 @@
export type AvailableLocale =
| 'ar'
| 'bg'
| 'ca'
| 'cs'
| 'da'
| 'de'
| 'en'
| 'el'
| 'es'
| 'es-MX'
| 'fi'
| 'fr'
| 'hr'
| 'he'
| 'hi'
| 'hu'
| 'it'
| 'ja'
| 'ko'
| 'lt'
| 'nb-NO'
| 'nl'
| 'pl'
| 'pt-BR'
| 'pt-PT'
| 'ro'
| 'ru'
| 'sq'
| 'sr'
| 'sv'
| 'tr'
| 'uk'
| 'zh-CN'
| 'zh-TW';

26
server/utils/dnsCache.ts Normal file
View File

@@ -0,0 +1,26 @@
import logger from '@server/logger';
import { DnsCacheManager } from 'dns-caching';
export let dnsCache: DnsCacheManager | undefined;
export function initializeDnsCache({
forceMinTtl,
forceMaxTtl,
}: {
forceMinTtl?: number;
forceMaxTtl?: number;
}) {
if (dnsCache) {
logger.warn('DNS Cache is already initialized', { label: 'DNS Cache' });
return;
}
logger.info('Initializing DNS Cache', { label: 'DNS Cache' });
dnsCache = new DnsCacheManager({
logger,
forceMinTtl: typeof forceMinTtl === 'number' ? forceMinTtl * 1000 : 0,
forceMaxTtl: typeof forceMaxTtl === 'number' ? forceMaxTtl * 1000 : -1,
});
dnsCache.initialize();
}

View File

@@ -29,14 +29,10 @@ const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
const keywordIds = data.blacklistedTags.slice(1, -1).split(','); const keywordIds = data.blacklistedTags.slice(1, -1).split(',');
Promise.all( Promise.all(
keywordIds.map(async (keywordId) => { keywordIds.map(async (keywordId) => {
try { const { data } = await axios.get<Keyword | null>(
const { data } = await axios.get<Keyword>( `/api/v1/keyword/${keywordId}`
`/api/v1/keyword/${keywordId}` );
); return data?.name || `[Invalid: ${keywordId}]`;
return data.name;
} catch (err) {
return '';
}
}) })
).then((keywords) => { ).then((keywords) => {
setTagNamesBlacklistedFor(keywords.join(', ')); setTagNamesBlacklistedFor(keywords.join(', '));

View File

@@ -5,7 +5,10 @@ import { encodeURIExtraParams } from '@app/hooks/useDiscover';
import defineMessages from '@app/utils/defineMessages'; import defineMessages from '@app/utils/defineMessages';
import { Transition } from '@headlessui/react'; import { Transition } from '@headlessui/react';
import { ArrowDownIcon } from '@heroicons/react/24/solid'; import { ArrowDownIcon } from '@heroicons/react/24/solid';
import type { TmdbKeywordSearchResponse } from '@server/api/themoviedb/interfaces'; import type {
TmdbKeyword,
TmdbKeywordSearchResponse,
} from '@server/api/themoviedb/interfaces';
import type { Keyword } from '@server/models/common'; import type { Keyword } from '@server/models/common';
import axios from 'axios'; import axios from 'axios';
import { useFormikContext } from 'formik'; import { useFormikContext } from 'formik';
@@ -124,15 +127,19 @@ const ControlledKeywordSelector = ({
const keywords = await Promise.all( const keywords = await Promise.all(
defaultValue.split(',').map(async (keywordId) => { defaultValue.split(',').map(async (keywordId) => {
const { data } = await axios.get<Keyword>( const { data } = await axios.get<Keyword | null>(
`/api/v1/keyword/${keywordId}` `/api/v1/keyword/${keywordId}`
); );
return data; return data;
}) })
); );
const validKeywords: TmdbKeyword[] = keywords.filter(
(keyword): keyword is TmdbKeyword => keyword !== null
);
onChange( onChange(
keywords.map((keyword) => ({ validKeywords.map((keyword) => ({
label: keyword.name, label: keyword.name,
value: keyword.id, value: keyword.id,
})) }))

View File

@@ -84,6 +84,7 @@ const SettingsTabs = ({
Select a Tab Select a Tab
</label> </label>
<select <select
id="tabs"
onChange={(e) => { onChange={(e) => {
router.push(e.target.value); router.push(e.target.value);
}} }}

View File

@@ -77,16 +77,19 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
const keywords = await Promise.all( const keywords = await Promise.all(
slider.data.split(',').map(async (keywordId) => { slider.data.split(',').map(async (keywordId) => {
const keyword = await axios.get<Keyword>( const keyword = await axios.get<Keyword | null>(
`/api/v1/keyword/${keywordId}` `/api/v1/keyword/${keywordId}`
); );
return keyword.data; return keyword.data;
}) })
); );
const validKeywords: Keyword[] = keywords.filter(
(keyword): keyword is Keyword => keyword !== null
);
setDefaultDataValue( setDefaultDataValue(
keywords.map((keyword) => ({ validKeywords.map((keyword) => ({
label: keyword.name, label: keyword.name,
value: keyword.id, value: keyword.id,
})) }))

View File

@@ -33,6 +33,7 @@ const messages = defineMessages('components.Discover.FilterSlideover', {
studio: 'Studio', studio: 'Studio',
genres: 'Genres', genres: 'Genres',
keywords: 'Keywords', keywords: 'Keywords',
excludeKeywords: 'Exclude Keywords',
originalLanguage: 'Original Language', originalLanguage: 'Original Language',
runtimeText: '{minValue}-{maxValue} minute runtime', runtimeText: '{minValue}-{maxValue} minute runtime',
ratingText: 'Ratings between {minValue} and {maxValue}', ratingText: 'Ratings between {minValue} and {maxValue}',
@@ -181,6 +182,19 @@ const FilterSlideover = ({
updateQueryParams('keywords', value?.map((v) => v.value).join(',')); updateQueryParams('keywords', value?.map((v) => v.value).join(','));
}} }}
/> />
<span className="text-lg font-semibold">
{intl.formatMessage(messages.excludeKeywords)}
</span>
<KeywordSelector
defaultValue={currentFilters.excludeKeywords}
isMulti
onChange={(value) => {
updateQueryParams(
'excludeKeywords',
value?.map((v) => v.value).join(',')
);
}}
/>
<span className="text-lg font-semibold"> <span className="text-lg font-semibold">
{intl.formatMessage(messages.originalLanguage)} {intl.formatMessage(messages.originalLanguage)}
</span> </span>

View File

@@ -99,6 +99,7 @@ export const QueryFilterOptions = z.object({
studio: z.string().optional(), studio: z.string().optional(),
genre: z.string().optional(), genre: z.string().optional(),
keywords: z.string().optional(), keywords: z.string().optional(),
excludeKeywords: z.string().optional(),
language: z.string().optional(), language: z.string().optional(),
withRuntimeGte: z.string().optional(), withRuntimeGte: z.string().optional(),
withRuntimeLte: z.string().optional(), withRuntimeLte: z.string().optional(),
@@ -161,6 +162,10 @@ export const prepareFilterValues = (
filterValues.keywords = values.keywords; filterValues.keywords = values.keywords;
} }
if (values.excludeKeywords) {
filterValues.excludeKeywords = values.excludeKeywords;
}
if (values.language) { if (values.language) {
filterValues.language = values.language; filterValues.language = values.language;
} }

View File

@@ -1,6 +1,7 @@
import Badge from '@app/components/Common/Badge'; import Badge from '@app/components/Common/Badge';
import Button from '@app/components/Common/Button'; import Button from '@app/components/Common/Button';
import CachedImage from '@app/components/Common/CachedImage'; import CachedImage from '@app/components/Common/CachedImage';
import Tooltip from '@app/components/Common/Tooltip';
import { issueOptions } from '@app/components/IssueModal/constants'; import { issueOptions } from '@app/components/IssueModal/constants';
import { Permission, useUser } from '@app/hooks/useUser'; import { Permission, useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages'; import globalMessages from '@app/i18n/globalMessages';
@@ -26,6 +27,7 @@ const messages = defineMessages('components.IssueList.IssueItem', {
opened: 'Opened', opened: 'Opened',
viewissue: 'View Issue', viewissue: 'View Issue',
unknownissuetype: 'Unknown', unknownissuetype: 'Unknown',
descriptionpreview: 'Issue Description',
}); });
const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => { const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -107,8 +109,15 @@ const IssueItem = ({ issue }: IssueItemProps) => {
} }
} }
const description = issue.comments?.[0]?.message || '';
const maxDescriptionLength = 120;
const shouldTruncate = description.length > maxDescriptionLength;
const truncatedDescription = shouldTruncate
? description.substring(0, maxDescriptionLength) + '...'
: description;
return ( return (
<div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row"> <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:flex-row">
{title.backdropPath && ( {title.backdropPath && (
<div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3"> <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
<CachedImage <CachedImage
@@ -168,8 +177,38 @@ const IssueItem = ({ issue }: IssueItemProps) => {
> >
{isMovie(title) ? title.title : title.name} {isMovie(title) ? title.title : title.name}
</Link> </Link>
{description && (
<div className="mt-1 max-w-full">
<div className="overflow-hidden text-sm text-gray-300">
{shouldTruncate ? (
<Tooltip
content={
<div className="max-w-sm p-3">
<div className="mb-1 text-sm font-medium text-gray-200">
Issue Description
</div>
<div className="whitespace-pre-wrap text-sm leading-relaxed text-gray-300">
{description}
</div>
</div>
}
tooltipConfig={{
placement: 'top',
offset: [0, 8],
}}
>
<span className="block cursor-help truncate transition-colors hover:text-gray-200">
{truncatedDescription}
</span>
</Tooltip>
) : (
<span className="block break-words">{description}</span>
)}
</div>
</div>
)}
{problemSeasonEpisodeLine.length > 0 && ( {problemSeasonEpisodeLine.length > 0 && (
<div className="card-field"> <div className="card-field mt-1">
{problemSeasonEpisodeLine.map((t, k) => ( {problemSeasonEpisodeLine.map((t, k) => (
<span key={k}>{t}</span> <span key={k}>{t}</span>
))} ))}

View File

@@ -1,10 +1,10 @@
import type { AvailableLocale } from '@app/context/LanguageContext';
import { availableLanguages } from '@app/context/LanguageContext'; import { availableLanguages } from '@app/context/LanguageContext';
import useClickOutside from '@app/hooks/useClickOutside'; import useClickOutside from '@app/hooks/useClickOutside';
import useLocale from '@app/hooks/useLocale'; import useLocale from '@app/hooks/useLocale';
import defineMessages from '@app/utils/defineMessages'; import defineMessages from '@app/utils/defineMessages';
import { Transition } from '@headlessui/react'; import { Transition } from '@headlessui/react';
import { LanguageIcon } from '@heroicons/react/24/solid'; import { LanguageIcon } from '@heroicons/react/24/solid';
import type { AvailableLocale } from '@server/types/languages';
import { useRef, useState } from 'react'; import { useRef, useState } from 'react';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';

View File

@@ -3,11 +3,11 @@ import PullToRefresh from '@app/components/Layout/PullToRefresh';
import SearchInput from '@app/components/Layout/SearchInput'; import SearchInput from '@app/components/Layout/SearchInput';
import Sidebar from '@app/components/Layout/Sidebar'; import Sidebar from '@app/components/Layout/Sidebar';
import UserDropdown from '@app/components/Layout/UserDropdown'; import UserDropdown from '@app/components/Layout/UserDropdown';
import type { AvailableLocale } from '@app/context/LanguageContext';
import useLocale from '@app/hooks/useLocale'; import useLocale from '@app/hooks/useLocale';
import useSettings from '@app/hooks/useSettings'; import useSettings from '@app/hooks/useSettings';
import { useUser } from '@app/hooks/useUser'; import { useUser } from '@app/hooks/useUser';
import { ArrowLeftIcon, Bars3BottomLeftIcon } from '@heroicons/react/24/solid'; import { ArrowLeftIcon, Bars3BottomLeftIcon } from '@heroicons/react/24/solid';
import type { AvailableLocale } from '@server/types/languages';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import useSWR from 'swr'; import useSWR from 'swr';

View File

@@ -118,9 +118,11 @@ const ManageSlideOver = ({
} }
}; };
const deleteMediaFile = async () => { const deleteMediaFile = async (is4k = false) => {
if (data.mediaInfo) { if (data.mediaInfo) {
await axios.delete(`/api/v1/media/${data.mediaInfo.id}/file`); await axios.delete(
`/api/v1/media/${data.mediaInfo.id}/file?is4k=${is4k}`
);
await axios.delete(`/api/v1/media/${data.mediaInfo.id}`); await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
revalidate(); revalidate();
onClose(); onClose();
@@ -414,7 +416,7 @@ const ManageSlideOver = ({
isDefaultService() && ( isDefaultService() && (
<div> <div>
<ConfirmButton <ConfirmButton
onClick={() => deleteMediaFile()} onClick={() => deleteMediaFile(false)}
confirmText={intl.formatMessage( confirmText={intl.formatMessage(
globalMessages.areyousure globalMessages.areyousure
)} )}
@@ -573,7 +575,7 @@ const ManageSlideOver = ({
{isDefaultService() && ( {isDefaultService() && (
<div> <div>
<ConfirmButton <ConfirmButton
onClick={() => deleteMediaFile()} onClick={() => deleteMediaFile(true)}
confirmText={intl.formatMessage( confirmText={intl.formatMessage(
globalMessages.areyousure globalMessages.areyousure
)} )}

View File

@@ -0,0 +1,91 @@
import defineMessages from '@app/utils/defineMessages';
import { useIntl } from 'react-intl';
import Select, { type StylesConfig } from 'react-select';
enum MetadataProviderType {
TMDB = 'tmdb',
TVDB = 'tvdb',
}
type MetadataProviderOptionType = {
testId?: string;
value: MetadataProviderType;
label: string;
};
const messages = defineMessages('components.MetadataSelector', {
tmdbLabel: 'The Movie Database (TMDB)',
tvdbLabel: 'TheTVDB',
selectMetdataProvider: 'Select a metadata provider',
});
interface MetadataSelectorProps {
testId: string;
value: MetadataProviderType;
onChange: (value: MetadataProviderType) => void;
isDisabled?: boolean;
}
const MetadataSelector = ({
testId = 'metadata-provider-selector',
value,
onChange,
isDisabled = false,
}: MetadataSelectorProps) => {
const intl = useIntl();
const metadataProviderOptions: MetadataProviderOptionType[] = [
{
testId: 'tmdb-option',
value: MetadataProviderType.TMDB,
label: intl.formatMessage(messages.tmdbLabel),
},
{
testId: 'tvdb-option',
value: MetadataProviderType.TVDB,
label: intl.formatMessage(messages.tvdbLabel),
},
];
const customStyles: StylesConfig<MetadataProviderOptionType, false> = {
option: (base) => ({
...base,
display: 'flex',
alignItems: 'center',
}),
singleValue: (base) => ({
...base,
display: 'flex',
alignItems: 'center',
}),
};
const formatOptionLabel = (option: MetadataProviderOptionType) => (
<div className="flex items-center">
<span data-testid={option.testId}>{option.label}</span>
</div>
);
return (
<div data-testid={testId}>
<Select
options={metadataProviderOptions}
isDisabled={isDisabled}
className="react-select-container"
classNamePrefix="react-select"
value={metadataProviderOptions.find((option) => option.value === value)}
onChange={(selectedOption) => {
if (selectedOption) {
onChange(selectedOption.value);
}
}}
placeholder={intl.formatMessage(messages.selectMetdataProvider)}
styles={customStyles}
formatOptionLabel={formatOptionLabel}
/>
</div>
);
};
export { MetadataProviderType };
export default MetadataSelector;

Some files were not shown because too many files have changed in this diff Show More