chore(release): 1.22.0

this commit removes the local cache option for the settings page. The feature will still function
but must be manually enabled in the `settings.json` file. We will add it back in later after
resolving the current outstanding issues.

.all-contributorsrc

@@ -312,6 +312,125 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "NuroDev",
+      "name": "nuro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4991309?v=4",
+      "profile": "https://nuro.dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "onedr0p",
+      "name": "ᗪєνιη ᗷυнʟ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/213795?v=4",
+      "profile": "https://github.com/onedr0p",
+      "contributions": [
+        "infra"
+      ]
+    },
+    {
+      "login": "JonnyWong16",
+      "name": "JonnyWong16",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9099342?v=4",
+      "profile": "https://github.com/JonnyWong16",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Roxedus",
+      "name": "Roxedus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7110194?v=4",
+      "profile": "https://github.com/Roxedus",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "WoisWoi",
+      "name": "WoisWoi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/75491231?v=4",
+      "profile": "https://github.com/WoisWoi",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "HubDuck",
+      "name": "HubDuck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77843475?v=4",
+      "profile": "https://github.com/HubDuck",
+      "contributions": [
+        "translation",
+        "doc"
+      ]
+    },
+    {
+      "login": "costaht",
+      "name": "costaht",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50637431?v=4",
+      "profile": "https://github.com/costaht",
+      "contributions": [
+        "doc",
+        "translation"
+      ]
+    },
+    {
+      "login": "Shjosan",
+      "name": "Shjosan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20847626?v=4",
+      "profile": "https://github.com/Shjosan",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "kobaubarr",
+      "name": "kobaubarr",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28481522?v=4",
+      "profile": "https://github.com/kobaubarr",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "notorius28",
+      "name": "Ricardo González",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1621513?v=4",
+      "profile": "https://github.com/notorius28",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Torkiliuz",
+      "name": "Torkil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/460764?v=4",
+      "profile": "http://torkili.uz",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "JagandeepBrar",
+      "name": "Jagandeep Brar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3048295?v=4",
+      "profile": "https://www.jagandeepbrar.io",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "dtalens",
+      "name": "dtalens",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6631832?v=4",
+      "profile": "http://dtalens.com",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",

.dockerignore

@@ -8,16 +8,20 @@
 .git
 .gitbook.yaml
 .gitconfig
-.gitignore
 .github
+.gitignore
 .next
 .prettierignore
-config/db/db.sqlite3
-config/db/logs/overseerr.log
+config/db/*
+config/logs/*
+config/*.json
+dist
 Dockerfile*
 docker-compose.yml
 docs
 LICENSE
 node_modules
+public/os_logo_square.png
+public/preview.jpg
 snap
 stylelint.config.js

.eslintrc.js

@@ -4,12 +4,10 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
-    'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
-    'plugin:prettier/recommended', // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
     'plugin:jsx-a11y/recommended',
     'plugin:react/recommended',
     'plugin:react-hooks/recommended',
-    'prettier/react',
+    'prettier',
   ],
   parserOptions: {
     ecmaVersion: 6,

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     name: Lint & Test Build
     runs-on: ubuntu-20.04
-    container: node:12.18-alpine
+    container: node:14.16-alpine
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -24,6 +24,7 @@ jobs:
         run: yarn lint
       - name: build
         run: yarn build
+
   build_and_push:
     name: Build & Publish to Docker Hub
     needs: test
@@ -59,6 +60,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           build-args: |
             COMMIT_TAG=${{ github.sha }}
@@ -68,7 +70,15 @@ jobs:
             ghcr.io/sct/overseerr:develop
             ghcr.io/sct/overseerr:${{ github.sha }}
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+      - # Temporary fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
   discord:
     name: Send Discord Notification
     needs: build_and_push
@@ -76,8 +86,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2.1.2
-
+        uses: technote-space/workflow-conclusion-action@v2.1.5
       - name: Combine Job Status
         id: status
         run: |
@@ -87,7 +96,6 @@ jobs:
           else
             echo ::set-output name=status::$WORKFLOW_CONCLUSION
           fi
-
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1
         with:

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   test:
     name: Lint & Test Build
     runs-on: ubuntu-20.04
-    container: node:12.18-alpine
+    container: node:14.16-alpine
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -31,9 +31,24 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 14
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
       - name: Install dependencies
         run: yarn
       - name: Release
@@ -108,7 +123,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2.1.2
+        uses: technote-space/workflow-conclusion-action@v2.1.5
 
       - name: Combine Job Status
         id: status

.github/workflows/snap.yaml

@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2.1.2
+        uses: technote-space/workflow-conclusion-action@v2.1.5
 
       - name: Combine Job Status
         id: status

.gitignore

@@ -32,7 +32,7 @@ yarn-error.log*
 .vercel
 
 # database
-config/db/*.sqlite3
+config/db/*.sqlite3*
 config/settings.json
 
 # logs

.vscode/settings.json

@@ -14,5 +14,9 @@
       "name": "Local SQLite",
       "database": "./config/db/db.sqlite3"
     }
-  ]
+  ],
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true
+  },
+  "editor.formatOnSave": true
 }

CHANGELOG.md

@@ -1,3 +1,155 @@
+# [1.22.0](https://github.com/sct/overseerr/compare/v1.21.1...v1.22.0) (2021-04-01)
+
+
+### Bug Fixes
+
+* **android:** adaptive icons for Android devices ([#1274](https://github.com/sct/overseerr/issues/1274)) ([a65e3d5](https://github.com/sct/overseerr/commit/a65e3d5bb6924cbde30b26ff8acf535e5274efee))
+* **backend:** fix getShowByTvdbId() error message ([#1314](https://github.com/sct/overseerr/issues/1314)) [skip ci] ([fe8d346](https://github.com/sct/overseerr/commit/fe8d34607b07095dce51b29ef7aaae0485573f14))
+* **db:** enable WAL journal mode ([aa205ff](https://github.com/sct/overseerr/commit/aa205ffa975d02ef0be30626e7c946a42679a847))
+* **frontend:** 'Recent Requests' slider should link to request list w/ same filter ([#1235](https://github.com/sct/overseerr/issues/1235)) ([49782c0](https://github.com/sct/overseerr/commit/49782c0b730cce9f0bad14e9c83842b5b0bfe11e))
+* **frontend:** call mutate after changing public settings ([#1302](https://github.com/sct/overseerr/issues/1302)) ([c8f67cf](https://github.com/sct/overseerr/commit/c8f67cf866ada791e4129a0bbae16b9eac41f32e))
+* **frontend:** include language parameter in TMDb links ([#1344](https://github.com/sct/overseerr/issues/1344)) ([1d88be9](https://github.com/sct/overseerr/commit/1d88be9341a8ff9e1f39b02556b489cdbd06392b))
+* **frontend:** redirect from /setup if already initialized ([#1238](https://github.com/sct/overseerr/issues/1238)) ([8016503](https://github.com/sct/overseerr/commit/80165038fd214897e3520a420f971341e7b94865))
+* **frontend:** use correct path to user profile in request modal quota dropdown ([#1307](https://github.com/sct/overseerr/issues/1307)) ([f990585](https://github.com/sct/overseerr/commit/f9905859148088afec53549b81611b07bf19d3b9))
+* **frontend:** use HTTPS to fetch TMDb assets for network/studio sliders ([#1343](https://github.com/sct/overseerr/issues/1343)) ([c886ea6](https://github.com/sct/overseerr/commit/c886ea6c0578cb7532d6c09266a76bfad8598b9d))
+* **frontend:** use next/image to serve login page images ([cbf4519](https://github.com/sct/overseerr/commit/cbf45196b023f60c8e4cf7602c0295f886fe610c)), closes [#1207](https://github.com/sct/overseerr/issues/1207)
+* **lang:** allow proper localization of comma-delimited lists ([#1264](https://github.com/sct/overseerr/issues/1264)) ([173408a](https://github.com/sct/overseerr/commit/173408a1f269f09c724843ba087ef3f85b2832ad))
+* **lang:** change 'Extra Data' string to 'Additional Data' ([#1226](https://github.com/sct/overseerr/issues/1226)) ([665e164](https://github.com/sct/overseerr/commit/665e16475f3fa2ea6118340d9ea2d30b98abb238))
+* **lang:** correct mismatched language strings ([#1246](https://github.com/sct/overseerr/issues/1246)) ([8ebc829](https://github.com/sct/overseerr/commit/8ebc8292504cdc57a148ab69bcb4e1514ef018c6))
+* **lang:** correct strings for library sync button & user import toast ([#1252](https://github.com/sct/overseerr/issues/1252)) ([cb5ca7a](https://github.com/sct/overseerr/commit/cb5ca7acf38dcc2e27ec31d88434a11757cdb469))
+* **lang:** edit setting label strings for verb tense consistency ([#1214](https://github.com/sct/overseerr/issues/1214)) ([6d7671d](https://github.com/sct/overseerr/commit/6d7671dd80fea632e5cef29fc0b4968bffe231b0))
+* **lang:** fix overwritten/shared string ([#1212](https://github.com/sct/overseerr/issues/1212)) ([dfd4ff9](https://github.com/sct/overseerr/commit/dfd4ff9229822b0ce79ba322376194cbb6fd233d))
+* **lang:** remove 'requires and' ([#1215](https://github.com/sct/overseerr/issues/1215)) ([cb852fd](https://github.com/sct/overseerr/commit/cb852fded18f53806c23ec6f215385072b2a867b))
+* **lang:** remove unused strings ([#1330](https://github.com/sct/overseerr/issues/1330)) ([13e1595](https://github.com/sct/overseerr/commit/13e1595c6ebff32ca905d9bd3dd781e241545e83))
+* **lang:** UI string edits, round 2 ([#1202](https://github.com/sct/overseerr/issues/1202)) ([ea1863a](https://github.com/sct/overseerr/commit/ea1863ac3a5d3051e07815d07df0d3f2abd9166f))
+* **log:** fix typo in base scanner logging ([#1329](https://github.com/sct/overseerr/issues/1329)) [skip ci] ([b0b04ca](https://github.com/sct/overseerr/commit/b0b04ca1c7218ad5b67d9ec8b3fac5af78a4c132))
+* **logs:** add i18n strings for new log page changes ([8c51c28](https://github.com/sct/overseerr/commit/8c51c28f546b9c2d38ff7f20d59bb08a599e8146))
+* **notifications:** correctly send notifications for users that do not have any user settings yet ([d3a25b9](https://github.com/sct/overseerr/commit/d3a25b935aae35dd97ef0f168ac7e2898126a9a5)), closes [#1324](https://github.com/sct/overseerr/issues/1324)
+* **overseerr-api.yml:** fixed pushbullet & webhook API definition refs and descriptions ([#1288](https://github.com/sct/overseerr/issues/1288)) [skip ci] ([3b003b7](https://github.com/sct/overseerr/commit/3b003b770120f7d150c64ff098b626015c030794))
+* **plex:** always send Overseerr for the device name to the plex.tv api ([f7146e4](https://github.com/sct/overseerr/commit/f7146e41899a59f75b963e1cc9dac9eddf24aebe)), closes [#1244](https://github.com/sct/overseerr/issues/1244)
+* **ui:** add validation to hostname/IP fields ([#1206](https://github.com/sct/overseerr/issues/1206)) ([f49a024](https://github.com/sct/overseerr/commit/f49a02449c4928aef56cecbf908cf585ea0d4fca))
+* **ui:** better regex matching when parsing logs ([#1225](https://github.com/sct/overseerr/issues/1225)) ([2d737f2](https://github.com/sct/overseerr/commit/2d737f276095a8ca9abea360ef29134e9f639a39))
+* **ui:** button w/ dropdown z-indices ([#1230](https://github.com/sct/overseerr/issues/1230)) ([015671f](https://github.com/sct/overseerr/commit/015671f5be7a9f0f5c38db5a11a4b3c788dfaade))
+* **ui:** center role under title cards on person detail pages ([#1205](https://github.com/sct/overseerr/issues/1205)) ([4a61518](https://github.com/sct/overseerr/commit/4a6151873a3a3c5e45f9817131774a2c52957138))
+* **ui:** correctly enable the request button when partial requests are disabled with no quota ([16a611b](https://github.com/sct/overseerr/commit/16a611b9dfc3c66483640f4f5364646f41d37159))
+* **ui:** correctly paginate request list ([67fbb40](https://github.com/sct/overseerr/commit/67fbb401ac6ba05e58b8dfefd5954b28316254f2))
+* **ui:** correctly show quota display on tv request modal when only series quota is set ([3f1f85a](https://github.com/sct/overseerr/commit/3f1f85a80edfd2a4e9627162ff29ca6bcf2d8583))
+* **ui:** display asterisk indicator on required field labels ([#1236](https://github.com/sct/overseerr/issues/1236)) ([380d361](https://github.com/sct/overseerr/commit/380d36119f19a20ad67f79b3fb5db4036a093cac))
+* **ui:** do not check isValid on Sonarr/Radarr modals for the test button ([0974a4c](https://github.com/sct/overseerr/commit/0974a4c971358b7a64668f9a63fc356234a656c9))
+* **ui:** do not require numeric value in FormattedRelativeTime ([#1234](https://github.com/sct/overseerr/issues/1234)) ([3642b1e](https://github.com/sct/overseerr/commit/3642b1e84a20fef72428b3e240c86d35be8be8a2))
+* **ui:** filter out server options that do not match request type (non-4K or 4K) ([#1183](https://github.com/sct/overseerr/issues/1183)) ([28a6a70](https://github.com/sct/overseerr/commit/28a6a70e1ecc125f4cf4900e599ad0d4d7b55e3b))
+* **ui:** fix label formatting in general user settings ([#1275](https://github.com/sct/overseerr/issues/1275)) ([8546b0e](https://github.com/sct/overseerr/commit/8546b0ef53d232256b62cf08466e692a6971c16b))
+* **ui:** fix regex matching when parsing label from logs ([#1231](https://github.com/sct/overseerr/issues/1231)) ([4a00617](https://github.com/sct/overseerr/commit/4a00617fe47064ea50f95a02f29832a419ab13a3))
+* **ui:** gracefully handle lengthy titles & long words in overviews ([#1338](https://github.com/sct/overseerr/issues/1338)) ([d8bcb99](https://github.com/sct/overseerr/commit/d8bcb99b2fd3b24a5119ba5ff213a640425ff553))
+* **ui:** hide 'show details' button if there are no additional details ([#1254](https://github.com/sct/overseerr/issues/1254)) ([6210f12](https://github.com/sct/overseerr/commit/6210f12e8e9f593d629d22278d78310482ca0cfa))
+* **ui:** increase page size dropdown width when necessary ([#1216](https://github.com/sct/overseerr/issues/1216)) ([75c72b9](https://github.com/sct/overseerr/commit/75c72b987eb52b907ffd8af33f15ecc58213fc12))
+* **ui:** restore saved states of quota override checkboxes ([#1282](https://github.com/sct/overseerr/issues/1282)) ([2059fc1](https://github.com/sct/overseerr/commit/2059fc1cd4d48c7d80e761b7d41b7ec122d82769))
+* **ui:** sort regions & languages by their localized names rather than their TMDb English names ([#1157](https://github.com/sct/overseerr/issues/1157)) ([d76bf32](https://github.com/sct/overseerr/commit/d76bf32c9dcc83ebd0bae979726b1456a9028d8b))
+* **ui:** tweak request list design ([#1201](https://github.com/sct/overseerr/issues/1201)) ([d226fc7](https://github.com/sct/overseerr/commit/d226fc79b8d5f1263d4b80a7a1772074020ec94f))
+* **ui:** use appropriate cursor type for disabled UI elements ([#1184](https://github.com/sct/overseerr/issues/1184)) ([b767a58](https://github.com/sct/overseerr/commit/b767a58b011cc317a889cb8c2889b3210bec5fae))
+* **ui:** use appropriate cursor type for readonly input fields ([#1208](https://github.com/sct/overseerr/issues/1208)) ([9ec2c46](https://github.com/sct/overseerr/commit/9ec2c468cbbcbd41b94bbf9f3cfeb43eed09f36e))
+* **ui:** use correct colspan for 'No results.' message in Settings > Logs ([#1325](https://github.com/sct/overseerr/issues/1325)) ([5c135c9](https://github.com/sct/overseerr/commit/5c135c9974ebfcbdb434dafd459d1035624df6ed))
+* fetch localized person details from TMDb ([#1243](https://github.com/sct/overseerr/issues/1243)) ([1d7a938](https://github.com/sct/overseerr/commit/1d7a938ef8b0b8c20fda5024121de2a217ef4127))
+
+
+### Features
+
+* **frontend:** add apple splash for pwa ([232def9](https://github.com/sct/overseerr/commit/232def972b9156afcbd83592708dbf8b5866ee24))
+* **frontend:** add apple tv+ to network slider ([3dc27ff](https://github.com/sct/overseerr/commit/3dc27ffd9bb054e6cda58872939dbc352877d184)), closes [#1219](https://github.com/sct/overseerr/issues/1219)
+* **frontend:** allow selecting multiple original languages ([a908c07](https://github.com/sct/overseerr/commit/a908c07670532b0ca7f766065bb4653ce2376e6f))
+* **lang:** add Catalan to language picker ([#1309](https://github.com/sct/overseerr/issues/1309)) ([77911c0](https://github.com/sct/overseerr/commit/77911c03e98aa3c2c6c062a01c22b030704309c2))
+* **lang:** translations update from Weblate ([#1178](https://github.com/sct/overseerr/issues/1178)) ([3c89010](https://github.com/sct/overseerr/commit/3c89010629bc16f225f1d3936abe9f4e47a0d7c7))
+* **lang:** translations update from Weblate ([#1224](https://github.com/sct/overseerr/issues/1224)) ([c1975b3](https://github.com/sct/overseerr/commit/c1975b33f1115a95068be000b7f479a401f0f0ae))
+* **lang:** translations update from Weblate ([#1237](https://github.com/sct/overseerr/issues/1237)) ([dabd32a](https://github.com/sct/overseerr/commit/dabd32a18b42980059c7a7a7450514ca827a5d3b))
+* **lang:** translations update from Weblate ([#1256](https://github.com/sct/overseerr/issues/1256)) ([e9b1a9e](https://github.com/sct/overseerr/commit/e9b1a9e80e6b8285fa451a8551c5832a850c1746))
+* **lang:** translations update from Weblate ([#1281](https://github.com/sct/overseerr/issues/1281)) ([bec1d3d](https://github.com/sct/overseerr/commit/bec1d3dde834b9a50e24c5894c362e5982ff3bd5))
+* **lang:** translations update from Weblate ([#1305](https://github.com/sct/overseerr/issues/1305)) ([1b129c0](https://github.com/sct/overseerr/commit/1b129c0b3863ea3c5ad34c66b3ace5d09cd4e391))
+* **lang:** translations update from Weblate ([#1313](https://github.com/sct/overseerr/issues/1313)) ([18ce349](https://github.com/sct/overseerr/commit/18ce349faac6ee560b9c92374039954f2365a8d1))
+* **logs:** add copy to clipboard button to logs page ([e2b8745](https://github.com/sct/overseerr/commit/e2b8745fdc192f3d49872625652184005a760885))
+* **notif:** include requested season numbers in notifications ([#1211](https://github.com/sct/overseerr/issues/1211)) ([4ee78ab](https://github.com/sct/overseerr/commit/4ee78ab2fe0359df6baa58f0986687f05a8392a2))
+* **requests:** add request quotas ([#1277](https://github.com/sct/overseerr/issues/1277)) ([6c75c88](https://github.com/sct/overseerr/commit/6c75c8822842514ffd31864992e8d3ce686fea1b))
+* **settings:** logs viewer ([#997](https://github.com/sct/overseerr/issues/997)) ([54429bb](https://github.com/sct/overseerr/commit/54429bbc1d765d0e50486a42749f9bbd4e5b3386))
+* **ui:** add movie/series genre list pages ([#1194](https://github.com/sct/overseerr/issues/1194)) ([6f1a31d](https://github.com/sct/overseerr/commit/6f1a31de473d1a25bc77e0961a52b07050b64c51))
+* **ui:** add option to only allow complete series requests ([#1164](https://github.com/sct/overseerr/issues/1164)) ([36c00fd](https://github.com/sct/overseerr/commit/36c00fde273799a56ec42ce6177ff44fed0904c3))
+* **ui:** Add user requests page ([#936](https://github.com/sct/overseerr/issues/936)) ([a9461f7](https://github.com/sct/overseerr/commit/a9461f760d8112f2ae16183e796f706d3392f8ec))
+* **ui:** allow any value 1-100 for quota limit/days ([#1337](https://github.com/sct/overseerr/issues/1337)) ([f4bed9a](https://github.com/sct/overseerr/commit/f4bed9a63b6b856ebedca9eb7662cd00038d7f7c))
+* **ui:** display movie/series original title ([#1240](https://github.com/sct/overseerr/issues/1240)) ([7230915](https://github.com/sct/overseerr/commit/723091509414465e98d870b3dc943f41b9ac590d))
+* **ui:** experimental status bar style change for ios pwa app ([958cdf9](https://github.com/sct/overseerr/commit/958cdf98fd1cb7c1bdb33aebb6c061750e9ab331))
+* **ui:** store sort order and page size of userlist in localstorage ([#1262](https://github.com/sct/overseerr/issues/1262)) ([f5f8269](https://github.com/sct/overseerr/commit/f5f8269cd28ee792120060f4f38ef09d571fb8d5))
+* add option to cache images locally ([#1213](https://github.com/sct/overseerr/issues/1213)) ([0ca3d43](https://github.com/sct/overseerr/commit/0ca3d4374942b54b59a19d017ab4ae14ba7019c1))
+* genre sliders (experiment) ([#1182](https://github.com/sct/overseerr/issues/1182)) ([1c4515a](https://github.com/sct/overseerr/commit/1c4515a1ae6097f3948aaa0d0ed210831581fd98))
+
+
+### Reverts
+
+* **ui:** remove local image cache option from settings page ([911faef](https://github.com/sct/overseerr/commit/911faeff562b737a2d18a395fcd90bf354af0cc4))
+* remove experimental tailwind jit compiler until title card hover is fixed ([1df67ba](https://github.com/sct/overseerr/commit/1df67baf9e7cdabc4045a0c115735797e8081bca))
+* **deps:** revert react-intl to 5.13.5 ([e16277c](https://github.com/sct/overseerr/commit/e16277c07d58ddbb749f4a60bc05924f4a5af146))
+
+## [1.21.1](https://github.com/sct/overseerr/compare/v1.21.0...v1.21.1) (2021-03-15)
+
+
+### Bug Fixes
+
+* **lang:** translations update from Weblate ([#1155](https://github.com/sct/overseerr/issues/1155)) ([ebc285c](https://github.com/sct/overseerr/commit/ebc285c758f69846e4a5cb74bb42ca5924d166d4))
+
+# [1.21.0](https://github.com/sct/overseerr/compare/v1.20.1...v1.21.0) (2021-03-15)
+
+
+### Bug Fixes
+
+* do not allow editing of user settings under certain conditions ([#1168](https://github.com/sct/overseerr/issues/1168)) ([001dcd3](https://github.com/sct/overseerr/commit/001dcd328c8d3b1c417fd7c7ee2aa20183b08eef))
+* **frontend:** check for ID instead of email after initial setup Plex login ([#1097](https://github.com/sct/overseerr/issues/1097)) ([778dda6](https://github.com/sct/overseerr/commit/778dda67d54df87347dd79577ef1bdc88d3c1d3f))
+* **frontend:** check if swr is validating to determine if we should fetch new data ([e5f5bdb](https://github.com/sct/overseerr/commit/e5f5bdb95c62eba31a3321a7457d354f0226bf85)), closes [#719](https://github.com/sct/overseerr/issues/719)
+* **frontend:** never hide available content in search results ([d48edeb](https://github.com/sct/overseerr/commit/d48edeb5a9bd8e2edce8bca0fea50e300bb7a1ae))
+* **lang:** add missing i18n strings ([6072e8a](https://github.com/sct/overseerr/commit/6072e8aa9a0f84e50c44a92af303aad15b5f3021))
+* **lang:** edit new Telegram-related strings to conform to style guide ([#1093](https://github.com/sct/overseerr/issues/1093)) ([bdf67e7](https://github.com/sct/overseerr/commit/bdf67e732b6c77cbae768a25edfc9a663ef0108b))
+* **notif:** loosen input validation on Pushover settings ([#1166](https://github.com/sct/overseerr/issues/1166)) ([3148d31](https://github.com/sct/overseerr/commit/3148d312141248653c5d1e42cd2882a67a339163))
+* **notif:** set URL for Discord embeds rather than adding a field for the link ([#1167](https://github.com/sct/overseerr/issues/1167)) ([0bd0912](https://github.com/sct/overseerr/commit/0bd0912613f0db24bd0da4ec956b5119133e35d4))
+* correctly send auto-approval notifictions for series ([8634081](https://github.com/sct/overseerr/commit/8634081c869a2078793ecf06b1b7e249bba0a2f8))
+* **lang:** fix singular form of season count ([#1080](https://github.com/sct/overseerr/issues/1080)) ([b57645d](https://github.com/sct/overseerr/commit/b57645d382361c856281e7a74295afe16c5390f2))
+* **requests:** add plex url to request item ([#1088](https://github.com/sct/overseerr/issues/1088)) ([420038d](https://github.com/sct/overseerr/commit/420038d5ffdd4070df03e5c5cb6ef8d6208fddb5))
+* **sonarr:** correctly search when updating existing sonarr series ([ed0a7fb](https://github.com/sct/overseerr/commit/ed0a7fbdf5122a26fa936e83b76a97c55781782d)), closes [#588](https://github.com/sct/overseerr/issues/588)
+* **ui:** add alt prop to studio/network logos & fix blinking text cursor ([#1095](https://github.com/sct/overseerr/issues/1095)) ([0c4637f](https://github.com/sct/overseerr/commit/0c4637f779d8904037b9cbd5fe9166cf05a891c5))
+* **ui:** add link to poster image on request items ([7289872](https://github.com/sct/overseerr/commit/7289872937d5bb94d027424760ee1ceb94095604))
+* **ui:** correct language usage re: "sync" vs. "scan" ([#1079](https://github.com/sct/overseerr/issues/1079)) ([e98f2b9](https://github.com/sct/overseerr/commit/e98f2b96058fb9c5af77be2e8a1bd07fb8fcca06))
+* **ui:** display "Season" vs. "Seasons" as appropriate, and fix request block "Seasons" formatting ([#1127](https://github.com/sct/overseerr/issues/1127)) ([45886cc](https://github.com/sct/overseerr/commit/45886ccef1bee57dc555060a491834567e45b59c))
+* **ui:** request list button sizes ([#1152](https://github.com/sct/overseerr/issues/1152)) ([fc73592](https://github.com/sct/overseerr/commit/fc73592b69c38191f91a68a020868b8e5ec2e2e2))
+* fix language filter link on movie detail pages ([#1142](https://github.com/sct/overseerr/issues/1142)) ([60d453b](https://github.com/sct/overseerr/commit/60d453b0bbba5e2060f72f40d1dde85ec6b05af4))
+* remove language/region filtering on studio/network results ([#1129](https://github.com/sct/overseerr/issues/1129)) ([109aca8](https://github.com/sct/overseerr/commit/109aca8229dc7b81cac314d84591f1c04c12ac2e))
+* **api:** check correct permissions for auto approve when requests are created ([3c1a72b](https://github.com/sct/overseerr/commit/3c1a72b038fd178b4be4dc082cd1496474148d7e))
+* **frontend:** status, requested by, and modified alignment fix ([#1109](https://github.com/sct/overseerr/issues/1109)) ([1a7dc1a](https://github.com/sct/overseerr/commit/1a7dc1acf57888d3d0285b58c1c97a824a232216))
+* **ui:** don't show "Password" user settings tab if current user lacks perms to modify the password ([#1063](https://github.com/sct/overseerr/issues/1063)) ([b146d11](https://github.com/sct/overseerr/commit/b146d11e2ffecedae76472b0491a4662ca4a4a4e))
+* **ui:** fix Radarr logo alignment ([#1068](https://github.com/sct/overseerr/issues/1068)) ([0fa005a](https://github.com/sct/overseerr/commit/0fa005a99cd868b5a235ae9ce65b4c64b05d0f47))
+* **ui:** fix request list UI behavior when season list is too long ([#1106](https://github.com/sct/overseerr/issues/1106)) ([8507691](https://github.com/sct/overseerr/commit/85076919c6ccbf052699b7d5f4ba8b6e5e5af74d))
+* **ui:** improve responsive design on new request list UI ([#1105](https://github.com/sct/overseerr/issues/1105)) ([1f8b03f](https://github.com/sct/overseerr/commit/1f8b03ff6f67ce76051667de05166da54ed3dc89))
+* **ui:** list all movie studios instead of just the first result ([#1110](https://github.com/sct/overseerr/issues/1110)) ([239202d](https://github.com/sct/overseerr/commit/239202d9c11f27410b0fa084bcc4c824b7136081))
+* add correct permission checks to modifying user password/permissions ([ddfc5e6](https://github.com/sct/overseerr/commit/ddfc5e6aa8fc636931f495d6f23d56367466e3b5))
+
+
+### Features
+
+* add tagline, episode runtime, genres list to media details & clean/refactor CSS into globals ([#1160](https://github.com/sct/overseerr/issues/1160)) ([2f2e002](https://github.com/sct/overseerr/commit/2f2e00237d43bdab85bfadc3c4f2fbcdde4c2e90))
+* **docker:** add tini to docker image ([#1017](https://github.com/sct/overseerr/issues/1017)) ([1629d02](https://github.com/sct/overseerr/commit/1629d02f3d8368bfd5f6fed05382974ae6fce51f))
+* **email:** add pgp support ([#1138](https://github.com/sct/overseerr/issues/1138)) ([9e5adeb](https://github.com/sct/overseerr/commit/9e5adeb610bdc4800ff536412d0ae8a11fb4338d))
+* **frontend:** add loading bar indicator ([#1170](https://github.com/sct/overseerr/issues/1170)) ([3d6b343](https://github.com/sct/overseerr/commit/3d6b3434138fec49c58f2bf74f781d5e2fc2911f))
+* **lang:** localize job names ([#1043](https://github.com/sct/overseerr/issues/1043)) ([594aad9](https://github.com/sct/overseerr/commit/594aad9d3ae9b323677f3af8c434d7664526593d))
+* **lang:** translations update from Weblate ([#1051](https://github.com/sct/overseerr/issues/1051)) ([69bf817](https://github.com/sct/overseerr/commit/69bf817f598babed99964f073259f827b60bd014))
+* **lang:** Translations update from Weblate ([#1131](https://github.com/sct/overseerr/issues/1131)) ([e4686d6](https://github.com/sct/overseerr/commit/e4686d664b52448e32488ff1c4236f72e01e9a29))
+* **notif:** add "Media Automatically Approved" notification type ([#1137](https://github.com/sct/overseerr/issues/1137)) ([f7d2723](https://github.com/sct/overseerr/commit/f7d2723fab2c30564fd23945709cd39b178a6eef))
+* **notif:** add settings for Discord bot username & avatar URL ([#1113](https://github.com/sct/overseerr/issues/1113)) ([3384eb1](https://github.com/sct/overseerr/commit/3384eb1c479114c0246cb22f9a933aa79fb95fcf))
+* **notif:** include poster image in Telegram notifications ([#1112](https://github.com/sct/overseerr/issues/1112)) ([48387e5](https://github.com/sct/overseerr/commit/48387e5b2f26c0c33acd436c6e1cf902d6c32101))
+* **scan:** add support for new plex tv agent ([#1144](https://github.com/sct/overseerr/issues/1144)) ([a51d2a2](https://github.com/sct/overseerr/commit/a51d2a24d51d092a0c6da608e3322f19a37c2d28))
+* **ui:** add user ID to profile header ([6e95c8b](https://github.com/sct/overseerr/commit/6e95c8b7a10e3467bfd2c3df84ccf886fe01ca5c))
+* add genre/studio/network view to Discover results ([#1067](https://github.com/sct/overseerr/issues/1067)) ([f28112f](https://github.com/sct/overseerr/commit/f28112f057df2589f31ae0d0b14e8b50e479fdb7))
+* add language-filtered Discover pages ([#1111](https://github.com/sct/overseerr/issues/1111)) ([7501161](https://github.com/sct/overseerr/commit/75011610e57f03098c8be9375d0c9ba1e3647e9b))
+* add studio/network sliders to discover ([1c6914f](https://github.com/sct/overseerr/commit/1c6914f5ce5c0d171c4609813915b50233a8e3ad))
+* **telegram:** add support for individual chat notifications ([#1027](https://github.com/sct/overseerr/issues/1027)) ([f6d00d8](https://github.com/sct/overseerr/commit/f6d00d8d1559879189f83739193c6e2acafde51d))
+* **ui:** display "Owner" role instead of "Admin" for user ID 1 ([#1050](https://github.com/sct/overseerr/issues/1050)) ([1b55d2d](https://github.com/sct/overseerr/commit/1b55d2dfbc06d900e7370a4ddfd81789a25bf00c))
+* **ui:** display season count on TV details page ([#1078](https://github.com/sct/overseerr/issues/1078)) ([4365231](https://github.com/sct/overseerr/commit/436523139e8f1594c352b17032734b4498d3994f))
+* **ui:** in Settings > Services, make Radarr/Sonarr server names and logos clickable links ([#1008](https://github.com/sct/overseerr/issues/1008)) ([6a1e389](https://github.com/sct/overseerr/commit/6a1e3891aa5f84b6adb1e475a6658a8cd4e34c22))
+* **ui:** request list redesign ([#1099](https://github.com/sct/overseerr/issues/1099)) ([cd21865](https://github.com/sct/overseerr/commit/cd21865c4d5be00c13c372e0b7a058f61ec855a2))
+
 ## [1.20.1](https://github.com/sct/overseerr/compare/v1.20.0...v1.20.1) (2021-02-28)
 
 

CONTRIBUTING.md

@@ -1,80 +1,87 @@
 # Contributing to Overseerr
 
-All help is welcome and greatly appreciated. If you would like to contribute to the project, the instructions below can 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...
 
 ## Development
 
 ### Tools Required
 
-- HTML/Typescript/Javascript editor of choice. ([VSCode](https://code.visualstudio.com/) is recommended. Upon opening the project, a few extensions will be automatically recommended for install.)
-- [NodeJS](https://nodejs.org/en/download/) (Node 12.x.x or higher)
+- HTML/Typescript/Javascript editor
+  - [VSCode](https://code.visualstudio.com/) is recommended. Upon opening the project, a few extensions will be automatically recommended for install.
+- [NodeJS](https://nodejs.org/en/download/) (Node 14.x or higher)
 - [Yarn](https://yarnpkg.com/)
 - [Git](https://git-scm.com/downloads)
 
 ### Getting Started
 
-1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository to your own GitHub account and [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device:
 
    ```bash
    git clone https://github.com/YOUR_USERNAME/overseerr.git
    cd overseerr/
    ```
 
-2. Add the remote upstream.
+2. Add the remote `upstream`:
 
    ```bash
    git remote add upstream https://github.com/sct/overseerr.git
    ```
 
-3. Create a new branch
+3. Create a new branch:
 
    ```bash
    git checkout -b BRANCH_NAME develop
    ```
 
-   - It is recommended to name the branch something relevant to the feature or fix you are working on.
-   - An example of this would be `fix-title-cards` or `feature-new-system`.
-   - Bad examples would be `patch` or `bug`.
+   - It is recommended to give your branch a meaningful name, relevant to the feature or fix you are working on.
+     - Good examples:
+       - `docs-docker`
+       - `feature-new-system`
+       - `fix-title-cards`
+     - Bad examples:
+       - `bug`
+       - `docs`
+       - `feature`
+       - `fix`
+       - `patch`
 
-4. Run development environment
+4. Run the development environment:
 
    ```bash
    yarn
    yarn dev
    ```
 
-   - Alternatively you can run using [Docker](https://www.docker.com/) with `docker-compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
+   - Alternatively, you can use [Docker](https://www.docker.com/) with `docker-compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
 
-5. Create your patch and run appropriate tests.
+5. Create your patch and test your changes.
 
-6. Follow the [guidelines](#contributing-code).
-
-7. Should you need to update your fork, you can do so by rebasing from `upstream`:
-
-   ```bash
-   git fetch upstream
-   git rebase upstream/develop
-   git push origin BRANCH_NAME -f
-   ```
+   - Be sure to follow both the [code](#contributing-code) and [UI text](#ui-text-style) guidelines.
+   - Should you need to update your fork, you can do so by rebasing from `upstream`:
+     ```bash
+     git fetch upstream
+     git rebase upstream/develop
+     git push origin BRANCH_NAME -f
+     ```
 
 ### Contributing Code
 
-- If you are taking on an existing bug or feature ticket, please comment on the [GitHub Issue](https://github.com/sct/overseerr/issues) to avoid multiple people working on the same thing.
+- If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/sct/overseerr/issues) to avoid multiple people working on the same thing.
 - All commits **must** follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
-  - It is okay if you squash your PR down to be a single commit that fits this standard.
-  - PRs with commits not following this standard will not be merged.
+  - It is okay to squash your pull request down into a single commit that fits this standard.
+  - Pull requests with commits not following this standard will **not** be merged.
 - Please make meaningful commits, or squash them.
-- Always rebase your commit to the latest `develop` branch. Do not merge `develop` into your branch.
-- It is your responsibility to keep your branch up to date. It will not be merged unless its rebased off the latest `develop` branch.
+- Always rebase your commit to the latest `develop` branch. Do **not** merge `develop` into your branch.
+- It is your responsibility to keep your branch up-to-date. Your work will **not** be merged unless it is rebased off the latest `develop` branch.
 - You can create a "draft" pull request early to get feedback on your work.
-- Your code must be formatted correctly or the tests will fail.
-  - We use Prettier to format our codebase. It should automatically run with a `git` hook, but it is recommended to have the Prettier extension installed in your editor and format on save.
-- If you have questions or need help, you can reach out in [GitHub Discussions](https://github.com/sct/overseerr/discussions) or in our [Discord](https://discord.gg/PkCWJSeCk7).
-- Only open pull requests to `develop`. Never `master`. Any PRs opened to `master` will be closed.
+- Your code **must** be formatted correctly, or the tests will fail.
+  - We use Prettier to format our code base. It should automatically run with a Git hook, but it is recommended to have the Prettier extension installed in your editor and format on save.
+- If you have questions or need help, you can reach out via [Discussions](https://github.com/sct/overseerr/discussions) or our [Discord server](https://discord.gg/PkCWJSeCk7).
+- Only open pull requests to `develop`, never `master`! Any pull requests opened to `master` will be closed.
 
 ### UI Text Style
 
-When adding new UI text, please be sure to adhere to the following guidelines:
+When adding new UI text, please try to adhere to the following guidelines:
 
 1. Be concise and clear, and use as few words as possible to make your point.
 2. Use the Oxford comma where appropriate.
@@ -90,7 +97,7 @@ When adding new UI text, please be sure to adhere to the following guidelines:
 
 ## Translation
 
-We use [Weblate](https://hosted.weblate.org/engage/overseerr/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request on GitHub](https://github.com/sct/overseerr/issues/new/choose).
+We use [Weblate](https://hosted.weblate.org/engage/overseerr/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/sct/overseerr/issues/new/choose).
 
 <a href="https://hosted.weblate.org/engage/overseerr/"><img src="https://hosted.weblate.org/widgets/overseerr/-/overseerr-frontend/multi-auto.svg" alt="Translation status" /></a>
 

Dockerfile

@@ -1,4 +1,7 @@
-FROM node:14.15-alpine AS BUILD_IMAGE
+FROM node:14.16-alpine AS BUILD_IMAGE
+
+ARG TARGETPLATFORM
+ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 
 ARG COMMIT_TAG
 ENV COMMIT_TAG=${COMMIT_TAG}
@@ -6,7 +9,13 @@ ENV COMMIT_TAG=${COMMIT_TAG}
 COPY . /app
 WORKDIR /app
 
-RUN yarn --frozen-lockfile && \
+RUN \
+  case "${TARGETPLATFORM}" in \
+    'linux/arm64') apk add --no-cache python make g++ ;; \
+    'linux/arm/v7') apk add --no-cache python make g++ ;; \
+  esac
+
+RUN yarn --frozen-lockfile --network-timeout 1000000 && \
   yarn build
 
 # remove development dependencies
@@ -20,14 +29,15 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:14.15-alpine
+FROM node:14.16-alpine
 
-RUN apk add --no-cache tzdata
+RUN apk add --no-cache tzdata tini
 
 # copy from build image
 COPY --from=BUILD_IMAGE /app /app
 WORKDIR /app
 
-CMD yarn start
+ENTRYPOINT [ "/sbin/tini", "--" ]
+CMD [ "yarn", "start" ]
 
 EXPOSE 5055

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:12.18-alpine
+FROM node:14.16-alpine
 
 COPY . /app
 WORKDIR /app

README.md

@@ -12,7 +12,7 @@
 <a href="https://lgtm.com/projects/g/sct/overseerr/context:javascript"><img alt="Language grade: JavaScript" src="https://img.shields.io/lgtm/grade/javascript/g/sct/overseerr.svg?logo=lgtm&logoWidth=18"/></a>
 <a href="https://github.com/sct/overseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/sct/overseerr"></a>
 <!-- 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-33-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-46-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -47,6 +47,7 @@ Currently, Overseerr is primarily distributed as Docker images. If you have Dock
 
 ```
 docker run -d \
+  --name overseerr \
   -e LOG_LEVEL=info \
   -e TZ=Asia/Tokyo \
   -p 5055:5055 \
@@ -57,7 +58,7 @@ docker run -d \
 
 After running Overseerr for the first time, configure it by visiting the web UI at http://[address]:5055 and completing the setup steps
 
-For more information or alternative installation methods, please see the [Overseerr documentation](https://docs.overseerr.dev/getting-started/installation).
+For more information and alternative installation methods, please see the [Overseerr documentation](https://docs.overseerr.dev/getting-started/installation).
 
 ⚠️ Overseerr is currently under very heavy, rapid development and things are likely to break often. We need all the help we can get to find bugs and get them fixed to hit a more stable release. If you would like to help test the bleeding edge, please use the `sctx/overseerr:develop` image instead! ⚠️
 
@@ -140,6 +141,23 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://hmnd.io"><img src="https://avatars.githubusercontent.com/u/12853597?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=hmnd" title="Code">💻</a></td>
     <td align="center"><a href="https://www.douglas-parker.com"><img src="https://avatars.githubusercontent.com/u/18235822?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Douglas Parker</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=douglasparker" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/dancarter"><img src="https://avatars.githubusercontent.com/u/4387516?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Carter</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=dancarter" title="Code">💻</a></td>
+    <td align="center"><a href="https://nuro.dev"><img src="https://avatars.githubusercontent.com/u/4991309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nuro</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=NuroDev" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/onedr0p"><img src="https://avatars.githubusercontent.com/u/213795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ᗪєνιη ᗷυнʟ</b></sub></a><br /><a href="#infra-onedr0p" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/JonnyWong16"><img src="https://avatars.githubusercontent.com/u/9099342?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JonnyWong16</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JonnyWong16" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Roxedus"><img src="https://avatars.githubusercontent.com/u/7110194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roxedus</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Roxedus" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/WoisWoi"><img src="https://avatars.githubusercontent.com/u/75491231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WoisWoi</b></sub></a><br /><a href="#translation-WoisWoi" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/HubDuck"><img src="https://avatars.githubusercontent.com/u/77843475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HubDuck</b></sub></a><br /><a href="#translation-HubDuck" title="Translation">🌍</a> <a href="https://github.com/sct/overseerr/commits?author=HubDuck" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/costaht"><img src="https://avatars.githubusercontent.com/u/50637431?v=4?s=100" width="100px;" alt=""/><br /><sub><b>costaht</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=costaht" title="Documentation">📖</a> <a href="#translation-costaht" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Shjosan"><img src="https://avatars.githubusercontent.com/u/20847626?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shjosan</b></sub></a><br /><a href="#translation-Shjosan" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/kobaubarr"><img src="https://avatars.githubusercontent.com/u/28481522?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kobaubarr</b></sub></a><br /><a href="#translation-kobaubarr" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/notorius28"><img src="https://avatars.githubusercontent.com/u/1621513?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ricardo González</b></sub></a><br /><a href="#translation-notorius28" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://torkili.uz"><img src="https://avatars.githubusercontent.com/u/460764?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torkil</b></sub></a><br /><a href="#translation-Torkiliuz" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://www.jagandeepbrar.io"><img src="https://avatars.githubusercontent.com/u/3048295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jagandeep Brar</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JagandeepBrar" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://dtalens.com"><img src="https://avatars.githubusercontent.com/u/6631832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dtalens</b></sub></a><br /><a href="#translation-dtalens" title="Translation">🌍</a></td>
   </tr>
 </table>
 

docs/SUMMARY.md

@@ -8,8 +8,11 @@
 
 ## Using Overseerr
 
+- [Settings](using-overseerr/settings/README.md)
 - [Notifications](using-overseerr/notifications/README.md)
-  - [Custom Webhooks](using-overseerr/notifications/webhooks.md)
+  - [Email](using-overseerr/notifications/email.md)
+  - [Discord](using-overseerr/notifications/discord.md)
+  - [Webhooks](using-overseerr/notifications/webhooks.md)
 
 ## Support
 

docs/extending-overseerr/reverse-proxy-examples.md

@@ -1,12 +1,12 @@
 # Reverse Proxy Examples
 
 {% hint style="warning" %}
-Base URLs cannot be configured in Overseerr. With this limitation, only subdomain configurations are supported.
+Base URLs cannot be configured in Overseerr. With this limitation, only subdomain configurations are supported. However, a Nginx subfolder workaround configuration is provided below to use at your own risk.
 {% endhint %}
 
-## [SWAG (Secure Web Application Gateway, formerly known as `letsencrypt`)](https://github.com/linuxserver/docker-swag)
+## SWAG
 
-A sample proxy configuration is included in SWAG. However, this page is still the only source of truth, so the SWAG sample configuration is not guaranteed to be up-to-date. If you find an inconsistency, please [report it to the LinuxServer team](https://github.com/linuxserver/reverse-proxy-confs/issues/new) or [submit a pull request to update it](https://github.com/linuxserver/reverse-proxy-confs/pulls).
+A sample proxy configuration is included in [SWAG (Secure Web Application Gateway)](https://github.com/linuxserver/docker-swag). However, this page is still the only source of truth, so the SWAG sample configuration is not guaranteed to be up-to-date. If you find an inconsistency, please [report it to the LinuxServer team](https://github.com/linuxserver/reverse-proxy-confs/issues/new) or [submit a pull request to update it](https://github.com/linuxserver/reverse-proxy-confs/pulls).
 
 To use the bundled configuration file, simply rename `overseerr.subdomain.conf.sample` in the `proxy-confs` folder to `overseerr.subdomain.conf`. Alternatively, create a new file `overseerr.subdomain.conf` in `proxy-confs` with the following configuration:
 
@@ -53,11 +53,14 @@ labels:
 
 For more information, see the Traefik documentation for a [basic example](https://doc.traefik.io/traefik/user-guides/docker-compose/basic-example/).
 
-## `nginx`
+## Nginx
+
+{% tabs %}
+{% tab title="Subdomain" %}
 
 Add the following configuration to a new file `/etc/nginx/sites-available/overseerr.example.com.conf`:
 
-```text
+```nginx
 server {
     listen 80;
     server_name overseerr.example.com;
@@ -111,6 +114,46 @@ Then, create a symlink to `/etc/nginx/sites-enabled`:
 ```bash
 sudo ln -s /etc/nginx/sites-available/overseerr.example.com.conf /etc/nginx/sites-enabled/overseerr.example.com.conf
 ```
+{% endtab %}
+
+{% tab title="Subfolder" %}
+
+{% hint style="warning" %}
+Nginx subfolder reverse proxy is unsupported. The sub filters may stop working when Overseerr is updated. Use at your own risk!
+{% endhint %}
+
+Add the following location block to your existing `nginx.conf` file.
+
+```nginx
+location ^~ /overseerr {
+    set $app 'overseerr';
+    # Remove /overseerr path to pass to the app
+    rewrite ^/overseerr/?(.*)$ /$1 break;
+    proxy_pass http://127.0.0.1:5055;  # NO TRAILING SLASH
+    # Redirect location headers
+    proxy_redirect ^ /$app;
+    proxy_redirect /setup /$app/setup;
+    proxy_redirect /login /$app/login;
+    # Sub filters to replace hardcoded paths
+    proxy_set_header Accept-Encoding "";
+    sub_filter_once off;
+    sub_filter_types *;
+    sub_filter 'href="/"' 'href="/$app"';
+    sub_filter 'href="/login"' 'href="/$app/login"';
+    sub_filter 'href:"/"' 'href:"/$app"';
+    sub_filter '/_next' '/$app/_next';
+    sub_filter '/api/v1' '/$app/api/v1';
+    sub_filter '/login/plex/loading' '/$app/login/plex/loading';
+    sub_filter '/images/' '/$app/images/';
+    sub_filter '/android-' '/$app/android-';
+    sub_filter '/apple-' '/$app/apple-';
+    sub_filter '/favicon' '/$app/favicon';
+    sub_filter '/logo.png' '/$app/logo.png';
+    sub_filter '/site.webmanifest' '/$app/site.webmanifest';
+}
+```
+{% endtab %}
+{% endtabs %}
 
 Next, test the configuration:
 

docs/getting-started/installation.md

@@ -15,6 +15,7 @@ After running Overseerr for the first time, configure it by visiting the web UI
 
 ```bash
 docker run -d \
+  --name overseerr \
   -e LOG_LEVEL=info \
   -e TZ=Asia/Tokyo \
   -p 5055:5055 \
@@ -25,10 +26,35 @@ docker run -d \
 
 {% endtab %}
 
+{% tab title="Compose" %}
+
+**docker-compose.yml:**
+
+```yaml
+---
+version: "3"
+
+services:
+  overseerr:
+    image: sctx/overseerr:latest
+    container_name: overseerr
+    environment:
+      - LOG_LEVEL=info
+      - TZ=Asia/Tokyo
+    ports:
+      - 5055:5055
+    volumes:
+      - /path/to/appdata/config:/app/config
+    restart: unless-stopped
+```
+
+{% endtab %}
+
 {% tab title="UID/GID" %}
 
 ```text
 docker run -d \
+  --name overseerr \
   --user=[ user | user:group | uid | uid:gid | user:gid | uid:group ] \
   -e LOG_LEVEL=info \
   -e TZ=Asia/Tokyo \

docs/support/faq.md

@@ -90,6 +90,10 @@ You can also perform the following to verify the media item has a GUID Overseerr
 
 **A:** See "[Some media is missing from Overseerr that I know is in Plex!](./faq.md#some-media-is-missing-from-overseerr-that-i-know-is-in-plex)" for troubleshooting steps.
 
+### Approved series requests keep failing!
+
+**A:** If you configured a base URL in Sonarr, make sure you have set the base URL option appropriately in Overseerr. Also, check that you are using Sonarr v3 and have configured a default language profile in Overseerr.
+
 ## Notifications
 
 ### I am getting "Username and Password not accepted" when attempting to send email notifications via Gmail!

docs/using-overseerr/notifications/README.md

@@ -2,10 +2,10 @@
 
 Overseerr already supports a good number of notification agents, such as **Discord**, **Slack** and **Pushover**. New agents are always considered for development, if there is enough demand for it.
 
-## Currently Supported Notification Agents
+## Supported Notification Agents
 
-- Discord
-- Email
+- [Email](./email.md)
+- [Discord](./discord.md)
 - Pushbullet
 - Pushover
 - Slack
@@ -14,15 +14,11 @@ Overseerr already supports a good number of notification agents, such as **Disco
 
 ## Setting Up Notifications
 
-Configuring your notifications is _very simple_. First, you will need to visit the **Settings** page and click **Notifications** in the menu. This will present you with all of the currently available notification agents. Click on each one individually to configure them.
+Configuring your notifications is quite simple. First, you will need to visit the **Settings** page and click **Notifications** in the menu. This will present you with all of the currently available notification agents. Click on each one individually to configure them.
 
 You must configure which type of notifications you want to send _per agent_. If no types are selected, you will not receive notifications!
 
-Some agents may have specific configuration "gotchas" covered in their documentation pages.
-
-{% hint style="danger" %}
-You will **not receive notifications** for any automatically approved requests unless the "Enable Notifications for Automatic Approvals" setting is enabled.
-{% endhint %}
+Note that some notifications are intended for the user who submitted the relevant request, while others are for administrators. For details, please see the documentation for the specific agent you would like to use.
 
 ## Requesting New Notification Agents
 

docs/using-overseerr/notifications/discord.md

@@ -0,0 +1,21 @@
+# Discord
+
+## Configuration
+
+{% hint style="info" %}
+In order to configure Discord notifications, you first need to [create a webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
+
+In order for users to be mentioned in Discord notifications, they must have their [Discord user ID](https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-) configured in their user settings.
+{% endhint %}
+
+### Bot Username (optional)
+
+If you would like to override the name you configured for your bot in Discord, you may set this value to whatever you like!
+
+### Bot Avatar URL (optional)
+
+Similar to the bot username, you can override the avatar for your bot.
+
+### Webhook URL
+
+You can find the webhook URL in the Discord application, at **Server Settings → Integrations → Webhooks**.

docs/using-overseerr/notifications/email.md

@@ -0,0 +1,54 @@
+# Email
+
+{% hint style="info" %}
+The following email notification types are sent to _all_ users with the **Manage Requests** permission, as these notification types are intended for application administrators rather than end users:
+
+- Media Requested
+- Media Automatically Approved
+- Media Failed
+
+On the other hand, the email notification types below are only sent to the user who submitted the request:
+
+- Media Approved
+- Media Declined
+- Media Available
+
+{% endhint %}
+
+## Configuration
+
+### Sender Address (required)
+
+Set this to the email address you would like to appear in the "from" field of the email message.
+
+Depending on your email provider, this may need to be an address you own. For example, Gmail requires this to be your actual email address.
+
+### Sender Name (optional)
+
+Configure a friendly name for the email sender.
+
+### SMTP Host
+
+Set this to the hostname or IP address of your SMTP host/server.
+
+### SMTP Port
+
+Set this to a supported port number for your SMTP host. `465` and `587` are commonly used.
+
+### Enable SSL (optional)
+
+This setting should only be enabled for ports that use [implicit SSL/TLS](https://tools.ietf.org/html/rfc8314) (e.g., port `465` in most cases).
+
+For servers that support [opportunistic TLS/STARTTLS](https://en.wikipedia.org/wiki/Opportunistic_TLS) (typically via port `587`), this setting should **not** be enabled.
+
+### SMTP Username & Password
+
+{% hint style="info" %}
+If your account has two-factor authentication enabled, you may need to create an application password instead of using your account password.
+{% endhint %}
+
+Configure these values as appropriate to authenticate with your SMTP host.
+
+### PGP Private Key & Password (optional)
+
+Configure these values to enable encrypting and signing of email messages using [OpenPGP](https://www.openpgp.org/). Note that individual users must also have their PGP public keys enabled in their user settings in order for PGP encryption to be used.

docs/using-overseerr/notifications/webhooks.md

@@ -1,18 +1,20 @@
 # Webhooks
 
-Webhooks let you post a custom JSON payload to any endpoint you like. You can also set an authorization header for security purposes.
+Webhooks allow you to send a custom JSON payload to any endpoint. You can also set an authorization header for security purposes.
 
 ## Configuration
 
-The following configuration options are available:
-
 ### Webhook URL (required)
 
 The URL you would like to post notifications to. Your JSON will be sent as the body of the request.
 
-### Authorization Header
+### Authorization Header (optional)
 
-Custom authorization header. Anything entered for this will be sent as an `Authorization` header.
+{% hint style="info" %}
+This is typically not needed. Please refer to your webhook provider's documentation for details.
+{% endhint %}
+
+This value will be sent as an `Authorization` HTTP header.
 
 ### JSON Payload (required)
 
@@ -35,6 +37,7 @@ These variables are usually the target user of the notification.
 - `{{notifyuser_email}}` Target user's email.
 - `{{notifyuser_avatar}}` Target user's avatar.
 - `{{notifyuser_settings_discordId}}` Target user's discord ID (if one is set).
+- `{{notifyuser_settings_telegramChatId}}` Target user's telegram Chat ID (if one is set).
 
 ### Media
 

docs/using-overseerr/settings/README.md

@@ -0,0 +1,195 @@
+# Settings
+
+## General
+
+### API Key
+
+This is your Overseerr API key, which can be used to integrate Overseerr with third-party applications. Do **not** share this key publicly, as it can be used to gain administrator access!
+
+If you need to generate a new API key for any reason, simply click the button to the right of the text box.
+
+### Application Title
+
+If you aren't a huge fan of the name "Overseerr" and would like to display something different to your users, you can customize the application title!
+
+### Application URL
+
+Set this to the externally-accessible URL of your Overseerr instance. If configured, [notifications](../notifications/README.md) will include links!
+
+### Enable Proxy Support
+
+If you have Overseerr behind a [reverse proxy](../../extending-overseerr/reverse-proxy-examples.md), enable this setting to allow Overseerr to correctly register client IP addresses. For details, please see the [Express documentation](http://expressjs.com/en/guide/behind-proxies.html).
+
+This setting is **disabled** by default.
+
+### Enable CSRF Protection
+
+{% hint style="danger" %}
+**This is an advanced setting.** We do not recommend enabling it unless you understand the implications of doing so.
+{% endhint %}
+
+CSRF stands for **Cross-Site Request Forgery**. When this setting is enabled, all external API access that alters Overseerr application data is blocked.
+
+If you do not use Overseerr integrations with third-party applications to add/modify/delete requests or users, you can consider enabling this setting to protect against malicious attacks.
+
+One caveat, however, is that **HTTPS is required**, meaning that once this setting is enabled, you will no longer be able to access your Overseerr instance over HTTP (including using an IP address and port number).
+
+If you enable this setting and find yourself unable to access Overseerr, you can disable the setting by modifying `settings.json` in `/app/config`.
+
+This setting is **disabled** by default.
+
+### Enable Image Caching
+
+{% hint style="danger" %}
+**This feature is experimental.** Enable it at your own risk!
+{% endhint %}
+
+When enabled, all images (including media posters from TMDb) will be cached locally on your server. Images will also be optimized for client devices; i.e., if you access Overseerr using a mobile device, smaller versions will be served compared to when accessing Overseerr on desktop.
+
+Note that this feature requires and will use a significant amount of disk space, and there is currently no automated deletion of old or expired images. If running Overseerr using Docker, it is possible to manually clear the image cache by simply removing and recreating the container.
+
+This setting is **disabled** by default.
+
+### Discover Region & Discover Language
+
+These settings filter content shown on the "Discover" home page based on regional availability and original language, respectively. Users can override these global settings by configuring these same options in their user settings.
+
+### Hide Available Media
+
+When enabled, media which is already available will not appear on the "Discover" home page, or in the "Recommended" or "Similar" categories or other links on media detail pages.
+
+Available media will still appear in search results, however, so it is possible to locate and view hidden items by searching for them by title.
+
+This setting is **disabled** by default.
+
+### Allow Partial Series Requests
+
+When enabled, users will be able to submit requests for specific seasons of TV series. If disabled, users will only be able to submit requests for all unavailable seasons.
+
+This setting is **enabled** by default.
+
+## Users
+
+### Enable Local User Sign-In
+
+When enabled, users who have configured passwords will be allowed to sign in using their email address.
+
+When disabled, Plex OAuth becomes the only sign-in option, and any "local users" you have created will not be able to sign in to Overseerr.
+
+This setting is **enabled** by default.
+
+### Default User Permissions
+
+Select the permissions you would like new users to have by default. It is important to set these, as any user with access to your Plex server will be able to log in to Overseerr, and they will be granted the permissions you select here.
+
+## Plex
+
+### Plex Settings
+
+{% hint style="info" %}
+To set up Plex, you can either enter your details manually or select a server retrieved from [plex.tv](https://plex.tv/). Press the button to the right of the "Server" dropdown to retrieve available servers.
+
+Depending on your setup/configuration, you may need to enter your Plex server details manually in order to establish a connection from Overseerr.
+{% endhint %}
+
+#### Server Name
+
+This value is automatically retrieved from Plex, and cannot be edited manually in Overseerr.
+
+#### Hostname or IP Address
+
+If you have Overseerr installed on the same network as Plex, you can set this to the local IP address of your Plex server. Otherwise, this should be set to a valid hostname (e.g., `plex.myawesomeserver.com`).
+
+#### Port
+
+This value should be set to the port that your Plex server listens on. The default port that Plex uses is `32400`, but you may need to set this to `443` or some other value if your Plex server is hosted on a VPS or cloud provider.
+
+#### SSL
+
+Tick this box to connect to Plex via HTTPS rather than HTTP. Note that self-signed certificates are **not** supported.
+
+### Plex Libraries
+
+In this section, simply select the libraries you would like Overseerr to scan. Overseerr will periodically check the selected libraries for available content to update the media status that is displayed to users.
+
+If you do not see your Plex libraries listed, verify your Plex settings and then click the "Scan Plex Libraries" button.
+
+### Manual Library Scan
+
+Overseerr will perform a full scan of your Plex libraries once every 24 hours (recently added items are fetched more frequently). If this is your first time configuring Plex, a one-time full manual library scan is recommended!
+
+## Services
+
+{% hint style="info" %}
+If you keep separate copies of non-4K and 4K content in your media libraries, you will need to set up multiple Radarr/Sonarr instances and link each of them to Overseerr.
+
+Overseerr checks these linked servers to determine whether or not media has already been requested or is available, so two servers of each type are required _if you keep separate non-4K and 4K copies of media_.
+
+If you only maintain one copy of media, you can instead simply set up one server and set the "Quality Profile" setting on a per-request basis.
+{% endhint %}
+
+### Radarr/Sonarr Settings
+
+#### Default Server
+
+At least one server needs to be marked as "Default" in order for requests to be sent successfully to Radarr/Sonarr.
+
+If you have separate 4K Radarr/Sonarr servers, you need to designate default 4K servers _in addition to_ default non-4K servers.
+
+#### 4K Server
+
+Only select this option if you have separate non-4K and 4K servers. If you only have a single Radarr/Sonarr server, do **not** check this box!
+
+#### Server Name
+
+Enter a friendly name for the Radarr/Sonarr server.
+
+#### Hostname or IP Address
+
+If you have Overseerr installed on the same network as Radarr/Sonarr, you can set this to the local IP address of your Radarr/Sonarr server. Otherwise, this should be set to a valid hostname (e.g., `radarr.myawesomeserver.com`).
+
+#### Port
+
+This value should be set to the port that your Radarr/Sonarr server listens on. By default, Radarr uses port `7878` and Sonarr uses port `8989`, but you may need to set this to `443` or some other value if your Radarr/Sonarr server is hosted on a VPS or cloud provider.
+
+#### SSL
+
+Tick this box to connect to Radarr/Sonarr via HTTPS rather than HTTP. Note that self-signed certificates are **not** supported.
+
+#### API Key
+
+Enter your Radarr/Sonarr API key here. Do **not** share these key publicly, as they can be used to gain administrator access to your Radarr/Sonarr servers!
+
+You can locate the required API keys in Radarr/Sonarr in **Settings → General → Security**.
+
+#### Base URL
+
+If you have configured a base URL for Radarr/Sonarr, you **must** enter it here in order for Overseerr to connect to those services!
+
+You can verify whether or not you have a base URL configured in Radarr/Sonarr in **Settings → General → Host**. (Note that a restart of your Radarr/Sonarr servers is required if you modify this setting!)
+
+#### Profiles, Root Folder, Minimum Availability
+
+Select the default settings you would like to use for all new requests. Note that all of these options are required, and that requests will fail if any of these are not configured!
+
+#### External URL
+
+If the hostname or IP address you configured above is not accessible outside your network, you can set a different URL here. This "external" URL is used to add clickable links to your Radarr/Sonarr servers on media detail pages.
+
+#### Enable Scan
+
+Tick this box if you would like to scan your Radarr/Sonarr server for existing media/request status. It is recommended that you enable this setting, so that users cannot submit requests for media which has already been requested or is already available.
+
+#### Disable Auto-Search
+
+If you do not want Radarr/Sonarr to automatically search for media upon submission of a request, you can disable this setting.
+
+## Notifications
+
+Please see [Notifications](../notifications/README.md) for details on configuring and enabling notifications.
+
+## Jobs & Cache
+
+Overseerr performs certain maintenance tasks as regularly-scheduled jobs, but they can also be manually triggered on this page.
+
+Overseerr also caches requests to external API endpoints to optimize performance and avoid making unnecessary API calls. If necessary, the cache for any particular endpoint can be cleared by clicking the "Flush Cache" button.

next.config.js

@@ -2,12 +2,16 @@ module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
   },
+  images: {
+    domains: ['image.tmdb.org'],
+  },
+  future: {
+    webpack5: true,
+  },
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/,
-      issuer: {
-        test: /\.(js|ts)x?$/,
-      },
+      issuer: /\.(js|ts)x?$/,
       use: ['@svgr/webpack'],
     });
 

ormconfig.js

@@ -6,6 +6,7 @@ const devConfig = {
   synchronize: true,
   migrationsRun: false,
   logging: false,
+  enableWAL: true,
   entities: ['server/entity/**/*.ts'],
   migrations: ['server/migration/**/*.ts'],
   subscribers: ['server/subscriber/**/*.ts'],
@@ -22,6 +23,7 @@ const prodConfig = {
     : 'config/db/db.sqlite3',
   synchronize: false,
   logging: false,
+  enableWAL: true,
   entities: ['dist/entity/**/*.js'],
   migrations: ['dist/migration/**/*.js'],
   migrationsRun: false,

overseerr-api.yml

@@ -97,6 +97,10 @@ components:
           default: true
         discordId:
           type: string
+        telegramChatId:
+          type: string
+        telegramSendSilently:
+          type: boolean
       required:
         - enableNotifications
     MainSettings:
@@ -121,6 +125,9 @@ components:
         hideAvailable:
           type: boolean
           example: false
+        partialRequestsEnabled:
+          type: boolean
+          example: false
         localLogin:
           type: boolean
           example: true
@@ -574,6 +581,19 @@ components:
           type: string
         name:
           type: string
+    Network:
+      type: object
+      properties:
+        id:
+          type: number
+          example: 1
+        logoPath:
+          type: string
+          nullable: true
+        originCountry:
+          type: string
+        name:
+          type: string
     RelatedVideo:
       type: object
       properties:
@@ -887,6 +907,8 @@ components:
             $ref: '#/components/schemas/Season'
         status:
           type: string
+        tagline:
+          type: string
         type:
           type: string
         voteAverage:
@@ -1085,6 +1107,10 @@ components:
         options:
           type: object
           properties:
+            botUsername:
+              type: string
+            botAvatarUrl:
+              type: string
             webhookUrl:
               type: string
     SlackSettings:
@@ -1129,10 +1155,14 @@ components:
         options:
           type: object
           properties:
+            botUsername:
+              type: string
             botAPI:
               type: string
             chatId:
               type: string
+            sendSilently:
+              type: boolean
     PushbulletSettings:
       type: object
       properties:
@@ -1171,9 +1201,6 @@ components:
         enabled:
           type: boolean
           example: true
-        autoapprovalEnabled:
-          type: boolean
-          example: false
     NotificationEmailSettings:
       type: object
       properties:
@@ -1532,6 +1559,12 @@ components:
         discordId:
           type: string
           nullable: true
+        telegramChatId:
+          type: string
+          nullable: true
+        telegramSendSilently:
+          type: boolean
+          nullable: true
       required:
         - enableNotifications
   securitySchemes:
@@ -1693,13 +1726,13 @@ paths:
                   $ref: '#/components/schemas/PlexLibrary'
   /settings/plex/sync:
     get:
-      summary: Get status of full Plex library sync
-      description: Returns sync progress in a JSON array.
+      summary: Get status of full Plex library scan
+      description: Returns scan progress in a JSON array.
       tags:
         - settings
       responses:
         '200':
-          description: Status of Plex sync
+          description: Status of Plex scan
           content:
             application/json:
               schema:
@@ -1721,8 +1754,8 @@ paths:
                     items:
                       $ref: '#/components/schemas/PlexLibrary'
     post:
-      summary: Start full Plex library sync
-      description: Runs a full Plex library sync and returns the progress in a JSON array.
+      summary: Start full Plex library scan
+      description: Runs a full Plex library scan and returns the progress in a JSON array.
       tags:
         - settings
       requestBody:
@@ -1739,7 +1772,7 @@ paths:
                   example: false
       responses:
         '200':
-          description: Status of Plex sync
+          description: Status of Plex scan
           content:
             application/json:
               schema:
@@ -2219,6 +2252,54 @@ paths:
       responses:
         '204':
           description: 'Flushed cache'
+  /settings/logs:
+    get:
+      summary: Returns logs
+      description: Returns list of all log items and details
+      tags:
+        - settings
+      parameters:
+        - in: query
+          name: take
+          schema:
+            type: number
+            nullable: true
+            example: 25
+        - in: query
+          name: skip
+          schema:
+            type: number
+            nullable: true
+            example: 0
+        - in: query
+          name: filter
+          schema:
+            type: string
+            nullable: true
+            enum: [debug, info, warn, error]
+            default: debug
+      responses:
+        '200':
+          description: Server log returned
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    label:
+                      type: string
+                      example: server
+                    level:
+                      type: string
+                      example: info
+                    message:
+                      type: string
+                      example: Server ready on port 5055
+                    timestamp:
+                      type: string
+                      example: 2020-12-15T16:20:00.069Z
   /settings/notifications:
     get:
       summary: Return notification settings
@@ -2421,8 +2502,8 @@ paths:
                 $ref: '#/components/schemas/PushbulletSettings'
   /settings/notifications/pushbullet/test:
     post:
-      summary: Test Pushover settings
-      description: Sends a test notification to the Pushover agent.
+      summary: Test Pushbullet settings
+      description: Sends a test notification to the Pushbullet agent.
       tags:
         - settings
       requestBody:
@@ -2430,7 +2511,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PushoverSettings'
+              $ref: '#/components/schemas/PushbulletSettings'
       responses:
         '204':
           description: Test notification attempted
@@ -2568,7 +2649,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/SlackSettings'
+              $ref: '#/components/schemas/WebhookSettings'
       responses:
         '204':
           description: Test notification attempted
@@ -2952,6 +3033,63 @@ paths:
                     type: array
                     items:
                       $ref: '#/components/schemas/MediaRequest'
+  /user/{userId}/quota:
+    get:
+      summary: Get quotas for a specific user
+      description: |
+        Returns quota details for a user in a JSON object. Requires `MANAGE_USERS` permission if viewing other users.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '200':
+          description: User quota details in JSON
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  movie:
+                    type: object
+                    properties:
+                      days:
+                        type: number
+                        example: 7
+                      limit:
+                        type: number
+                        example: 10
+                      used:
+                        type: number
+                        example: 6
+                      remaining:
+                        type: number
+                        example: 4
+                      restricted:
+                        type: boolean
+                        example: false
+                  tv:
+                    type: object
+                    properties:
+                      days:
+                        type: number
+                        example: 7
+                      limit:
+                        type: number
+                        example: 10
+                      used:
+                        type: number
+                        example: 6
+                      remaining:
+                        type: number
+                        example: 4
+                      restricted:
+                        type: boolean
+                        example: false
   /user/{userId}/settings/main:
     get:
       summary: Get general settings for a user
@@ -3223,6 +3361,16 @@ paths:
           schema:
             type: string
             example: en
+        - in: query
+          name: genre
+          schema:
+            type: number
+            example: 18
+        - in: query
+          name: studio
+          schema:
+            type: number
+            example: 1
       responses:
         '200':
           description: Results
@@ -3244,6 +3392,147 @@ paths:
                     type: array
                     items:
                       $ref: '#/components/schemas/MovieResult'
+  /discover/movies/genre/{genreId}:
+    get:
+      summary: Discover movies by genre
+      description: Returns a list of movies based on the provided genre ID in a JSON object.
+      tags:
+        - search
+      parameters:
+        - in: path
+          name: genreId
+          required: true
+          schema:
+            type: string
+            example: '1'
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                    example: 1
+                  totalPages:
+                    type: number
+                    example: 20
+                  totalResults:
+                    type: number
+                    example: 200
+                  genre:
+                    $ref: '#/components/schemas/Genre'
+                  results:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/MovieResult'
+  /discover/movies/language/{language}:
+    get:
+      summary: Discover movies by original language
+      description: Returns a list of movies based on the provided ISO 639-1 language code in a JSON object.
+      tags:
+        - search
+      parameters:
+        - in: path
+          name: language
+          required: true
+          schema:
+            type: string
+            example: en
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                    example: 1
+                  totalPages:
+                    type: number
+                    example: 20
+                  totalResults:
+                    type: number
+                    example: 200
+                  language:
+                    $ref: '#/components/schemas/SpokenLanguage'
+                  results:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/MovieResult'
+  /discover/movies/studio/{studioId}:
+    get:
+      summary: Discover movies by studio
+      description: Returns a list of movies based on the provided studio ID in a JSON object.
+      tags:
+        - search
+      parameters:
+        - in: path
+          name: studioId
+          required: true
+          schema:
+            type: string
+            example: '1'
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                    example: 1
+                  totalPages:
+                    type: number
+                    example: 20
+                  totalResults:
+                    type: number
+                    example: 200
+                  studio:
+                    $ref: '#/components/schemas/ProductionCompany'
+                  results:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/MovieResult'
   /discover/movies/upcoming:
     get:
       summary: Upcoming movies
@@ -3301,6 +3590,16 @@ paths:
           schema:
             type: string
             example: en
+        - in: query
+          name: genre
+          schema:
+            type: number
+            example: 18
+        - in: query
+          name: network
+          schema:
+            type: number
+            example: 1
       responses:
         '200':
           description: Results
@@ -3322,6 +3621,147 @@ paths:
                     type: array
                     items:
                       $ref: '#/components/schemas/TvResult'
+  /discover/tv/language/{language}:
+    get:
+      summary: Discover TV shows by original language
+      description: Returns a list of TV shows based on the provided ISO 639-1 language code in a JSON object.
+      tags:
+        - search
+      parameters:
+        - in: path
+          name: language
+          required: true
+          schema:
+            type: string
+            example: en
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                    example: 1
+                  totalPages:
+                    type: number
+                    example: 20
+                  totalResults:
+                    type: number
+                    example: 200
+                  language:
+                    $ref: '#/components/schemas/SpokenLanguage'
+                  results:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/TvResult'
+  /discover/tv/genre/{genreId}:
+    get:
+      summary: Discover TV shows by genre
+      description: Returns a list of TV shows based on the provided genre ID in a JSON object.
+      tags:
+        - search
+      parameters:
+        - in: path
+          name: genreId
+          required: true
+          schema:
+            type: string
+            example: '1'
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                    example: 1
+                  totalPages:
+                    type: number
+                    example: 20
+                  totalResults:
+                    type: number
+                    example: 200
+                  genre:
+                    $ref: '#/components/schemas/Genre'
+                  results:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/TvResult'
+  /discover/tv/network/{networkId}:
+    get:
+      summary: Discover TV shows by network
+      description: Returns a list of TV shows based on the provided network ID in a JSON object.
+      tags:
+        - search
+      parameters:
+        - in: path
+          name: networkId
+          required: true
+          schema:
+            type: string
+            example: '1'
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                    example: 1
+                  totalPages:
+                    type: number
+                    example: 20
+                  totalResults:
+                    type: number
+                    example: 200
+                  network:
+                    $ref: '#/components/schemas/Network'
+                  results:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/TvResult'
   /discover/tv/upcoming:
     get:
       summary: Discover Upcoming TV shows
@@ -3448,11 +3888,77 @@ paths:
                     type: array
                     items:
                       $ref: '#/components/schemas/MovieResult'
+  /discover/genreslider/movie:
+    get:
+      summary: Get genre slider data for movies
+      description: Returns a list of genres with backdrops attached
+      tags:
+        - search
+      parameters:
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Genre slider data returned
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: number
+                      example: 1
+                    backdrops:
+                      type: array
+                      items:
+                        type: string
+                    name:
+                      type: string
+                      example: Genre Name
+  /discover/genreslider/tv:
+    get:
+      summary: Get genre slider data for TV series
+      description: Returns a list of genres with backdrops attached
+      tags:
+        - search
+      parameters:
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Genre slider data returned
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: number
+                      example: 1
+                    backdrops:
+                      type: array
+                      items:
+                        type: string
+                    name:
+                      type: string
+                      example: Genre Name
   /request:
     get:
       summary: Get all requests
       description: |
         Returns all requests if the user has the `ADMIN` or `MANAGE_REQUESTS` permissions. Otherwise, only the logged-in user's requests are returned.
+
+        If the `requestedBy` parameter is specified, only requests from that particular user ID will be returned.
       tags:
         - request
       parameters:
@@ -3480,6 +3986,12 @@ paths:
             type: string
             enum: [added, modified]
             default: added
+        - in: query
+          name: requestedBy
+          schema:
+            type: number
+            nullable: true
+            example: 1
       responses:
         '200':
           description: Requests returned
@@ -4089,7 +4601,7 @@ paths:
                     type: number
   /media:
     get:
-      summary: Return media
+      summary: Get media
       description: Returns all media (can be filtered and limited) in a JSON object.
       tags:
         - media
@@ -4326,14 +4838,16 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  iso_3166_1:
-                    type: string
-                    example: US
-                  english_name:
-                    type: string
-                    example: United States of America
+                type: array
+                items:
+                  type: object
+                  properties:
+                    iso_3166_1:
+                      type: string
+                      example: US
+                    english_name:
+                      type: string
+                      example: United States of America
   /languages:
     get:
       summary: Languages supported by TMDb
@@ -4346,17 +4860,115 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  iso_639_1:
-                    type: string
-                    example: en
-                  english_name:
-                    type: string
-                    example: English
-                  name:
-                    type: string
-                    example: English
+                type: array
+                items:
+                  type: object
+                  properties:
+                    iso_639_1:
+                      type: string
+                      example: en
+                    english_name:
+                      type: string
+                      example: English
+                    name:
+                      type: string
+                      example: English
+  /studio/{studioId}:
+    get:
+      summary: Get movie studio details
+      description: Returns movie studio details in a JSON object.
+      tags:
+        - tmdb
+      parameters:
+        - in: path
+          name: studioId
+          required: true
+          schema:
+            type: number
+            example: 2
+      responses:
+        '200':
+          description: Movie studio details
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProductionCompany'
+  /network/{networkId}:
+    get:
+      summary: Get TV network details
+      description: Returns TV network details in a JSON object.
+      tags:
+        - tmdb
+      parameters:
+        - in: path
+          name: networkId
+          required: true
+          schema:
+            type: number
+            example: 1
+      responses:
+        '200':
+          description: TV network details
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProductionCompany'
+  /genres/movie:
+    get:
+      summary: Get list of official TMDb movie genres
+      description: Returns a list of genres in a JSON array.
+      tags:
+        - tmdb
+      parameters:
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: number
+                      example: 10751
+                    name:
+                      type: string
+                      example: Family
+  /genres/tv:
+    get:
+      summary: Get list of official TMDb movie genres
+      description: Returns a list of genres in a JSON array.
+      tags:
+        - tmdb
+      parameters:
+        - in: query
+          name: language
+          schema:
+            type: string
+            example: en
+      responses:
+        '200':
+          description: Results
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: number
+                      example: 18
+                    name:
+                      type: string
+                      example: Drama
 
 security:
   - cookieAuth: []

package.json

@@ -1,6 +1,6 @@
 {
   "name": "overseerr",
-  "version": "1.20.1",
+  "version": "1.22.0",
   "private": true,
   "scripts": {
     "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node --files --project server/tsconfig.json server/index.ts",
@@ -9,7 +9,7 @@
     "build": "yarn build:next && yarn build:server",
     "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\"",
     "start": "NODE_ENV=production node dist/index.js",
-    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault false \"./src/**/!(*.test).{ts,tsx}\"",
+    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
     "migration:generate": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:generate",
     "migration:create": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:create",
     "migration:run": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:run",
@@ -20,37 +20,42 @@
     "@headlessui/react": "^0.3.1",
     "@supercharge/request-ip": "^1.1.2",
     "@svgr/webpack": "^5.5.0",
+    "@tanem/react-nprogress": "^3.0.60",
     "ace-builds": "^1.4.12",
     "axios": "^0.21.1",
-    "bcrypt": "^5.0.0",
+    "bcrypt": "^5.0.1",
     "body-parser": "^1.19.0",
     "bowser": "^2.11.0",
     "connect-typeorm": "^1.1.4",
     "cookie-parser": "^1.4.5",
+    "copy-to-clipboard": "^3.3.1",
     "country-flag-icons": "^1.2.9",
     "csurf": "^1.11.0",
-    "email-templates": "^8.0.3",
+    "email-templates": "^8.0.4",
     "express": "^4.17.1",
-    "express-openapi-validator": "^4.11.0",
+    "express-openapi-validator": "^4.12.6",
+    "express-rate-limit": "^5.2.6",
     "express-session": "^1.17.1",
     "formik": "^2.2.6",
     "gravatar-url": "^3.1.0",
     "intl": "^1.2.5",
     "lodash": "^4.17.21",
-    "next": "10.0.3",
+    "next": "10.1.2",
     "node-cache": "^5.1.2",
     "node-schedule": "^2.0.0",
-    "nodemailer": "^6.4.18",
+    "nodemailer": "^6.5.0",
     "nookies": "^2.5.2",
+    "openpgp": "^5.0.0-1",
     "plex-api": "^5.3.1",
-    "pug": "^3.0.0",
-    "react": "17.0.1",
+    "pug": "^3.0.2",
+    "react": "17.0.2",
     "react-ace": "^9.3.0",
     "react-animate-height": "^2.0.23",
-    "react-dom": "17.0.1",
+    "react-dom": "17.0.2",
     "react-intersection-observer": "^8.31.0",
-    "react-intl": "^5.12.5",
+    "react-intl": "5.13.5",
     "react-markdown": "^5.0.3",
+    "react-select": "^4.3.0",
     "react-spring": "^8.0.27",
     "react-toast-notifications": "^2.4.3",
     "react-transition-group": "^4.4.1",
@@ -60,25 +65,25 @@
     "secure-random-password": "^0.2.2",
     "sqlite3": "^5.0.2",
     "swagger-ui-express": "^4.1.6",
-    "swr": "^0.4.2",
-    "typeorm": "^0.2.31",
+    "swr": "^0.5.5",
+    "typeorm": "^0.2.32",
     "uuid": "^8.3.2",
     "winston": "^3.3.3",
-    "winston-daily-rotate-file": "^4.5.0",
+    "winston-daily-rotate-file": "^4.5.1",
     "xml2js": "^0.4.23",
     "yamljs": "^0.3.0",
     "yup": "^0.32.9"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.17",
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
+    "@babel/cli": "^7.13.14",
+    "@commitlint/cli": "^12.0.1",
+    "@commitlint/config-conventional": "^12.0.1",
     "@semantic-release/changelog": "^5.0.1",
     "@semantic-release/commit-analyzer": "^8.0.1",
     "@semantic-release/exec": "^5.0.0",
     "@semantic-release/git": "^9.0.0",
     "@tailwindcss/aspect-ratio": "^0.2.0",
-    "@tailwindcss/forms": "^0.2.1",
+    "@tailwindcss/forms": "^0.3.2",
     "@tailwindcss/typography": "^0.4.0",
     "@types/bcrypt": "^3.0.0",
     "@types/body-parser": "^1.19.0",
@@ -87,13 +92,15 @@
     "@types/csurf": "^1.11.0",
     "@types/email-templates": "^8.0.2",
     "@types/express": "^4.17.11",
+    "@types/express-rate-limit": "^5.1.1",
     "@types/express-session": "^1.17.3",
     "@types/lodash": "^4.14.168",
-    "@types/node": "^14.14.31",
+    "@types/node": "^14.14.37",
     "@types/node-schedule": "^1.3.1",
-    "@types/nodemailer": "^6.4.0",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.1",
+    "@types/nodemailer": "^6.4.1",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3",
+    "@types/react-select": "^4.0.13",
     "@types/react-toast-notifications": "^2.4.0",
     "@types/react-transition-group": "^4.4.1",
     "@types/secure-random-password": "^0.2.0",
@@ -102,33 +109,32 @@
     "@types/xml2js": "^0.4.8",
     "@types/yamljs": "^0.2.31",
     "@types/yup": "^0.29.11",
-    "@typescript-eslint/eslint-plugin": "^4.15.1",
-    "@typescript-eslint/parser": "^4.15.1",
-    "autoprefixer": "^10.2.4",
+    "@typescript-eslint/eslint-plugin": "^4.20.0",
+    "@typescript-eslint/parser": "^4.20.0",
+    "autoprefixer": "^10.2.5",
     "babel-plugin-react-intl": "^8.2.25",
     "babel-plugin-react-intl-auto": "^3.3.0",
     "commitizen": "^4.2.3",
     "copyfiles": "^2.4.1",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^7.20.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-formatjs": "^2.12.4",
+    "eslint": "^7.23.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-formatjs": "^2.14.3",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.22.0",
+    "eslint-plugin-react": "^7.23.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "extract-react-intl-messages": "^4.1.1",
     "husky": "4.3.8",
     "lint-staged": "^10.5.4",
     "nodemon": "^2.0.7",
-    "postcss": "^8.2.6",
-    "postcss-preset-env": "^6.7.0",
+    "postcss": "^8.2.9",
     "prettier": "^2.2.1",
-    "semantic-release": "^17.3.9",
-    "semantic-release-docker": "^2.2.0",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat",
+    "semantic-release": "^17.4.2",
+    "semantic-release-docker-buildx": "^1.0.1",
+    "tailwindcss": "^2.0.4",
     "ts-node": "^9.1.1",
-    "typescript": "^4.1.5"
+    "typescript": "^4.2.3"
   },
   "resolutions": {
     "sqlite3/node-gyp": "^5.1.0"
@@ -148,12 +154,10 @@
   "lint-staged": {
     "**/*.{ts,tsx,js}": [
       "prettier --write",
-      "eslint",
-      "git add"
+      "eslint"
     ],
     "**/*.{json,md}": [
-      "prettier --write",
-      "git add"
+      "prettier --write"
     ]
   },
   "commitlint": {
@@ -186,13 +190,7 @@
           "message": "chore(release): ${nextRelease.version}"
         }
       ],
-      [
-        "@semantic-release/exec",
-        {
-          "prepareCmd": "docker build --build-arg COMMIT_TAG=$GITHUB_SHA -t sctx/overseerr ."
-        }
-      ],
-      "semantic-release-docker",
+      "semantic-release-docker-buildx",
       [
         "@semantic-release/github",
         {
@@ -206,8 +204,19 @@
     "npmPublish": false,
     "publish": [
       {
-        "path": "semantic-release-docker",
-        "name": "sctx/overseerr"
+        "path": "semantic-release-docker-buildx",
+        "buildArgs": {
+          "COMMIT_TAG": "$GITHUB_SHA"
+        },
+        "imageNames": [
+          "sctx/overseerr",
+          "ghcr.io/sct/overseerr"
+        ],
+        "platforms": [
+          "linux/amd64",
+          "linux/arm64",
+          "linux/arm/v7"
+        ]
       },
       "@semantic-release/github"
     ]

postcss.config.js

@@ -1,3 +1,6 @@
 module.exports = {
-  plugins: ['tailwindcss', 'postcss-preset-env'],
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
 };

public/images/radarr_logo.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" viewBox="0 0 1024 1025" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><rect id="a" width="1024" height="1024"/><clipPath id="b"><use clip-rule="evenodd" xlink:href="#a"/></clipPath></defs><g clip-path="url(#b)"><use fill="#24292E" fill-opacity="0" xlink:href="#a"/><g transform="translate(70 18)"><path d="m105.3 156.12l7.522 719.97c-60.173 7.579-105.3-22.736-105.3-83.364l-7.5216-598.71c0-189.46 173-234.94 278.3-159.15l534.03 310.72c75.216 53.05 90.259 151.57 52.651 219.78-7.522-53.05-30.086-83.365-75.216-113.68l-601.73-341.04c-45.13-30.315-82.738-22.736-82.738 45.471z" fill="#fff"/><path transform="translate(60.173 535.05)" d="m0 378.93c45.13 15.158 90.259 7.579 127.87-15.157l616.77-363.77c37.607 53.05 30.086 106.1-15.044 136.42l-518.99 303.14c-75.216 37.893-173 0-210.6-60.629z" fill="#fff"/><path transform="translate(240.69 284.95)" d="M0 416.822L368.558 204.622L7.52159 0L0 416.822Z" fill="#FFC230"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 1000 1115.2"><metadata/><defs><path id="a" d="m0 0h1024v1024h-1024z"/></defs><use width="100%" height="100%" fill="#fff" fill-opacity="0" transform="rotate(.704 1914.4 -5491.6)" xlink:href="#a"/><g><path fill="#fff" d="m105.76 154.15-1.263 714.59c-60.261 6.782-105.02-23.858-104.28-84.025l-0.216-594.25c2.312-188.02 175.85-231.02 280.22-154.52l530.2 314.93c74.563 53.572 88.403 151.53 49.965 218.76-6.873-52.739-29.067-83.101-73.823-113.74l-597.52-345.84c-44.756-30.639-82.453-23.58-83.286 44.109zm-54.377 751.54c44.941 15.597 90.16 8.63 128.04-13.47l621.16-353.43c36.958 53.109 28.79 105.66-16.706 135.19l-522.65 294.46c-75.673 36.68-172.98-2.127-209.85-62.757z" transform="matrix(1.1348 0 0 1.1348 -.0011348 -.013738)"/><path fill="#ffc230" d="m240.52 702.59 365.02-216.68-364.35-197.07z" transform="matrix(1.1348 0 0 1.1348 -.0011348 -.013738)"/></g></svg>

public/images/sonarr_logo.svg

@@ -1 +1 @@
-<svg height="216.9" viewBox="0 0 216.7 216.9" width="216.7" xmlns="http://www.w3.org/2000/svg"> <path clip-rule="evenodd" d="M216.7 108.45c0 29.833-10.533 55.4-31.6 76.7-.7.833-1.483 1.6-2.35 2.3-3.466 3.4-7.133 6.484-11 9.25-18.267 13.467-39.367 20.2-63.3 20.2-23.967 0-45.033-6.733-63.2-20.2-4.8-3.4-9.3-7.25-13.5-11.55-16.367-16.266-26.417-35.167-30.15-56.7-.733-4.2-1.217-8.467-1.45-12.8-.1-2.4-.15-4.8-.15-7.2 0-2.533.05-4.95.15-7.25 0-.233.066-.467.2-.7 1.567-26.6 12.033-49.583 31.4-68.95C53.05 10.517 78.617 0 108.45 0c29.933 0 55.484 10.517 76.65 31.55 21.067 21.433 31.6 47.067 31.6 76.9z" fill="#EEE" fill-rule="evenodd"/> <path clip-rule="evenodd" d="M194.65 42.5l-22.4 22.4C159.152 77.998 158 89.4 158 109.5c0 17.934 2.852 34.352 16.2 47.7 9.746 9.746 19 18.95 19 18.95-2.5 3.067-5.2 6.067-8.1 9-.7.833-1.483 1.6-2.35 2.3-2.533 2.5-5.167 4.817-7.9 6.95l-17.55-17.55c-15.598-15.6-27.996-17.1-48.6-17.1-19.77 0-33.223 1.822-47.7 16.3-8.647 8.647-18.55 18.6-18.55 18.6-3.767-2.867-7.333-6.034-10.7-9.5-2.8-2.8-5.417-5.667-7.85-8.6 0 0 9.798-9.848 19.15-19.2 13.852-13.853 16.1-29.916 16.1-47.85 0-17.5-2.874-33.823-15.6-46.55-8.835-8.836-21.05-21-21.05-21 2.833-3.6 5.917-7.067 9.25-10.4 2.934-2.867 5.934-5.55 9-8.05L61.1 43.85C74.102 56.852 90.767 60.2 108.7 60.2c18.467 0 35.077-3.577 48.6-17.1 8.32-8.32 19.3-19.25 19.3-19.25 2.9 2.367 5.733 4.933 8.5 7.7 3.467 3.533 6.65 7.183 9.55 10.95z" fill="#3A3F51" fill-rule="evenodd"/> <g clip-rule="evenodd"> <path d="M78.7 114c-.2-1.167-.332-2.35-.4-3.55-.032-.667-.05-1.333-.05-2 0-.7.018-1.367.05-2 0-.067.018-.133.05-.2.435-7.367 3.334-13.733 8.7-19.1 5.9-5.833 12.984-8.75 21.25-8.75 8.3 0 15.384 2.917 21.25 8.75 5.834 5.934 8.75 13.033 8.75 21.3 0 8.267-2.916 15.35-8.75 21.25-.2.233-.416.45-.65.65-.966.933-1.982 1.783-3.05 2.55-5.065 3.733-10.916 5.6-17.55 5.6s-12.466-1.866-17.5-5.6c-1.332-.934-2.582-2-3.75-3.2-4.532-4.5-7.316-9.734-8.35-15.7z" fill="#0CF" fill-rule="evenodd"/> <path d="M157.8 59.75l-15 14.65M30.785 32.526L71.65 73.25m84.6 84.25l27.808 28.78m1.855-153.894L157.8 59.75m-125.45 126l27.35-27.4" fill="none" stroke="#0CF" stroke-miterlimit="1" stroke-width="2"/> <path d="M157.8 59.75l-16.95 17.2M58.97 60.604l17.2 17.15M59.623 158.43l16.75-17.4m61.928-1.396l18.028 17.945" fill="none" stroke="#0CF" stroke-miterlimit="1" stroke-width="7"/> </g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="216.7" height="216.9" viewBox="0 0 216.7 216.9"><path fill="#EEE" fill-rule="evenodd" d="M216.7 108.45c0 29.833-10.533 55.4-31.6 76.7-.7.833-1.483 1.6-2.35 2.3-3.466 3.4-7.133 6.484-11 9.25-18.267 13.467-39.367 20.2-63.3 20.2-23.967 0-45.033-6.733-63.2-20.2-4.8-3.4-9.3-7.25-13.5-11.55-16.367-16.266-26.417-35.167-30.15-56.7-.733-4.2-1.217-8.467-1.45-12.8-.1-2.4-.15-4.8-.15-7.2 0-2.533.05-4.95.15-7.25 0-.233.066-.467.2-.7 1.567-26.6 12.033-49.583 31.4-68.95C53.05 10.517 78.617 0 108.45 0c29.933 0 55.484 10.517 76.65 31.55 21.067 21.433 31.6 47.067 31.6 76.9z" clip-rule="evenodd"/><path fill="#3A3F51" fill-rule="evenodd" d="M194.65 42.5l-22.4 22.4C159.152 77.998 158 89.4 158 109.5c0 17.934 2.852 34.352 16.2 47.7 9.746 9.746 19 18.95 19 18.95-2.5 3.067-5.2 6.067-8.1 9-.7.833-1.483 1.6-2.35 2.3-2.533 2.5-5.167 4.817-7.9 6.95l-17.55-17.55c-15.598-15.6-27.996-17.1-48.6-17.1-19.77 0-33.223 1.822-47.7 16.3-8.647 8.647-18.55 18.6-18.55 18.6-3.767-2.867-7.333-6.034-10.7-9.5-2.8-2.8-5.417-5.667-7.85-8.6 0 0 9.798-9.848 19.15-19.2 13.852-13.853 16.1-29.916 16.1-47.85 0-17.5-2.874-33.823-15.6-46.55-8.835-8.836-21.05-21-21.05-21 2.833-3.6 5.917-7.067 9.25-10.4 2.934-2.867 5.934-5.55 9-8.05L61.1 43.85C74.102 56.852 90.767 60.2 108.7 60.2c18.467 0 35.077-3.577 48.6-17.1 8.32-8.32 19.3-19.25 19.3-19.25 2.9 2.367 5.733 4.933 8.5 7.7 3.467 3.533 6.65 7.183 9.55 10.95z" clip-rule="evenodd"/><g clip-rule="evenodd"><path fill="#0CF" fill-rule="evenodd" d="M78.7 114c-.2-1.167-.332-2.35-.4-3.55-.032-.667-.05-1.333-.05-2 0-.7.018-1.367.05-2 0-.067.018-.133.05-.2.435-7.367 3.334-13.733 8.7-19.1 5.9-5.833 12.984-8.75 21.25-8.75 8.3 0 15.384 2.917 21.25 8.75 5.834 5.934 8.75 13.033 8.75 21.3 0 8.267-2.916 15.35-8.75 21.25-.2.233-.416.45-.65.65-.966.933-1.982 1.783-3.05 2.55-5.065 3.733-10.916 5.6-17.55 5.6s-12.466-1.866-17.5-5.6c-1.332-.934-2.582-2-3.75-3.2-4.532-4.5-7.316-9.734-8.35-15.7z"/><path fill="none" stroke="#0CF" stroke-miterlimit="1" stroke-width="2" d="M157.8 59.75l-15 14.65M30.785 32.526L71.65 73.25m84.6 84.25l27.808 28.78m1.855-153.894L157.8 59.75m-125.45 126l27.35-27.4"/><path fill="none" stroke="#0CF" stroke-miterlimit="1" stroke-width="7" d="M157.8 59.75l-16.95 17.2M58.97 60.604l17.2 17.15M59.623 158.43l16.75-17.4m61.928-1.396l18.028 17.945"/></g></svg>

public/site.webmanifest

@@ -6,12 +6,14 @@
     {
       "src": "/android-chrome-192x192.png",
       "sizes": "192x192",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "maskable"
     },
     {
       "src": "/android-chrome-512x512.png",
       "sizes": "512x512",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "maskable"
     }
   ],
   "theme_color": "#2d3748",

server/api/plexapi.ts

@@ -118,7 +118,7 @@ class PlexAPI {
       options: {
         identifier: settings.clientId,
         product: 'Overseerr',
-        deviceName: settings.main.applicationTitle,
+        deviceName: 'Overseerr',
         platform: 'Overseerr',
       },
     });

server/api/sonarr.ts

@@ -207,11 +207,6 @@ class SonarrAPI extends ExternalAPI {
       if (series.id) {
         series.seasons = this.buildSeasonList(options.seasons, series.seasons);
 
-        series.addOptions = {
-          ignoreEpisodesWithFiles: true,
-          searchForMissingEpisodes: options.searchNow,
-        };
-
         const newSeriesResponse = await this.axios.put<SonarrSeries>(
           '/series',
           series
@@ -225,6 +220,9 @@ class SonarrAPI extends ExternalAPI {
             label: 'Sonarr',
             movie: newSeriesResponse.data,
           });
+          if (options.searchNow) {
+            this.searchSeries(newSeriesResponse.data.id);
+          }
         } else {
           logger.error('Failed to update series in Sonarr', {
             label: 'Sonarr',
@@ -350,6 +348,33 @@ class SonarrAPI extends ExternalAPI {
     }
   }
 
+  public async searchSeries(seriesId: number): Promise<void> {
+    logger.info('Executing series search command', {
+      label: 'Sonarr API',
+      seriesId,
+    });
+    await this.runCommand('SeriesSearch', { seriesId });
+  }
+
+  private async runCommand(
+    commandName: string,
+    options: Record<string, unknown>
+  ): Promise<void> {
+    try {
+      await this.axios.post(`/command`, {
+        name: commandName,
+        ...options,
+      });
+    } catch (e) {
+      logger.error('Something went wrong attempting to run a Sonarr command.', {
+        label: 'Sonarr API',
+        message: e.message,
+      });
+
+      throw new Error('Failed to run Sonarr command.');
+    }
+  }
+
   private buildSeasonList(
     seasons: number[],
     existingSeasons?: SonarrSeason[]

server/api/themoviedb/index.ts

@@ -4,10 +4,14 @@ import ExternalAPI from '../externalapi';
 import {
   TmdbCollection,
   TmdbExternalIdResponse,
+  TmdbGenre,
+  TmdbGenresResult,
   TmdbLanguage,
   TmdbMovieDetails,
+  TmdbNetwork,
   TmdbPersonCombinedCredits,
   TmdbPersonDetail,
+  TmdbProductionCompany,
   TmdbRegion,
   TmdbSearchMovieResponse,
   TmdbSearchMultiResponse,
@@ -30,6 +34,9 @@ interface DiscoverMovieOptions {
   language?: string;
   primaryReleaseDateGte?: string;
   primaryReleaseDateLte?: string;
+  originalLanguage?: string;
+  genre?: number;
+  studio?: number;
   sortBy?:
     | 'popularity.asc'
     | 'popularity.desc'
@@ -53,6 +60,9 @@ interface DiscoverTvOptions {
   firstAirDateGte?: string;
   firstAirDateLte?: string;
   includeEmptyReleaseDate?: boolean;
+  originalLanguage?: string;
+  genre?: number;
+  network?: number;
   sortBy?:
     | 'popularity.asc'
     | 'popularity.desc'
@@ -120,7 +130,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch person details: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch person details: ${e.message}`);
     }
   };
 
@@ -142,7 +152,7 @@ class TheMovieDb extends ExternalAPI {
       return data;
     } catch (e) {
       throw new Error(
-        `[TMDB] Failed to fetch person combined credits: ${e.message}`
+        `[TMDb] Failed to fetch person combined credits: ${e.message}`
       );
     }
   };
@@ -168,7 +178,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch movie details: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch movie details: ${e.message}`);
     }
   };
 
@@ -194,7 +204,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } 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}`);
     }
   };
 
@@ -220,7 +230,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } 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}`);
     }
   };
 
@@ -246,7 +256,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch discover movies: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch discover movies: ${e.message}`);
     }
   }
 
@@ -272,7 +282,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch discover movies: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch discover movies: ${e.message}`);
     }
   }
 
@@ -298,7 +308,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch movies by keyword: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch movies by keyword: ${e.message}`);
     }
   }
 
@@ -325,7 +335,7 @@ class TheMovieDb extends ExternalAPI {
       return data;
     } catch (e) {
       throw new Error(
-        `[TMDB] Failed to fetch tv recommendations: ${e.message}`
+        `[TMDb] Failed to fetch TV recommendations: ${e.message}`
       );
     }
   }
@@ -349,7 +359,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch tv similar: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch TV similar: ${e.message}`);
     }
   }
 
@@ -360,6 +370,9 @@ class TheMovieDb extends ExternalAPI {
     language = 'en',
     primaryReleaseDateGte,
     primaryReleaseDateLte,
+    originalLanguage,
+    genre,
+    studio,
   }: DiscoverMovieOptions = {}): Promise<TmdbSearchMovieResponse> => {
     try {
       const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
@@ -368,17 +381,18 @@ class TheMovieDb extends ExternalAPI {
           page,
           include_adult: includeAdult,
           language,
-          with_release_type: '3|2',
           region: this.region,
-          with_original_language: this.originalLanguage,
+          with_original_language: originalLanguage ?? this.originalLanguage,
           'primary_release_date.gte': primaryReleaseDateGte,
           'primary_release_date.lte': primaryReleaseDateLte,
+          with_genres: genre,
+          with_companies: studio,
         },
       });
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch discover movies: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch discover movies: ${e.message}`);
     }
   };
 
@@ -389,6 +403,9 @@ class TheMovieDb extends ExternalAPI {
     firstAirDateGte,
     firstAirDateLte,
     includeEmptyReleaseDate = false,
+    originalLanguage,
+    genre,
+    network,
   }: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
     try {
       const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
@@ -399,14 +416,16 @@ class TheMovieDb extends ExternalAPI {
           region: this.region,
           'first_air_date.gte': firstAirDateGte,
           'first_air_date.lte': firstAirDateLte,
-          with_original_language: this.originalLanguage,
+          with_original_language: originalLanguage ?? this.originalLanguage,
           include_null_first_air_dates: includeEmptyReleaseDate,
+          with_genres: genre,
+          with_networks: network,
         },
       });
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch discover tv: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch discover TV: ${e.message}`);
     }
   };
 
@@ -432,7 +451,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch upcoming movies: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch upcoming movies: ${e.message}`);
     }
   };
 
@@ -459,7 +478,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch all trending: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch all trending: ${e.message}`);
     }
   };
 
@@ -482,7 +501,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch all trending: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch all trending: ${e.message}`);
     }
   };
 
@@ -505,7 +524,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch all trending: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch all trending: ${e.message}`);
     }
   };
 
@@ -537,7 +556,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to find by external ID: ${e.message}`);
+      throw new Error(`[TMDb] Failed to find by external ID: ${e.message}`);
     }
   }
 
@@ -564,11 +583,11 @@ class TheMovieDb extends ExternalAPI {
       }
 
       throw new Error(
-        '[TMDB] Failed to find a title with the provided IMDB id'
+        '[TMDb] Failed to find a title with the provided IMDB id'
       );
     } catch (e) {
       throw new Error(
-        `[TMDB] Failed to get movie by external imdb ID: ${e.message}`
+        `[TMDb] Failed to get movie by external imdb ID: ${e.message}`
       );
     }
   }
@@ -595,12 +614,10 @@ class TheMovieDb extends ExternalAPI {
         return tvshow;
       }
 
-      throw new Error(
-        `[TMDB] Failed to find a TV show with the provided TVDB ID: ${tvdbId}`
-      );
+      throw new Error(`No show returned from API for ID ${tvdbId}`);
     } catch (e) {
       throw new Error(
-        `[TMDB] Failed to get TV show using the external TVDB ID: ${e.message}`
+        `[TMDb] Failed to get TV show using the external TVDB ID: ${e.message}`
       );
     }
   }
@@ -624,7 +641,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch collection: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch collection: ${e.message}`);
     }
   }
 
@@ -640,7 +657,7 @@ class TheMovieDb extends ExternalAPI {
 
       return regions;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch countries: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch countries: ${e.message}`);
     }
   }
 
@@ -656,7 +673,77 @@ class TheMovieDb extends ExternalAPI {
 
       return languages;
     } catch (e) {
-      throw new Error(`[TMDB] Failed to fetch langauges: ${e.message}`);
+      throw new Error(`[TMDb] Failed to fetch langauges: ${e.message}`);
+    }
+  }
+
+  public async getStudio(studioId: number): Promise<TmdbProductionCompany> {
+    try {
+      const data = await this.get<TmdbProductionCompany>(
+        `/company/${studioId}`
+      );
+
+      return data;
+    } catch (e) {
+      throw new Error(`[TMDb] Failed to fetch movie studio: ${e.message}`);
+    }
+  }
+
+  public async getNetwork(networkId: number): Promise<TmdbNetwork> {
+    try {
+      const data = await this.get<TmdbNetwork>(`/network/${networkId}`);
+
+      return data;
+    } catch (e) {
+      throw new Error(`[TMDb] Failed to fetch TV network: ${e.message}`);
+    }
+  }
+
+  public async getMovieGenres({
+    language = 'en',
+  }: {
+    language?: string;
+  } = {}): Promise<TmdbGenre[]> {
+    try {
+      const data = await this.get<TmdbGenresResult>(
+        '/genre/movie/list',
+        {
+          params: {
+            language,
+          },
+        },
+        86400 // 24 hours
+      );
+
+      const movieGenres = sortBy(data.genres, 'name');
+
+      return movieGenres;
+    } catch (e) {
+      throw new Error(`[TMDb] Failed to fetch movie genres: ${e.message}`);
+    }
+  }
+
+  public async getTvGenres({
+    language = 'en',
+  }: {
+    language?: string;
+  } = {}): Promise<TmdbGenre[]> {
+    try {
+      const data = await this.get<TmdbGenresResult>(
+        '/genre/tv/list',
+        {
+          params: {
+            language,
+          },
+        },
+        86400 // 24 hours
+      );
+
+      const tvGenres = sortBy(data.genres, 'name');
+
+      return tvGenres;
+    } catch (e) {
+      throw new Error(`[TMDb] Failed to fetch TV genres: ${e.message}`);
     }
   }
 }

server/api/themoviedb/interfaces.ts

@@ -109,6 +109,16 @@ export interface TmdbExternalIds {
   twitter_id?: string;
 }
 
+export interface TmdbProductionCompany {
+  id: number;
+  logo_path?: string;
+  name: string;
+  origin_country: string;
+  homepage?: string;
+  headquarters?: string;
+  description?: string;
+}
+
 export interface TmdbMovieDetails {
   id: number;
   imdb_id?: string;
@@ -125,12 +135,7 @@ export interface TmdbMovieDetails {
   original_title: string;
   overview?: string;
   popularity: number;
-  production_companies: {
-    id: number;
-    name: string;
-    logo_path?: string;
-    origin_country: string;
-  }[];
+  production_companies: TmdbProductionCompany[];
   production_countries: {
     iso_3166_1: string;
     name: string;
@@ -227,12 +232,7 @@ export interface TmdbTvDetails {
   last_episode_to_air?: TmdbTvEpisodeResult;
   name: string;
   next_episode_to_air?: TmdbTvEpisodeResult;
-  networks: {
-    id: number;
-    name: string;
-    logo_path: string;
-    origin_country: string;
-  }[];
+  networks: TmdbNetwork[];
   number_of_episodes: number;
   number_of_seasons: number;
   origin_country: string[];
@@ -254,6 +254,7 @@ export interface TmdbTvDetails {
   }[];
   seasons: TmdbTvSeasonResult[];
   status: string;
+  tagline?: string;
   type: string;
   vote_average: number;
   vote_count: number;
@@ -305,6 +306,7 @@ export interface TmdbKeyword {
 export interface TmdbPersonDetail {
   id: number;
   name: string;
+  birthday: string;
   deathday: string;
   known_for_department: string;
   also_known_as?: string[];
@@ -381,3 +383,21 @@ export interface TmdbLanguage {
   english_name: string;
   name: string;
 }
+
+export interface TmdbGenresResult {
+  genres: TmdbGenre[];
+}
+
+export interface TmdbGenre {
+  id: number;
+  name: string;
+}
+
+export interface TmdbNetwork {
+  id: number;
+  name: string;
+  headquarters?: string;
+  homepage?: string;
+  logo_path?: string;
+  origin_country?: string;
+}

server/entity/MediaRequest.ts

@@ -10,6 +10,7 @@ import {
   getRepository,
   OneToMany,
   AfterRemove,
+  RelationCount,
 } from 'typeorm';
 import { User } from './User';
 import Media from './Media';
@@ -60,6 +61,9 @@ export class MediaRequest {
   @Column({ type: 'varchar' })
   public type: MediaType;
 
+  @RelationCount((request: MediaRequest) => request.seasons)
+  public seasonCount: number;
+
   @OneToMany(() => SeasonRequest, (season) => season.request, {
     eager: true,
     cascade: true,
@@ -144,7 +148,7 @@ export class MediaRequest {
    * auto approved content
    */
   @AfterUpdate()
-  public async notifyApprovedOrDeclined(): Promise<void> {
+  public async notifyApprovedOrDeclined(autoApproved = false): Promise<void> {
     if (
       this.status === MediaRequestStatus.APPROVED ||
       this.status === MediaRequestStatus.DECLINED
@@ -171,13 +175,15 @@ export class MediaRequest {
         const movie = await tmdb.getMovie({ movieId: this.media.tmdbId });
         notificationManager.sendNotification(
           this.status === MediaRequestStatus.APPROVED
-            ? Notification.MEDIA_APPROVED
+            ? autoApproved
+              ? Notification.MEDIA_AUTO_APPROVED
+              : Notification.MEDIA_APPROVED
             : Notification.MEDIA_DECLINED,
           {
             subject: movie.title,
             message: movie.overview,
             image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
-            notifyUser: this.requestedBy,
+            notifyUser: autoApproved ? undefined : this.requestedBy,
             media,
             request: this,
           }
@@ -186,7 +192,9 @@ export class MediaRequest {
         const tv = await tmdb.getTvShow({ tvId: this.media.tmdbId });
         notificationManager.sendNotification(
           this.status === MediaRequestStatus.APPROVED
-            ? Notification.MEDIA_APPROVED
+            ? autoApproved
+              ? Notification.MEDIA_AUTO_APPROVED
+              : Notification.MEDIA_APPROVED
             : Notification.MEDIA_DECLINED,
           {
             subject: tv.name,
@@ -211,13 +219,8 @@ export class MediaRequest {
 
   @AfterInsert()
   public async autoapprovalNotification(): Promise<void> {
-    const settings = getSettings().notifications;
-
-    if (
-      settings.autoapprovalEnabled &&
-      this.status === MediaRequestStatus.APPROVED
-    ) {
-      this.notifyApprovedOrDeclined();
+    if (this.status === MediaRequestStatus.APPROVED) {
+      this.notifyApprovedOrDeclined(true);
     }
   }
 
@@ -445,15 +448,10 @@ export class MediaRequest {
                 label: 'Media Request',
               }
             );
-            const userRepository = getRepository(User);
-            const admin = await userRepository.findOneOrFail({
-              select: ['id', 'plexToken'],
-              order: { id: 'ASC' },
-            });
+
             notificationManager.sendNotification(Notification.MEDIA_FAILED, {
               subject: movie.title,
-              message: 'Movie failed to add to Radarr',
-              notifyUser: admin,
+              message: movie.overview,
               media,
               image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
               request: this,
@@ -642,14 +640,10 @@ export class MediaRequest {
                 label: 'Media Request',
               }
             );
-            const userRepository = getRepository(User);
-            const admin = await userRepository.findOneOrFail({
-              order: { id: 'ASC' },
-            });
+
             notificationManager.sendNotification(Notification.MEDIA_FAILED, {
               subject: series.name,
-              message: 'Series failed to add to Sonarr',
-              notifyUser: admin,
+              message: series.overview,
               image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${series.poster_path}`,
               media,
               extra: [

server/entity/User.ts

@@ -1,28 +1,34 @@
-import {
-  Entity,
-  PrimaryGeneratedColumn,
-  Column,
-  CreateDateColumn,
-  UpdateDateColumn,
-  OneToMany,
-  RelationCount,
-  AfterLoad,
-  OneToOne,
-} from 'typeorm';
-import {
-  Permission,
-  hasPermission,
-  PermissionCheckOptions,
-} from '../lib/permissions';
-import { MediaRequest } from './MediaRequest';
 import bcrypt from 'bcrypt';
 import path from 'path';
-import PreparedEmail from '../lib/email';
-import logger from '../logger';
-import { getSettings } from '../lib/settings';
 import { default as generatePassword } from 'secure-random-password';
-import { UserType } from '../constants/user';
+import {
+  AfterLoad,
+  Column,
+  CreateDateColumn,
+  Entity,
+  getRepository,
+  MoreThan,
+  Not,
+  OneToMany,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  RelationCount,
+  UpdateDateColumn,
+} from 'typeorm';
 import { v4 as uuid } from 'uuid';
+import { MediaRequestStatus, MediaType } from '../constants/media';
+import { UserType } from '../constants/user';
+import { QuotaResponse } from '../interfaces/api/userInterfaces';
+import PreparedEmail from '../lib/email';
+import {
+  hasPermission,
+  Permission,
+  PermissionCheckOptions,
+} from '../lib/permissions';
+import { getSettings } from '../lib/settings';
+import logger from '../logger';
+import { MediaRequest } from './MediaRequest';
+import SeasonRequest from './SeasonRequest';
 import { UserSettings } from './UserSettings';
 
 @Entity()
@@ -80,6 +86,18 @@ export class User {
   @OneToMany(() => MediaRequest, (request) => request.requestedBy)
   public requests: MediaRequest[];
 
+  @Column({ nullable: true })
+  public movieQuotaLimit?: number;
+
+  @Column({ nullable: true })
+  public movieQuotaDays?: number;
+
+  @Column({ nullable: true })
+  public tvQuotaLimit?: number;
+
+  @Column({ nullable: true })
+  public tvQuotaDays?: number;
+
   @OneToOne(() => UserSettings, (settings) => settings.user, {
     cascade: true,
     eager: true,
@@ -199,4 +217,105 @@ export class User {
   public setDisplayName(): void {
     this.displayName = this.username || this.plexUsername;
   }
+
+  public async getQuota(): Promise<QuotaResponse> {
+    const {
+      main: { defaultQuotas },
+    } = getSettings();
+    const requestRepository = getRepository(MediaRequest);
+    const canBypass = this.hasPermission([Permission.MANAGE_USERS], {
+      type: 'or',
+    });
+
+    const movieQuotaLimit = !canBypass
+      ? this.movieQuotaLimit ?? defaultQuotas.movie.quotaLimit
+      : 0;
+    const movieQuotaDays = this.movieQuotaDays ?? defaultQuotas.movie.quotaDays;
+
+    // Count movie requests made during quota period
+    const movieDate = new Date();
+    if (movieQuotaDays) {
+      movieDate.setDate(movieDate.getDate() - movieQuotaDays);
+    } else {
+      movieDate.setDate(0);
+    }
+    // YYYY-MM-DD format
+    const movieQuotaStartDate = movieDate.toJSON().split('T')[0];
+    const movieQuotaUsed = movieQuotaLimit
+      ? await requestRepository.count({
+          where: {
+            requestedBy: this,
+            createdAt: MoreThan(movieQuotaStartDate),
+            type: MediaType.MOVIE,
+            status: Not(MediaRequestStatus.DECLINED),
+          },
+        })
+      : 0;
+
+    const tvQuotaLimit = !canBypass
+      ? this.tvQuotaLimit ?? defaultQuotas.tv.quotaLimit
+      : 0;
+    const tvQuotaDays = this.tvQuotaDays ?? defaultQuotas.tv.quotaDays;
+
+    // Count tv season requests made during quota period
+    const tvDate = new Date();
+    if (tvQuotaDays) {
+      tvDate.setDate(tvDate.getDate() - tvQuotaDays);
+    } else {
+      tvDate.setDate(0);
+    }
+    // YYYY-MM-DD format
+    const tvQuotaStartDate = tvDate.toJSON().split('T')[0];
+    const tvQuotaUsed = tvQuotaLimit
+      ? (
+          await requestRepository
+            .createQueryBuilder('request')
+            .leftJoin('request.seasons', 'seasons')
+            .leftJoin('request.requestedBy', 'requestedBy')
+            .where('request.type = :requestType', {
+              requestType: MediaType.TV,
+            })
+            .andWhere('requestedBy.id = :userId', {
+              userId: this.id,
+            })
+            .andWhere('request.createdAt > :date', {
+              date: tvQuotaStartDate,
+            })
+            .andWhere('request.status != :declinedStatus', {
+              declinedStatus: MediaRequestStatus.DECLINED,
+            })
+            .addSelect((subQuery) => {
+              return subQuery
+                .select('COUNT(season.id)', 'seasonCount')
+                .from(SeasonRequest, 'season')
+                .leftJoin('season.request', 'parentRequest')
+                .where('parentRequest.id = request.id');
+            }, 'seasonCount')
+            .getMany()
+        ).reduce((sum: number, req: MediaRequest) => sum + req.seasonCount, 0)
+      : 0;
+
+    return {
+      movie: {
+        days: movieQuotaDays,
+        limit: movieQuotaLimit,
+        used: movieQuotaUsed,
+        remaining: movieQuotaLimit
+          ? movieQuotaLimit - movieQuotaUsed
+          : undefined,
+        restricted:
+          movieQuotaLimit && movieQuotaLimit - movieQuotaUsed <= 0
+            ? true
+            : false,
+      },
+      tv: {
+        days: tvQuotaDays,
+        limit: tvQuotaLimit,
+        used: tvQuotaUsed,
+        remaining: tvQuotaLimit ? tvQuotaLimit - tvQuotaUsed : undefined,
+        restricted:
+          tvQuotaLimit && tvQuotaLimit - tvQuotaUsed <= 0 ? true : false,
+      },
+    };
+  }
 }

server/entity/UserSettings.ts

@@ -26,9 +26,18 @@ export class UserSettings {
   @Column({ nullable: true })
   public discordId?: string;
 
+  @Column({ nullable: true })
+  public telegramChatId?: string;
+
+  @Column({ nullable: true })
+  public telegramSendSilently?: boolean;
+
   @Column({ nullable: true })
   public region?: string;
 
   @Column({ nullable: true })
   public originalLanguage?: string;
+
+  @Column({ nullable: true })
+  public pgpKey?: string;
 }

server/interfaces/api/discoverInterfaces.ts

@@ -0,0 +1,5 @@
+export interface GenreSliderItem {
+  id: number;
+  name: string;
+  backdrops: string[];
+}

server/interfaces/api/settingsInterfaces.ts

@@ -1,3 +1,17 @@
+import type { PaginatedResponse } from './common';
+
+export type LogMessage = {
+  timestamp: string;
+  level: string;
+  label: string;
+  message: string;
+  data?: Record<string, unknown>;
+};
+
+export interface LogsResultsResponse extends PaginatedResponse {
+  results: LogMessage[];
+}
+
 export interface SettingsAboutResponse {
   version: string;
   totalRequests: number;
@@ -14,6 +28,8 @@ export interface PublicSettingsResponse {
   series4kEnabled: boolean;
   region: string;
   originalLanguage: string;
+  partialRequestsEnabled: boolean;
+  cacheImages: boolean;
 }
 
 export interface CacheItem {

server/interfaces/api/userInterfaces.ts

@@ -1,5 +1,5 @@
-import type { User } from '../../entity/User';
 import { MediaRequest } from '../../entity/MediaRequest';
+import type { User } from '../../entity/User';
 import { PaginatedResponse } from './common';
 
 export interface UserResultsResponse extends PaginatedResponse {
@@ -9,3 +9,16 @@ export interface UserResultsResponse extends PaginatedResponse {
 export interface UserRequestsResponse extends PaginatedResponse {
   results: MediaRequest[];
 }
+
+export interface QuotaStatus {
+  days?: number;
+  limit?: number;
+  used: number;
+  remaining?: number;
+  restricted: boolean;
+}
+
+export interface QuotaResponse {
+  movie: QuotaStatus;
+  tv: QuotaStatus;
+}

server/interfaces/api/userSettingsInterfaces.ts

@@ -2,9 +2,21 @@ export interface UserSettingsGeneralResponse {
   username?: string;
   region?: string;
   originalLanguage?: string;
+  movieQuotaLimit?: number;
+  movieQuotaDays?: number;
+  tvQuotaLimit?: number;
+  tvQuotaDays?: number;
+  globalMovieQuotaDays?: number;
+  globalMovieQuotaLimit?: number;
+  globalTvQuotaLimit?: number;
+  globalTvQuotaDays?: number;
 }
 
 export interface UserSettingsNotificationsResponse {
   enableNotifications: boolean;
+  telegramBotUsername?: string;
   discordId?: string;
+  telegramChatId?: string;
+  telegramSendSilently?: boolean;
+  pgpKey?: string;
 }

server/job/plexsync/index.ts

@@ -1,926 +0,0 @@
-import { getRepository } from 'typeorm';
-import { User } from '../../entity/User';
-import PlexAPI, { PlexLibraryItem, PlexMetadata } from '../../api/plexapi';
-import TheMovieDb from '../../api/themoviedb';
-import {
-  TmdbMovieDetails,
-  TmdbTvDetails,
-} from '../../api/themoviedb/interfaces';
-import Media from '../../entity/Media';
-import { MediaStatus, MediaType } from '../../constants/media';
-import logger from '../../logger';
-import { getSettings, Library } from '../../lib/settings';
-import Season from '../../entity/Season';
-import { uniqWith } from 'lodash';
-import { v4 as uuid } from 'uuid';
-import animeList from '../../api/animelist';
-import AsyncLock from '../../utils/asyncLock';
-
-const BUNDLE_SIZE = 20;
-const UPDATE_RATE = 4 * 1000;
-
-const imdbRegex = new RegExp(/imdb:\/\/(tt[0-9]+)/);
-const tmdbRegex = new RegExp(/tmdb:\/\/([0-9]+)/);
-const tvdbRegex = new RegExp(/tvdb:\/\/([0-9]+)/);
-const tmdbShowRegex = new RegExp(/themoviedb:\/\/([0-9]+)/);
-const plexRegex = new RegExp(/plex:\/\//);
-// Hama agent uses ASS naming, see details here:
-// https://github.com/ZeroQI/Absolute-Series-Scanner/blob/master/README.md#forcing-the-movieseries-id
-const hamaTvdbRegex = new RegExp(/hama:\/\/tvdb[0-9]?-([0-9]+)/);
-const hamaAnidbRegex = new RegExp(/hama:\/\/anidb[0-9]?-([0-9]+)/);
-const HAMA_AGENT = 'com.plexapp.agents.hama';
-
-interface SyncStatus {
-  running: boolean;
-  progress: number;
-  total: number;
-  currentLibrary: Library;
-  libraries: Library[];
-}
-
-class JobPlexSync {
-  private sessionId: string;
-  private tmdb: TheMovieDb;
-  private plexClient: PlexAPI;
-  private items: PlexLibraryItem[] = [];
-  private progress = 0;
-  private libraries: Library[];
-  private currentLibrary: Library;
-  private running = false;
-  private isRecentOnly = false;
-  private enable4kMovie = false;
-  private enable4kShow = false;
-  private asyncLock = new AsyncLock();
-
-  constructor({ isRecentOnly }: { isRecentOnly?: boolean } = {}) {
-    this.tmdb = new TheMovieDb();
-    this.isRecentOnly = isRecentOnly ?? false;
-  }
-
-  private async getExisting(tmdbId: number, mediaType: MediaType) {
-    const mediaRepository = getRepository(Media);
-
-    const existing = await mediaRepository.findOne({
-      where: { tmdbId: tmdbId, mediaType },
-    });
-
-    return existing;
-  }
-
-  private async processMovie(plexitem: PlexLibraryItem) {
-    const mediaRepository = getRepository(Media);
-
-    try {
-      if (plexitem.guid.match(plexRegex)) {
-        const metadata = await this.plexClient.getMetadata(plexitem.ratingKey);
-        const newMedia = new Media();
-
-        if (!metadata.Guid) {
-          logger.debug('No Guid metadata for this title. Skipping', {
-            label: 'Plex Sync',
-            ratingKey: plexitem.ratingKey,
-          });
-          return;
-        }
-
-        metadata.Guid.forEach((ref) => {
-          if (ref.id.match(imdbRegex)) {
-            newMedia.imdbId = ref.id.match(imdbRegex)?.[1] ?? undefined;
-          } else if (ref.id.match(tmdbRegex)) {
-            const tmdbMatch = ref.id.match(tmdbRegex)?.[1];
-            newMedia.tmdbId = Number(tmdbMatch);
-          }
-        });
-        if (newMedia.imdbId && !newMedia.tmdbId) {
-          const tmdbMovie = await this.tmdb.getMovieByImdbId({
-            imdbId: newMedia.imdbId,
-          });
-          newMedia.tmdbId = tmdbMovie.id;
-        }
-        if (!newMedia.tmdbId) {
-          throw new Error('Unable to find TMDb ID');
-        }
-
-        const has4k = metadata.Media.some(
-          (media) => media.videoResolution === '4k'
-        );
-        const hasOtherResolution = metadata.Media.some(
-          (media) => media.videoResolution !== '4k'
-        );
-
-        await this.asyncLock.dispatch(newMedia.tmdbId, async () => {
-          const existing = await this.getExisting(
-            newMedia.tmdbId,
-            MediaType.MOVIE
-          );
-
-          if (existing) {
-            let changedExisting = false;
-
-            if (
-              (hasOtherResolution || (!this.enable4kMovie && has4k)) &&
-              existing.status !== MediaStatus.AVAILABLE
-            ) {
-              existing.status = MediaStatus.AVAILABLE;
-              existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-              changedExisting = true;
-            }
-
-            if (
-              has4k &&
-              this.enable4kMovie &&
-              existing.status4k !== MediaStatus.AVAILABLE
-            ) {
-              existing.status4k = MediaStatus.AVAILABLE;
-              changedExisting = true;
-            }
-
-            if (!existing.mediaAddedAt && !changedExisting) {
-              existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-              changedExisting = true;
-            }
-
-            if (
-              (hasOtherResolution || (has4k && !this.enable4kMovie)) &&
-              existing.ratingKey !== plexitem.ratingKey
-            ) {
-              existing.ratingKey = plexitem.ratingKey;
-              changedExisting = true;
-            }
-
-            if (
-              has4k &&
-              this.enable4kMovie &&
-              existing.ratingKey4k !== plexitem.ratingKey
-            ) {
-              existing.ratingKey4k = plexitem.ratingKey;
-              changedExisting = true;
-            }
-
-            if (changedExisting) {
-              await mediaRepository.save(existing);
-              this.log(
-                `Request for ${metadata.title} exists. New media types set to AVAILABLE`,
-                'info'
-              );
-            } else {
-              this.log(
-                `Title already exists and no new media types found ${metadata.title}`
-              );
-            }
-          } else {
-            newMedia.status =
-              hasOtherResolution || (!this.enable4kMovie && has4k)
-                ? MediaStatus.AVAILABLE
-                : MediaStatus.UNKNOWN;
-            newMedia.status4k =
-              has4k && this.enable4kMovie
-                ? MediaStatus.AVAILABLE
-                : MediaStatus.UNKNOWN;
-            newMedia.mediaType = MediaType.MOVIE;
-            newMedia.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-            newMedia.ratingKey =
-              hasOtherResolution || (!this.enable4kMovie && has4k)
-                ? plexitem.ratingKey
-                : undefined;
-            newMedia.ratingKey4k =
-              has4k && this.enable4kMovie ? plexitem.ratingKey : undefined;
-            await mediaRepository.save(newMedia);
-            this.log(`Saved ${plexitem.title}`);
-          }
-        });
-      } else {
-        let tmdbMovieId: number | undefined;
-        let tmdbMovie: TmdbMovieDetails | undefined;
-
-        const imdbMatch = plexitem.guid.match(imdbRegex);
-        const tmdbMatch = plexitem.guid.match(tmdbShowRegex);
-
-        if (imdbMatch) {
-          tmdbMovie = await this.tmdb.getMovieByImdbId({
-            imdbId: imdbMatch[1],
-          });
-          tmdbMovieId = tmdbMovie.id;
-        } else if (tmdbMatch) {
-          tmdbMovieId = Number(tmdbMatch[1]);
-        }
-
-        if (!tmdbMovieId) {
-          throw new Error('Unable to find TMDb ID');
-        }
-
-        await this.processMovieWithId(plexitem, tmdbMovie, tmdbMovieId);
-      }
-    } catch (e) {
-      this.log(
-        `Failed to process Plex item. ratingKey: ${plexitem.ratingKey}`,
-        'error',
-        {
-          errorMessage: e.message,
-          plexitem,
-        }
-      );
-    }
-  }
-
-  private async processMovieWithId(
-    plexitem: PlexLibraryItem,
-    tmdbMovie: TmdbMovieDetails | undefined,
-    tmdbMovieId: number
-  ) {
-    const mediaRepository = getRepository(Media);
-
-    await this.asyncLock.dispatch(tmdbMovieId, async () => {
-      const metadata = await this.plexClient.getMetadata(plexitem.ratingKey);
-      const existing = await this.getExisting(tmdbMovieId, MediaType.MOVIE);
-
-      const has4k = metadata.Media.some(
-        (media) => media.videoResolution === '4k'
-      );
-      const hasOtherResolution = metadata.Media.some(
-        (media) => media.videoResolution !== '4k'
-      );
-
-      if (existing) {
-        let changedExisting = false;
-
-        if (
-          (hasOtherResolution || (!this.enable4kMovie && has4k)) &&
-          existing.status !== MediaStatus.AVAILABLE
-        ) {
-          existing.status = MediaStatus.AVAILABLE;
-          existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-          changedExisting = true;
-        }
-
-        if (
-          has4k &&
-          this.enable4kMovie &&
-          existing.status4k !== MediaStatus.AVAILABLE
-        ) {
-          existing.status4k = MediaStatus.AVAILABLE;
-          changedExisting = true;
-        }
-
-        if (!existing.mediaAddedAt && !changedExisting) {
-          existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-          changedExisting = true;
-        }
-
-        if (
-          (hasOtherResolution || (has4k && !this.enable4kMovie)) &&
-          existing.ratingKey !== plexitem.ratingKey
-        ) {
-          existing.ratingKey = plexitem.ratingKey;
-          changedExisting = true;
-        }
-
-        if (
-          has4k &&
-          this.enable4kMovie &&
-          existing.ratingKey4k !== plexitem.ratingKey
-        ) {
-          existing.ratingKey4k = plexitem.ratingKey;
-          changedExisting = true;
-        }
-
-        if (changedExisting) {
-          await mediaRepository.save(existing);
-          this.log(
-            `Request for ${metadata.title} exists. New media types set to AVAILABLE`,
-            'info'
-          );
-        } else {
-          this.log(
-            `Title already exists and no new media types found ${metadata.title}`
-          );
-        }
-      } else {
-        // If we have a tmdb movie guid but it didn't already exist, only then
-        // do we request the movie from tmdb (to reduce api requests)
-        if (!tmdbMovie) {
-          tmdbMovie = await this.tmdb.getMovie({ movieId: tmdbMovieId });
-        }
-        const newMedia = new Media();
-        newMedia.imdbId = tmdbMovie.external_ids.imdb_id;
-        newMedia.tmdbId = tmdbMovie.id;
-        newMedia.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-        newMedia.status =
-          hasOtherResolution || (!this.enable4kMovie && has4k)
-            ? MediaStatus.AVAILABLE
-            : MediaStatus.UNKNOWN;
-        newMedia.status4k =
-          has4k && this.enable4kMovie
-            ? MediaStatus.AVAILABLE
-            : MediaStatus.UNKNOWN;
-        newMedia.mediaType = MediaType.MOVIE;
-        newMedia.ratingKey =
-          hasOtherResolution || (!this.enable4kMovie && has4k)
-            ? plexitem.ratingKey
-            : undefined;
-        newMedia.ratingKey4k =
-          has4k && this.enable4kMovie ? plexitem.ratingKey : undefined;
-        await mediaRepository.save(newMedia);
-        this.log(`Saved ${tmdbMovie.title}`);
-      }
-    });
-  }
-
-  // this adds all movie episodes from specials season for Hama agent
-  private async processHamaSpecials(metadata: PlexMetadata, tvdbId: number) {
-    const specials = metadata.Children?.Metadata.find(
-      (md) => Number(md.index) === 0
-    );
-    if (specials) {
-      const episodes = await this.plexClient.getChildrenMetadata(
-        specials.ratingKey
-      );
-      if (episodes) {
-        for (const episode of episodes) {
-          const special = animeList.getSpecialEpisode(tvdbId, episode.index);
-          if (special) {
-            if (special.tmdbId) {
-              await this.processMovieWithId(episode, undefined, special.tmdbId);
-            } else if (special.imdbId) {
-              const tmdbMovie = await this.tmdb.getMovieByImdbId({
-                imdbId: special.imdbId,
-              });
-              await this.processMovieWithId(episode, tmdbMovie, tmdbMovie.id);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // movies with hama agent actually are tv shows with at least one episode in it
-  // try to get first episode of any season - cannot hardcode season or episode number
-  // because sometimes user can have it in other season/ep than s01e01
-  private async processHamaMovie(
-    metadata: PlexMetadata,
-    tmdbMovie: TmdbMovieDetails | undefined,
-    tmdbMovieId: number
-  ) {
-    const season = metadata.Children?.Metadata[0];
-    if (season) {
-      const episodes = await this.plexClient.getChildrenMetadata(
-        season.ratingKey
-      );
-      if (episodes) {
-        await this.processMovieWithId(episodes[0], tmdbMovie, tmdbMovieId);
-      }
-    }
-  }
-
-  private async processShow(plexitem: PlexLibraryItem) {
-    const mediaRepository = getRepository(Media);
-
-    let tvShow: TmdbTvDetails | null = null;
-
-    try {
-      const ratingKey =
-        plexitem.grandparentRatingKey ??
-        plexitem.parentRatingKey ??
-        plexitem.ratingKey;
-      const metadata = await this.plexClient.getMetadata(ratingKey, {
-        includeChildren: true,
-      });
-
-      if (metadata.guid.match(tvdbRegex)) {
-        const matchedtvdb = metadata.guid.match(tvdbRegex);
-
-        // If we can find a tvdb Id, use it to get the full tmdb show details
-        if (matchedtvdb?.[1]) {
-          tvShow = await this.tmdb.getShowByTvdbId({
-            tvdbId: Number(matchedtvdb[1]),
-          });
-        }
-      } else if (metadata.guid.match(tmdbShowRegex)) {
-        const matchedtmdb = metadata.guid.match(tmdbShowRegex);
-
-        if (matchedtmdb?.[1]) {
-          tvShow = await this.tmdb.getTvShow({ tvId: Number(matchedtmdb[1]) });
-        }
-      } else if (metadata.guid.match(hamaTvdbRegex)) {
-        const matched = metadata.guid.match(hamaTvdbRegex);
-        const tvdbId = matched?.[1];
-
-        if (tvdbId) {
-          tvShow = await this.tmdb.getShowByTvdbId({ tvdbId: Number(tvdbId) });
-          if (animeList.isLoaded()) {
-            await this.processHamaSpecials(metadata, Number(tvdbId));
-          } else {
-            this.log(
-              `Hama ID ${plexitem.guid} detected, but library agent is not set to Hama`,
-              'warn'
-            );
-          }
-        }
-      } else if (metadata.guid.match(hamaAnidbRegex)) {
-        const matched = metadata.guid.match(hamaAnidbRegex);
-
-        if (!animeList.isLoaded()) {
-          this.log(
-            `Hama ID ${plexitem.guid} detected, but library agent is not set to Hama`,
-            'warn'
-          );
-        } else if (matched?.[1]) {
-          const anidbId = Number(matched[1]);
-          const result = animeList.getFromAnidbId(anidbId);
-
-          // first try to lookup tvshow by tvdbid
-          if (result?.tvdbId) {
-            const extResponse = await this.tmdb.getByExternalId({
-              externalId: result.tvdbId,
-              type: 'tvdb',
-            });
-            if (extResponse.tv_results[0]) {
-              tvShow = await this.tmdb.getTvShow({
-                tvId: extResponse.tv_results[0].id,
-              });
-            } else {
-              this.log(
-                `Missing TVDB ${result.tvdbId} entry in TMDB for AniDB ${anidbId}`
-              );
-            }
-            await this.processHamaSpecials(metadata, result.tvdbId);
-          }
-
-          if (!tvShow) {
-            // if lookup of tvshow above failed, then try movie with tmdbid/imdbid
-            // note - some tv shows have imdbid set too, that's why this need to go second
-            if (result?.tmdbId) {
-              return await this.processHamaMovie(
-                metadata,
-                undefined,
-                result.tmdbId
-              );
-            } else if (result?.imdbId) {
-              const tmdbMovie = await this.tmdb.getMovieByImdbId({
-                imdbId: result.imdbId,
-              });
-              return await this.processHamaMovie(
-                metadata,
-                tmdbMovie,
-                tmdbMovie.id
-              );
-            }
-          }
-        }
-      }
-
-      if (tvShow) {
-        await this.asyncLock.dispatch(tvShow.id, async () => {
-          if (!tvShow) {
-            // this will never execute, but typescript thinks somebody could reset tvShow from
-            // outer scope back to null before this async gets called
-            return;
-          }
-
-          // Lets get the available seasons from Plex
-          const seasons = tvShow.seasons;
-          const media = await this.getExisting(tvShow.id, MediaType.TV);
-
-          const newSeasons: Season[] = [];
-
-          const currentStandardSeasonAvailable = (
-            media?.seasons.filter(
-              (season) => season.status === MediaStatus.AVAILABLE
-            ) ?? []
-          ).length;
-          const current4kSeasonAvailable = (
-            media?.seasons.filter(
-              (season) => season.status4k === MediaStatus.AVAILABLE
-            ) ?? []
-          ).length;
-
-          for (const season of seasons) {
-            const matchedPlexSeason = metadata.Children?.Metadata.find(
-              (md) => Number(md.index) === season.season_number
-            );
-
-            const existingSeason = media?.seasons.find(
-              (es) => es.seasonNumber === season.season_number
-            );
-
-            // Check if we found the matching season and it has all the available episodes
-            if (matchedPlexSeason) {
-              // If we have a matched Plex season, get its children metadata so we can check details
-              const episodes = await this.plexClient.getChildrenMetadata(
-                matchedPlexSeason.ratingKey
-              );
-              // Total episodes that are in standard definition (not 4k)
-              const totalStandard = episodes.filter((episode) =>
-                !this.enable4kShow
-                  ? true
-                  : episode.Media.some(
-                      (media) => media.videoResolution !== '4k'
-                    )
-              ).length;
-
-              // Total episodes that are in 4k
-              const total4k = episodes.filter((episode) =>
-                episode.Media.some((media) => media.videoResolution === '4k')
-              ).length;
-
-              if (
-                media &&
-                (totalStandard > 0 || (total4k > 0 && !this.enable4kShow)) &&
-                media.ratingKey !== ratingKey
-              ) {
-                media.ratingKey = ratingKey;
-              }
-
-              if (
-                media &&
-                total4k > 0 &&
-                this.enable4kShow &&
-                media.ratingKey4k !== ratingKey
-              ) {
-                media.ratingKey4k = ratingKey;
-              }
-
-              if (existingSeason) {
-                // These ternary statements look super confusing, but they are simply
-                // setting the status to AVAILABLE if all of a type is there, partially if some,
-                // and then not modifying the status if there are 0 items.
-                // If the season was already available, we don't modify it as well.
-                existingSeason.status =
-                  totalStandard === season.episode_count ||
-                  existingSeason.status === MediaStatus.AVAILABLE
-                    ? MediaStatus.AVAILABLE
-                    : totalStandard > 0
-                    ? MediaStatus.PARTIALLY_AVAILABLE
-                    : existingSeason.status;
-                existingSeason.status4k =
-                  (this.enable4kShow && total4k === season.episode_count) ||
-                  existingSeason.status4k === MediaStatus.AVAILABLE
-                    ? MediaStatus.AVAILABLE
-                    : this.enable4kShow && total4k > 0
-                    ? MediaStatus.PARTIALLY_AVAILABLE
-                    : existingSeason.status4k;
-              } else {
-                newSeasons.push(
-                  new Season({
-                    seasonNumber: season.season_number,
-                    // This ternary is the same as the ones above, but it just falls back to "UNKNOWN"
-                    // if we dont have any items for the season
-                    status:
-                      totalStandard === season.episode_count
-                        ? MediaStatus.AVAILABLE
-                        : totalStandard > 0
-                        ? MediaStatus.PARTIALLY_AVAILABLE
-                        : MediaStatus.UNKNOWN,
-                    status4k:
-                      this.enable4kShow && total4k === season.episode_count
-                        ? MediaStatus.AVAILABLE
-                        : this.enable4kShow && total4k > 0
-                        ? MediaStatus.PARTIALLY_AVAILABLE
-                        : MediaStatus.UNKNOWN,
-                  })
-                );
-              }
-            }
-          }
-
-          // Remove extras season. We dont count it for determining availability
-          const filteredSeasons = tvShow.seasons.filter(
-            (season) => season.season_number !== 0
-          );
-
-          const isAllStandardSeasons =
-            newSeasons.filter(
-              (season) => season.status === MediaStatus.AVAILABLE
-            ).length +
-              (media?.seasons.filter(
-                (season) => season.status === MediaStatus.AVAILABLE
-              ).length ?? 0) >=
-            filteredSeasons.length;
-
-          const isAll4kSeasons =
-            newSeasons.filter(
-              (season) => season.status4k === MediaStatus.AVAILABLE
-            ).length +
-              (media?.seasons.filter(
-                (season) => season.status4k === MediaStatus.AVAILABLE
-              ).length ?? 0) >=
-            filteredSeasons.length;
-
-          if (media) {
-            // Update existing
-            media.seasons = [...media.seasons, ...newSeasons];
-
-            const newStandardSeasonAvailable = (
-              media.seasons.filter(
-                (season) => season.status === MediaStatus.AVAILABLE
-              ) ?? []
-            ).length;
-
-            const new4kSeasonAvailable = (
-              media.seasons.filter(
-                (season) => season.status4k === MediaStatus.AVAILABLE
-              ) ?? []
-            ).length;
-
-            // If at least one new season has become available, update
-            // the lastSeasonChange field so we can trigger notifications
-            if (newStandardSeasonAvailable > currentStandardSeasonAvailable) {
-              this.log(
-                `Detected ${
-                  newStandardSeasonAvailable - currentStandardSeasonAvailable
-                } new standard season(s) for ${tvShow.name}`,
-                'debug'
-              );
-              media.lastSeasonChange = new Date();
-              media.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-            }
-
-            if (new4kSeasonAvailable > current4kSeasonAvailable) {
-              this.log(
-                `Detected ${
-                  new4kSeasonAvailable - current4kSeasonAvailable
-                } new 4K season(s) for ${tvShow.name}`,
-                'debug'
-              );
-              media.lastSeasonChange = new Date();
-            }
-
-            if (!media.mediaAddedAt) {
-              media.mediaAddedAt = new Date(plexitem.addedAt * 1000);
-            }
-
-            // If the show is already available, and there are no new seasons, dont adjust
-            // the status
-            const shouldStayAvailable =
-              media.status === MediaStatus.AVAILABLE &&
-              newSeasons.filter(
-                (season) => season.status !== MediaStatus.UNKNOWN
-              ).length === 0;
-            const shouldStayAvailable4k =
-              media.status4k === MediaStatus.AVAILABLE &&
-              newSeasons.filter(
-                (season) => season.status4k !== MediaStatus.UNKNOWN
-              ).length === 0;
-
-            media.status =
-              isAllStandardSeasons || shouldStayAvailable
-                ? MediaStatus.AVAILABLE
-                : media.seasons.some(
-                    (season) =>
-                      season.status === MediaStatus.PARTIALLY_AVAILABLE ||
-                      season.status === MediaStatus.AVAILABLE
-                  )
-                ? MediaStatus.PARTIALLY_AVAILABLE
-                : MediaStatus.UNKNOWN;
-            media.status4k =
-              (isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
-                ? MediaStatus.AVAILABLE
-                : this.enable4kShow &&
-                  media.seasons.some(
-                    (season) =>
-                      season.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
-                      season.status4k === MediaStatus.AVAILABLE
-                  )
-                ? MediaStatus.PARTIALLY_AVAILABLE
-                : MediaStatus.UNKNOWN;
-            await mediaRepository.save(media);
-            this.log(`Updating existing title: ${tvShow.name}`);
-          } else {
-            const newMedia = new Media({
-              mediaType: MediaType.TV,
-              seasons: newSeasons,
-              tmdbId: tvShow.id,
-              tvdbId: tvShow.external_ids.tvdb_id,
-              mediaAddedAt: new Date(plexitem.addedAt * 1000),
-              status: isAllStandardSeasons
-                ? MediaStatus.AVAILABLE
-                : newSeasons.some(
-                    (season) =>
-                      season.status === MediaStatus.PARTIALLY_AVAILABLE ||
-                      season.status === MediaStatus.AVAILABLE
-                  )
-                ? MediaStatus.PARTIALLY_AVAILABLE
-                : MediaStatus.UNKNOWN,
-              status4k:
-                isAll4kSeasons && this.enable4kShow
-                  ? MediaStatus.AVAILABLE
-                  : this.enable4kShow &&
-                    newSeasons.some(
-                      (season) =>
-                        season.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
-                        season.status4k === MediaStatus.AVAILABLE
-                    )
-                  ? MediaStatus.PARTIALLY_AVAILABLE
-                  : MediaStatus.UNKNOWN,
-            });
-            await mediaRepository.save(newMedia);
-            this.log(`Saved ${tvShow.name}`);
-          }
-        });
-      } else {
-        this.log(`failed show: ${plexitem.guid}`);
-      }
-    } catch (e) {
-      this.log(
-        `Failed to process Plex item. ratingKey: ${
-          plexitem.grandparentRatingKey ??
-          plexitem.parentRatingKey ??
-          plexitem.ratingKey
-        }`,
-        'error',
-        {
-          errorMessage: e.message,
-          plexitem,
-        }
-      );
-    }
-  }
-
-  private async processItems(slicedItems: PlexLibraryItem[]) {
-    await Promise.all(
-      slicedItems.map(async (plexitem) => {
-        if (plexitem.type === 'movie') {
-          await this.processMovie(plexitem);
-        } else if (
-          plexitem.type === 'show' ||
-          plexitem.type === 'episode' ||
-          plexitem.type === 'season'
-        ) {
-          await this.processShow(plexitem);
-        }
-      })
-    );
-  }
-
-  private async loop({
-    start = 0,
-    end = BUNDLE_SIZE,
-    sessionId,
-  }: {
-    start?: number;
-    end?: number;
-    sessionId?: string;
-  } = {}) {
-    const slicedItems = this.items.slice(start, end);
-
-    if (!this.running) {
-      throw new Error('Sync was aborted.');
-    }
-
-    if (this.sessionId !== sessionId) {
-      throw new Error('New session was started. Old session aborted.');
-    }
-
-    if (start < this.items.length) {
-      this.progress = start;
-      await this.processItems(slicedItems);
-
-      await new Promise<void>((resolve, reject) =>
-        setTimeout(() => {
-          this.loop({
-            start: start + BUNDLE_SIZE,
-            end: end + BUNDLE_SIZE,
-            sessionId,
-          })
-            .then(() => resolve())
-            .catch((e) => reject(new Error(e.message)));
-        }, UPDATE_RATE)
-      );
-    }
-  }
-
-  private log(
-    message: string,
-    level: 'info' | 'error' | 'debug' | 'warn' = 'debug',
-    optional?: Record<string, unknown>
-  ): void {
-    logger[level](message, { label: 'Plex Sync', ...optional });
-  }
-
-  // checks if any of this.libraries has Hama agent set in Plex
-  private async hasHamaAgent() {
-    const plexLibraries = await this.plexClient.getLibraries();
-    return this.libraries.some((library) =>
-      plexLibraries.some(
-        (plexLibrary) =>
-          plexLibrary.agent === HAMA_AGENT && library.id === plexLibrary.key
-      )
-    );
-  }
-
-  public async run(): Promise<void> {
-    const settings = getSettings();
-    const sessionId = uuid();
-    this.sessionId = sessionId;
-    logger.info('Plex Sync Starting', { sessionId, label: 'Plex Sync' });
-    try {
-      this.running = true;
-      const userRepository = getRepository(User);
-      const admin = await userRepository.findOne({
-        select: ['id', 'plexToken'],
-        order: { id: 'ASC' },
-      });
-
-      if (!admin) {
-        return this.log('No admin configured. Plex sync skipped.', 'warn');
-      }
-
-      this.plexClient = new PlexAPI({ plexToken: admin.plexToken });
-
-      this.libraries = settings.plex.libraries.filter(
-        (library) => library.enabled
-      );
-
-      this.enable4kMovie = settings.radarr.some((radarr) => radarr.is4k);
-      if (this.enable4kMovie) {
-        this.log(
-          'At least one 4K Radarr server was detected. 4K movie detection is now enabled',
-          'info'
-        );
-      }
-
-      this.enable4kShow = settings.sonarr.some((sonarr) => sonarr.is4k);
-      if (this.enable4kShow) {
-        this.log(
-          'At least one 4K Sonarr server was detected. 4K series detection is now enabled',
-          'info'
-        );
-      }
-
-      const hasHama = await this.hasHamaAgent();
-      if (hasHama) {
-        await animeList.sync();
-      }
-
-      if (this.isRecentOnly) {
-        for (const library of this.libraries) {
-          this.currentLibrary = library;
-          this.log(
-            `Beginning to process recently added for library: ${library.name}`,
-            'info'
-          );
-          const libraryItems = await this.plexClient.getRecentlyAdded(
-            library.id
-          );
-
-          // Bundle items up by rating keys
-          this.items = uniqWith(libraryItems, (mediaA, mediaB) => {
-            if (mediaA.grandparentRatingKey && mediaB.grandparentRatingKey) {
-              return (
-                mediaA.grandparentRatingKey === mediaB.grandparentRatingKey
-              );
-            }
-
-            if (mediaA.parentRatingKey && mediaB.parentRatingKey) {
-              return mediaA.parentRatingKey === mediaB.parentRatingKey;
-            }
-
-            return mediaA.ratingKey === mediaB.ratingKey;
-          });
-
-          await this.loop({ sessionId });
-        }
-      } else {
-        for (const library of this.libraries) {
-          this.currentLibrary = library;
-          this.log(`Beginning to process library: ${library.name}`, 'info');
-          this.items = await this.plexClient.getLibraryContents(library.id);
-          await this.loop({ sessionId });
-        }
-      }
-      this.log(
-        this.isRecentOnly
-          ? 'Recently Added Scan Complete'
-          : 'Full Scan Complete',
-        'info'
-      );
-    } catch (e) {
-      logger.error('Sync interrupted', {
-        label: 'Plex Sync',
-        errorMessage: e.message,
-      });
-    } finally {
-      // If a new scanning session hasnt started, set running back to false
-      if (this.sessionId === sessionId) {
-        this.running = false;
-      }
-    }
-  }
-
-  public status(): SyncStatus {
-    return {
-      running: this.running,
-      progress: this.progress,
-      total: this.items.length,
-      currentLibrary: this.currentLibrary,
-      libraries: this.libraries,
-    };
-  }
-
-  public cancel(): void {
-    this.running = false;
-  }
-}
-
-export const jobPlexFullSync = new JobPlexSync();
-export const jobPlexRecentSync = new JobPlexSync({ isRecentOnly: true });

server/job/radarrsync/index.ts

@@ -1,248 +0,0 @@
-import { uniqWith } from 'lodash';
-import { getRepository } from 'typeorm';
-import { v4 as uuid } from 'uuid';
-import RadarrAPI, { RadarrMovie } from '../../api/radarr';
-import { MediaStatus, MediaType } from '../../constants/media';
-import Media from '../../entity/Media';
-import { getSettings, RadarrSettings } from '../../lib/settings';
-import logger from '../../logger';
-
-const BUNDLE_SIZE = 50;
-const UPDATE_RATE = 4 * 1000;
-
-interface SyncStatus {
-  running: boolean;
-  progress: number;
-  total: number;
-  currentServer: RadarrSettings;
-  servers: RadarrSettings[];
-}
-
-class JobRadarrSync {
-  private running = false;
-  private progress = 0;
-  private enable4k = false;
-  private sessionId: string;
-  private servers: RadarrSettings[];
-  private currentServer: RadarrSettings;
-  private radarrApi: RadarrAPI;
-  private items: RadarrMovie[] = [];
-
-  public async run() {
-    const settings = getSettings();
-    const sessionId = uuid();
-    this.sessionId = sessionId;
-    this.log('Radarr sync starting', 'info', { sessionId });
-
-    try {
-      this.running = true;
-
-      // Remove any duplicate Radarr servers and assign them to the servers field
-      this.servers = uniqWith(settings.radarr, (radarrA, radarrB) => {
-        return (
-          radarrA.hostname === radarrB.hostname &&
-          radarrA.port === radarrB.port &&
-          radarrA.baseUrl === radarrB.baseUrl
-        );
-      });
-
-      this.enable4k = settings.radarr.some((radarr) => radarr.is4k);
-      if (this.enable4k) {
-        this.log(
-          'At least one 4K Radarr server was detected. 4K movie detection is now enabled.',
-          'info'
-        );
-      }
-
-      for (const server of this.servers) {
-        this.currentServer = server;
-        if (server.syncEnabled) {
-          this.log(
-            `Beginning to process Radarr server: ${server.name}`,
-            'info'
-          );
-
-          this.radarrApi = new RadarrAPI({
-            apiKey: server.apiKey,
-            url: RadarrAPI.buildRadarrUrl(server, '/api/v3'),
-          });
-
-          this.items = await this.radarrApi.getMovies();
-
-          await this.loop({ sessionId });
-        } else {
-          this.log(`Sync not enabled. Skipping Radarr server: ${server.name}`);
-        }
-      }
-
-      this.log('Radarr sync complete', 'info');
-    } catch (e) {
-      this.log('Something went wrong.', 'error', { errorMessage: e.message });
-    } finally {
-      // If a new scanning session hasnt started, set running back to false
-      if (this.sessionId === sessionId) {
-        this.running = false;
-      }
-    }
-  }
-
-  public status(): SyncStatus {
-    return {
-      running: this.running,
-      progress: this.progress,
-      total: this.items.length,
-      currentServer: this.currentServer,
-      servers: this.servers,
-    };
-  }
-
-  public cancel(): void {
-    this.running = false;
-  }
-
-  private async processRadarrMovie(radarrMovie: RadarrMovie) {
-    const mediaRepository = getRepository(Media);
-    const server4k = this.enable4k && this.currentServer.is4k;
-
-    const media = await mediaRepository.findOne({
-      where: { tmdbId: radarrMovie.tmdbId },
-    });
-
-    if (media) {
-      let isChanged = false;
-      if (media.status === MediaStatus.AVAILABLE) {
-        this.log(`Movie already available: ${radarrMovie.title}`);
-      } else {
-        media[server4k ? 'status4k' : 'status'] = radarrMovie.downloaded
-          ? MediaStatus.AVAILABLE
-          : MediaStatus.PROCESSING;
-        this.log(
-          `Updated existing ${server4k ? '4K ' : ''}movie ${
-            radarrMovie.title
-          } to status ${MediaStatus[media[server4k ? 'status4k' : 'status']]}`
-        );
-        isChanged = true;
-      }
-
-      if (
-        media[server4k ? 'serviceId4k' : 'serviceId'] !== this.currentServer.id
-      ) {
-        media[server4k ? 'serviceId4k' : 'serviceId'] = this.currentServer.id;
-        this.log(`Updated service ID for media entity: ${radarrMovie.title}`);
-        isChanged = true;
-      }
-
-      if (
-        media[server4k ? 'externalServiceId4k' : 'externalServiceId'] !==
-        radarrMovie.id
-      ) {
-        media[server4k ? 'externalServiceId4k' : 'externalServiceId'] =
-          radarrMovie.id;
-        this.log(
-          `Updated external service ID for media entity: ${radarrMovie.title}`
-        );
-        isChanged = true;
-      }
-
-      if (
-        media[server4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] !==
-        radarrMovie.titleSlug
-      ) {
-        media[server4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-          radarrMovie.titleSlug;
-        this.log(
-          `Updated external service slug for media entity: ${radarrMovie.title}`
-        );
-        isChanged = true;
-      }
-
-      if (isChanged) {
-        await mediaRepository.save(media);
-      }
-    } else {
-      const newMedia = new Media({
-        tmdbId: radarrMovie.tmdbId,
-        imdbId: radarrMovie.imdbId,
-        mediaType: MediaType.MOVIE,
-        serviceId: !server4k ? this.currentServer.id : undefined,
-        serviceId4k: server4k ? this.currentServer.id : undefined,
-        externalServiceId: !server4k ? radarrMovie.id : undefined,
-        externalServiceId4k: server4k ? radarrMovie.id : undefined,
-        status:
-          !server4k && radarrMovie.downloaded
-            ? MediaStatus.AVAILABLE
-            : !server4k
-            ? MediaStatus.PROCESSING
-            : MediaStatus.UNKNOWN,
-        status4k:
-          server4k && radarrMovie.downloaded
-            ? MediaStatus.AVAILABLE
-            : server4k
-            ? MediaStatus.PROCESSING
-            : MediaStatus.UNKNOWN,
-      });
-
-      this.log(
-        `Added media for movie ${radarrMovie.title} and set status to ${
-          MediaStatus[newMedia[server4k ? 'status4k' : 'status']]
-        }`
-      );
-      await mediaRepository.save(newMedia);
-    }
-  }
-
-  private async processItems(items: RadarrMovie[]) {
-    await Promise.all(
-      items.map(async (radarrMovie) => {
-        await this.processRadarrMovie(radarrMovie);
-      })
-    );
-  }
-
-  private async loop({
-    start = 0,
-    end = BUNDLE_SIZE,
-    sessionId,
-  }: {
-    start?: number;
-    end?: number;
-    sessionId?: string;
-  } = {}) {
-    const slicedItems = this.items.slice(start, end);
-
-    if (!this.running) {
-      throw new Error('Sync was aborted.');
-    }
-
-    if (this.sessionId !== sessionId) {
-      throw new Error('New session was started. Old session aborted.');
-    }
-
-    if (start < this.items.length) {
-      this.progress = start;
-      await this.processItems(slicedItems);
-
-      await new Promise<void>((resolve, reject) =>
-        setTimeout(() => {
-          this.loop({
-            start: start + BUNDLE_SIZE,
-            end: end + BUNDLE_SIZE,
-            sessionId,
-          })
-            .then(() => resolve())
-            .catch((e) => reject(new Error(e.message)));
-        }, UPDATE_RATE)
-      );
-    }
-  }
-
-  private log(
-    message: string,
-    level: 'info' | 'error' | 'debug' | 'warn' = 'debug',
-    optional?: Record<string, unknown>
-  ): void {
-    logger[level](message, { label: 'Radarr Sync', ...optional });
-  }
-}
-
-export const jobRadarrSync = new JobRadarrSync();

server/job/schedule.ts

@@ -1,9 +1,9 @@
 import schedule from 'node-schedule';
-import { jobPlexFullSync, jobPlexRecentSync } from './plexsync';
 import logger from '../logger';
-import { jobRadarrSync } from './radarrsync';
-import { jobSonarrSync } from './sonarrsync';
 import downloadTracker from '../lib/downloadtracker';
+import { plexFullScanner, plexRecentScanner } from '../lib/scanners/plex';
+import { radarrScanner } from '../lib/scanners/radarr';
+import { sonarrScanner } from '../lib/scanners/sonarr';
 
 interface ScheduledJob {
   id: string;
@@ -17,58 +17,60 @@ interface ScheduledJob {
 export const scheduledJobs: ScheduledJob[] = [];
 
 export const startJobs = (): void => {
-  // Run recently added plex sync every 5 minutes
+  // Run recently added plex scan every 5 minutes
   scheduledJobs.push({
-    id: 'plex-recently-added-sync',
-    name: 'Plex Recently Added Sync',
+    id: 'plex-recently-added-scan',
+    name: 'Plex Recently Added Scan',
     type: 'process',
     job: schedule.scheduleJob('0 */5 * * * *', () => {
-      logger.info('Starting scheduled job: Plex Recently Added Sync', {
+      logger.info('Starting scheduled job: Plex Recently Added Scan', {
         label: 'Jobs',
       });
-      jobPlexRecentSync.run();
+      plexRecentScanner.run();
     }),
-    running: () => jobPlexRecentSync.status().running,
-    cancelFn: () => jobPlexRecentSync.cancel(),
+    running: () => plexRecentScanner.status().running,
+    cancelFn: () => plexRecentScanner.cancel(),
   });
 
-  // Run full plex sync every 24 hours
+  // Run full plex scan every 24 hours
   scheduledJobs.push({
-    id: 'plex-full-sync',
-    name: 'Plex Full Library Sync',
+    id: 'plex-full-scan',
+    name: 'Plex Full Library Scan',
     type: 'process',
     job: schedule.scheduleJob('0 0 3 * * *', () => {
-      logger.info('Starting scheduled job: Plex Full Sync', { label: 'Jobs' });
-      jobPlexFullSync.run();
+      logger.info('Starting scheduled job: Plex Full Library Scan', {
+        label: 'Jobs',
+      });
+      plexFullScanner.run();
     }),
-    running: () => jobPlexFullSync.status().running,
-    cancelFn: () => jobPlexFullSync.cancel(),
+    running: () => plexFullScanner.status().running,
+    cancelFn: () => plexFullScanner.cancel(),
   });
 
-  // Run full radarr sync every 24 hours
+  // Run full radarr scan every 24 hours
   scheduledJobs.push({
-    id: 'radarr-sync',
-    name: 'Radarr Sync',
+    id: 'radarr-scan',
+    name: 'Radarr Scan',
     type: 'process',
     job: schedule.scheduleJob('0 0 4 * * *', () => {
-      logger.info('Starting scheduled job: Radarr Sync', { label: 'Jobs' });
-      jobRadarrSync.run();
+      logger.info('Starting scheduled job: Radarr Scan', { label: 'Jobs' });
+      radarrScanner.run();
     }),
-    running: () => jobRadarrSync.status().running,
-    cancelFn: () => jobRadarrSync.cancel(),
+    running: () => radarrScanner.status().running,
+    cancelFn: () => radarrScanner.cancel(),
   });
 
-  // Run full sonarr sync every 24 hours
+  // Run full sonarr scan every 24 hours
   scheduledJobs.push({
-    id: 'sonarr-sync',
-    name: 'Sonarr Sync',
+    id: 'sonarr-scan',
+    name: 'Sonarr Scan',
     type: 'process',
     job: schedule.scheduleJob('0 30 4 * * *', () => {
-      logger.info('Starting scheduled job: Sonarr Sync', { label: 'Jobs' });
-      jobSonarrSync.run();
+      logger.info('Starting scheduled job: Sonarr Scan', { label: 'Jobs' });
+      sonarrScanner.run();
     }),
-    running: () => jobSonarrSync.status().running,
-    cancelFn: () => jobSonarrSync.cancel(),
+    running: () => sonarrScanner.status().running,
+    cancelFn: () => sonarrScanner.cancel(),
   });
 
   // Run download sync

server/job/sonarrsync/index.ts

@@ -1,381 +0,0 @@
-import { uniqWith } from 'lodash';
-import { getRepository } from 'typeorm';
-import { v4 as uuid } from 'uuid';
-import SonarrAPI, { SonarrSeries } from '../../api/sonarr';
-import TheMovieDb from '../../api/themoviedb';
-import { TmdbTvDetails } from '../../api/themoviedb/interfaces';
-import { MediaStatus, MediaType } from '../../constants/media';
-import Media from '../../entity/Media';
-import Season from '../../entity/Season';
-import { getSettings, SonarrSettings } from '../../lib/settings';
-import logger from '../../logger';
-
-const BUNDLE_SIZE = 50;
-const UPDATE_RATE = 4 * 1000;
-
-interface SyncStatus {
-  running: boolean;
-  progress: number;
-  total: number;
-  currentServer: SonarrSettings;
-  servers: SonarrSettings[];
-}
-
-class JobSonarrSync {
-  private running = false;
-  private progress = 0;
-  private enable4k = false;
-  private sessionId: string;
-  private servers: SonarrSettings[];
-  private currentServer: SonarrSettings;
-  private sonarrApi: SonarrAPI;
-  private items: SonarrSeries[] = [];
-
-  public async run() {
-    const settings = getSettings();
-    const sessionId = uuid();
-    this.sessionId = sessionId;
-    this.log('Sonarr sync starting', 'info', { sessionId });
-
-    try {
-      this.running = true;
-
-      // Remove any duplicate Sonarr servers and assign them to the servers field
-      this.servers = uniqWith(settings.sonarr, (sonarrA, sonarrB) => {
-        return (
-          sonarrA.hostname === sonarrB.hostname &&
-          sonarrA.port === sonarrB.port &&
-          sonarrA.baseUrl === sonarrB.baseUrl
-        );
-      });
-
-      this.enable4k = settings.sonarr.some((sonarr) => sonarr.is4k);
-      if (this.enable4k) {
-        this.log(
-          'At least one 4K Sonarr server was detected. 4K movie detection is now enabled.',
-          'info'
-        );
-      }
-
-      for (const server of this.servers) {
-        this.currentServer = server;
-        if (server.syncEnabled) {
-          this.log(
-            `Beginning to process Sonarr server: ${server.name}`,
-            'info'
-          );
-
-          this.sonarrApi = new SonarrAPI({
-            apiKey: server.apiKey,
-            url: SonarrAPI.buildSonarrUrl(server, '/api/v3'),
-          });
-
-          this.items = await this.sonarrApi.getSeries();
-
-          await this.loop({ sessionId });
-        } else {
-          this.log(`Sync not enabled. Skipping Sonarr server: ${server.name}`);
-        }
-      }
-
-      this.log('Sonarr sync complete', 'info');
-    } catch (e) {
-      this.log('Something went wrong.', 'error', { errorMessage: e.message });
-    } finally {
-      // If a new scanning session hasnt started, set running back to false
-      if (this.sessionId === sessionId) {
-        this.running = false;
-      }
-    }
-  }
-
-  public status(): SyncStatus {
-    return {
-      running: this.running,
-      progress: this.progress,
-      total: this.items.length,
-      currentServer: this.currentServer,
-      servers: this.servers,
-    };
-  }
-
-  public cancel(): void {
-    this.running = false;
-  }
-
-  private async processSonarrSeries(sonarrSeries: SonarrSeries) {
-    const mediaRepository = getRepository(Media);
-    const server4k = this.enable4k && this.currentServer.is4k;
-
-    const media = await mediaRepository.findOne({
-      where: { tvdbId: sonarrSeries.tvdbId },
-    });
-
-    const currentSeasonsAvailable = (media?.seasons ?? []).filter(
-      (season) =>
-        season[server4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-    ).length;
-
-    const newSeasons: Season[] = [];
-
-    for (const season of sonarrSeries.seasons) {
-      const existingSeason = media?.seasons.find(
-        (es) => es.seasonNumber === season.seasonNumber
-      );
-
-      // We are already tracking this season so we can work on it directly
-      if (existingSeason) {
-        if (
-          existingSeason[server4k ? 'status4k' : 'status'] !==
-            MediaStatus.AVAILABLE &&
-          season.statistics
-        ) {
-          existingSeason[server4k ? 'status4k' : 'status'] =
-            season.statistics.episodeFileCount ===
-            season.statistics.totalEpisodeCount
-              ? MediaStatus.AVAILABLE
-              : season.statistics.episodeFileCount > 0
-              ? MediaStatus.PARTIALLY_AVAILABLE
-              : season.monitored
-              ? MediaStatus.PROCESSING
-              : existingSeason[server4k ? 'status4k' : 'status'];
-        }
-      } else {
-        if (season.statistics && season.seasonNumber !== 0) {
-          const allEpisodes =
-            season.statistics.episodeFileCount ===
-            season.statistics.totalEpisodeCount;
-          newSeasons.push(
-            new Season({
-              seasonNumber: season.seasonNumber,
-              status:
-                !server4k && allEpisodes
-                  ? MediaStatus.AVAILABLE
-                  : !server4k && season.statistics.episodeFileCount > 0
-                  ? MediaStatus.PARTIALLY_AVAILABLE
-                  : !server4k && season.monitored
-                  ? MediaStatus.PROCESSING
-                  : MediaStatus.UNKNOWN,
-              status4k:
-                server4k && allEpisodes
-                  ? MediaStatus.AVAILABLE
-                  : server4k && season.statistics.episodeFileCount > 0
-                  ? MediaStatus.PARTIALLY_AVAILABLE
-                  : !server4k && season.monitored
-                  ? MediaStatus.PROCESSING
-                  : MediaStatus.UNKNOWN,
-            })
-          );
-        }
-      }
-    }
-
-    const filteredSeasons = sonarrSeries.seasons.filter(
-      (s) => s.seasonNumber !== 0
-    );
-
-    const isAllSeasons =
-      (media?.seasons ?? []).filter(
-        (s) => s[server4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      ).length +
-        newSeasons.filter(
-          (s) => s[server4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-        ).length >=
-        filteredSeasons.length && filteredSeasons.length > 0;
-
-    if (media) {
-      media.seasons = [...media.seasons, ...newSeasons];
-
-      const newSeasonsAvailable = (media?.seasons ?? []).filter(
-        (season) =>
-          season[server4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      ).length;
-
-      if (newSeasonsAvailable > currentSeasonsAvailable) {
-        this.log(
-          `Detected ${newSeasonsAvailable - currentSeasonsAvailable} new ${
-            server4k ? '4K ' : ''
-          }season(s) for ${sonarrSeries.title}`,
-          'debug'
-        );
-        media.lastSeasonChange = new Date();
-      }
-
-      if (
-        media[server4k ? 'serviceId4k' : 'serviceId'] !== this.currentServer.id
-      ) {
-        media[server4k ? 'serviceId4k' : 'serviceId'] = this.currentServer.id;
-        this.log(`Updated service ID for media entity: ${sonarrSeries.title}`);
-      }
-
-      if (
-        media[server4k ? 'externalServiceId4k' : 'externalServiceId'] !==
-        sonarrSeries.id
-      ) {
-        media[server4k ? 'externalServiceId4k' : 'externalServiceId'] =
-          sonarrSeries.id;
-        this.log(
-          `Updated external service ID for media entity: ${sonarrSeries.title}`
-        );
-      }
-
-      if (
-        media[server4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] !==
-        sonarrSeries.titleSlug
-      ) {
-        media[server4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-          sonarrSeries.titleSlug;
-        this.log(
-          `Updated external service slug for media entity: ${sonarrSeries.title}`
-        );
-      }
-
-      // If the show is already available, and there are no new seasons, dont adjust
-      // the status
-      const shouldStayAvailable =
-        media.status === MediaStatus.AVAILABLE &&
-        newSeasons.filter(
-          (season) =>
-            season[server4k ? 'status4k' : 'status'] !== MediaStatus.UNKNOWN
-        ).length === 0;
-
-      media[server4k ? 'status4k' : 'status'] =
-        isAllSeasons || shouldStayAvailable
-          ? MediaStatus.AVAILABLE
-          : media.seasons.some(
-              (season) =>
-                season[server4k ? 'status4k' : 'status'] ===
-                  MediaStatus.AVAILABLE ||
-                season[server4k ? 'status4k' : 'status'] ===
-                  MediaStatus.PARTIALLY_AVAILABLE
-            )
-          ? MediaStatus.PARTIALLY_AVAILABLE
-          : media.seasons.some(
-              (season) =>
-                season[server4k ? 'status4k' : 'status'] ===
-                MediaStatus.PROCESSING
-            )
-          ? MediaStatus.PROCESSING
-          : MediaStatus.UNKNOWN;
-
-      await mediaRepository.save(media);
-    } else {
-      const tmdb = new TheMovieDb();
-      let tvShow: TmdbTvDetails;
-
-      try {
-        tvShow = await tmdb.getShowByTvdbId({
-          tvdbId: sonarrSeries.tvdbId,
-        });
-      } catch (e) {
-        this.log(
-          'Failed to create new media item during sync. TVDB ID is missing from TMDB?',
-          'warn',
-          { sonarrSeries, errorMessage: e.message }
-        );
-        return;
-      }
-
-      const newMedia = new Media({
-        tmdbId: tvShow.id,
-        tvdbId: sonarrSeries.tvdbId,
-        mediaType: MediaType.TV,
-        serviceId: !server4k ? this.currentServer.id : undefined,
-        serviceId4k: server4k ? this.currentServer.id : undefined,
-        externalServiceId: !server4k ? sonarrSeries.id : undefined,
-        externalServiceId4k: server4k ? sonarrSeries.id : undefined,
-        externalServiceSlug: !server4k ? sonarrSeries.titleSlug : undefined,
-        externalServiceSlug4k: server4k ? sonarrSeries.titleSlug : undefined,
-        seasons: newSeasons,
-        status:
-          !server4k && isAllSeasons
-            ? MediaStatus.AVAILABLE
-            : !server4k &&
-              newSeasons.some(
-                (s) =>
-                  s.status === MediaStatus.PARTIALLY_AVAILABLE ||
-                  s.status === MediaStatus.AVAILABLE
-              )
-            ? MediaStatus.PARTIALLY_AVAILABLE
-            : !server4k
-            ? MediaStatus.PROCESSING
-            : MediaStatus.UNKNOWN,
-        status4k:
-          server4k && isAllSeasons
-            ? MediaStatus.AVAILABLE
-            : server4k &&
-              newSeasons.some(
-                (s) =>
-                  s.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
-                  s.status4k === MediaStatus.AVAILABLE
-              )
-            ? MediaStatus.PARTIALLY_AVAILABLE
-            : server4k
-            ? MediaStatus.PROCESSING
-            : MediaStatus.UNKNOWN,
-      });
-
-      this.log(
-        `Added media for series ${sonarrSeries.title} and set status to ${
-          MediaStatus[newMedia[server4k ? 'status4k' : 'status']]
-        }`
-      );
-      await mediaRepository.save(newMedia);
-    }
-  }
-
-  private async processItems(items: SonarrSeries[]) {
-    await Promise.all(
-      items.map(async (sonarrSeries) => {
-        await this.processSonarrSeries(sonarrSeries);
-      })
-    );
-  }
-
-  private async loop({
-    start = 0,
-    end = BUNDLE_SIZE,
-    sessionId,
-  }: {
-    start?: number;
-    end?: number;
-    sessionId?: string;
-  } = {}) {
-    const slicedItems = this.items.slice(start, end);
-
-    if (!this.running) {
-      throw new Error('Sync was aborted.');
-    }
-
-    if (this.sessionId !== sessionId) {
-      throw new Error('New session was started. Old session aborted.');
-    }
-
-    if (start < this.items.length) {
-      this.progress = start;
-      await this.processItems(slicedItems);
-
-      await new Promise<void>((resolve, reject) =>
-        setTimeout(() => {
-          this.loop({
-            start: start + BUNDLE_SIZE,
-            end: end + BUNDLE_SIZE,
-            sessionId,
-          })
-            .then(() => resolve())
-            .catch((e) => reject(new Error(e.message)));
-        }, UPDATE_RATE)
-      );
-    }
-  }
-
-  private log(
-    message: string,
-    level: 'info' | 'error' | 'debug' | 'warn' = 'debug',
-    optional?: Record<string, unknown>
-  ): void {
-    logger[level](message, { label: 'Sonarr Sync', ...optional });
-  }
-}
-
-export const jobSonarrSync = new JobSonarrSync();

server/lib/email/index.ts

@@ -1,8 +1,9 @@
 import nodemailer from 'nodemailer';
 import Email from 'email-templates';
 import { getSettings } from '../settings';
+import { openpgpEncrypt } from './openpgpEncrypt';
 class PreparedEmail extends Email {
-  public constructor() {
+  public constructor(pgpKey?: string) {
     const settings = getSettings().notifications.agents.email;
 
     const transport = nodemailer.createTransport({
@@ -22,6 +23,16 @@ class PreparedEmail extends Email {
             }
           : undefined,
     });
+    if (pgpKey) {
+      transport.use(
+        'stream',
+        openpgpEncrypt({
+          signingKey: settings.options.pgpPrivateKey,
+          password: settings.options.pgpPassword,
+          encryptionKeys: [pgpKey],
+        })
+      );
+    }
     super({
       message: {
         from: {

server/lib/email/openpgpEncrypt.ts

@@ -0,0 +1,181 @@
+import * as openpgp from 'openpgp';
+import { Transform, TransformCallback } from 'stream';
+import crypto from 'crypto';
+
+interface EncryptorOptions {
+  signingKey?: string;
+  password?: string;
+  encryptionKeys: string[];
+}
+
+class PGPEncryptor extends Transform {
+  private _messageChunks: Uint8Array[] = [];
+  private _messageLength = 0;
+  private _signingKey?: string;
+  private _password?: string;
+
+  private _encryptionKeys: string[];
+
+  constructor(options: EncryptorOptions) {
+    super();
+    this._signingKey = options.signingKey;
+    this._password = options.password;
+    this._encryptionKeys = options.encryptionKeys;
+  }
+
+  // just save the whole message
+  _transform = (
+    chunk: any,
+    _encoding: BufferEncoding,
+    callback: TransformCallback
+  ): void => {
+    this._messageChunks.push(chunk);
+    this._messageLength += chunk.length;
+    callback();
+  };
+
+  // Actually do stuff
+  _flush = async (callback: TransformCallback): Promise<void> => {
+    // Reconstruct message as buffer
+    const message = Buffer.concat(this._messageChunks, this._messageLength);
+    const validPublicKeys = await Promise.all(
+      this._encryptionKeys.map((armoredKey) => openpgp.readKey({ armoredKey }))
+    );
+    let privateKey: openpgp.Key | undefined;
+
+    // Just return the message if there is no one to encrypt for
+    if (!validPublicKeys.length) {
+      this.push(message);
+      return callback();
+    }
+
+    // Only sign the message if private key and password exist
+    if (this._signingKey && this._password) {
+      privateKey = await openpgp.readKey({
+        armoredKey: this._signingKey,
+      });
+      await privateKey.decrypt(this._password);
+    }
+
+    const emailPartDelimiter = '\r\n\r\n';
+    const messageParts = message.toString().split(emailPartDelimiter);
+
+    /**
+     * In this loop original headers are split up into two parts,
+     * one for the email that is sent
+     * and one for the encrypted content
+     */
+    const header = messageParts.shift() as string;
+    const emailHeaders: string[][] = [];
+    const contentHeaders: string[][] = [];
+    const linesInHeader = header.split('\r\n');
+    let previousHeader: string[] = [];
+    for (let i = 0; i < linesInHeader.length; i++) {
+      const line = linesInHeader[i];
+      /**
+       * If it is a multi-line header (current line starts with whitespace)
+       * or it's the first line in the iteration
+       * add the current line with previous header and move on
+       */
+      if (/^\s/.test(line) || i === 0) {
+        previousHeader.push(line);
+        continue;
+      }
+
+      /**
+       * This is done to prevent the last header
+       * from being missed
+       */
+      if (i === linesInHeader.length - 1) {
+        previousHeader.push(line);
+      }
+
+      /**
+       * We need to seperate the actual content headers
+       * so that we can add it as a header for the encrypted content
+       * So that the content will be displayed properly after decryption
+       */
+      if (
+        /^(content-type|content-transfer-encoding):/i.test(previousHeader[0])
+      ) {
+        contentHeaders.push(previousHeader);
+      } else {
+        emailHeaders.push(previousHeader);
+      }
+      previousHeader = [line];
+    }
+
+    // Generate a new boundary for the email content
+    const boundary = 'nm_' + crypto.randomBytes(14).toString('hex');
+    /**
+     * Concatenate everything into single strings
+     * and add pgp headers to the email headers
+     */
+    const emailHeadersRaw =
+      emailHeaders.map((line) => line.join('\r\n')).join('\r\n') +
+      '\r\n' +
+      'Content-Type: multipart/encrypted; protocol="application/pgp-encrypted";' +
+      '\r\n' +
+      ' boundary="' +
+      boundary +
+      '"' +
+      '\r\n' +
+      'Content-Description: OpenPGP encrypted message' +
+      '\r\n' +
+      'Content-Transfer-Encoding: 7bit';
+    const contentHeadersRaw = contentHeaders
+      .map((line) => line.join('\r\n'))
+      .join('\r\n');
+
+    const encryptedMessage = await openpgp.encrypt({
+      message: openpgp.Message.fromText(
+        contentHeadersRaw +
+          emailPartDelimiter +
+          messageParts.join(emailPartDelimiter)
+      ),
+      publicKeys: validPublicKeys,
+      privateKeys: privateKey,
+    });
+
+    const body =
+      '--' +
+      boundary +
+      '\r\n' +
+      'Content-Type: application/pgp-encrypted\r\n' +
+      'Content-Transfer-Encoding: 7bit\r\n' +
+      '\r\n' +
+      'Version: 1\r\n' +
+      '\r\n' +
+      '--' +
+      boundary +
+      '\r\n' +
+      'Content-Type: application/octet-stream; name=encrypted.asc\r\n' +
+      'Content-Disposition: inline; filename=encrypted.asc\r\n' +
+      'Content-Transfer-Encoding: 7bit\r\n' +
+      '\r\n' +
+      encryptedMessage +
+      '\r\n--' +
+      boundary +
+      '--\r\n';
+
+    this.push(Buffer.from(emailHeadersRaw + emailPartDelimiter + body));
+    callback();
+  };
+}
+
+export const openpgpEncrypt = (options: EncryptorOptions) => {
+  return function (mail: any, callback: () => unknown): void {
+    if (!options.encryptionKeys.length) {
+      setImmediate(callback);
+    }
+    mail.message.transform(
+      () =>
+        new PGPEncryptor({
+          signingKey: options.signingKey,
+          password: options.password,
+          encryptionKeys: options.encryptionKeys,
+        })
+    );
+    setImmediate(callback);
+  };
+};

server/lib/notifications/agents/agent.ts

@@ -6,7 +6,7 @@ import { NotificationAgentConfig } from '../../settings';
 
 export interface NotificationPayload {
   subject: string;
-  notifyUser: User;
+  notifyUser?: User;
   media?: Media;
   image?: string;
   message?: string;
@@ -24,6 +24,6 @@ export abstract class BaseAgent<T extends NotificationAgentConfig> {
 }
 
 export interface NotificationAgent {
-  shouldSend(type: Notification, payload: NotificationPayload): boolean;
+  shouldSend(type: Notification): boolean;
   send(type: Notification, payload: NotificationPayload): Promise<boolean>;
 }

server/lib/notifications/agents/discord.ts

@@ -71,7 +71,7 @@ interface DiscordRichEmbed {
 
 interface DiscordWebhookPayload {
   embeds: DiscordRichEmbed[];
-  username: string;
+  username?: string;
   avatar_url?: string;
   tts: boolean;
   content?: string;
@@ -107,7 +107,7 @@ class DiscordAgent
     if (payload.request) {
       fields.push({
         name: 'Requested By',
-        value: payload.notifyUser.displayName ?? '',
+        value: payload.request?.requestedBy.displayName ?? '',
         inline: true,
       });
     }
@@ -122,6 +122,7 @@ class DiscordAgent
         });
         break;
       case Notification.MEDIA_APPROVED:
+      case Notification.MEDIA_AUTO_APPROVED:
         color = EmbedColors.PURPLE;
         fields.push({
           name: 'Status',
@@ -155,15 +156,14 @@ class DiscordAgent
         break;
     }
 
-    if (settings.main.applicationUrl && payload.media) {
-      fields.push({
-        name: `Open in ${settings.main.applicationTitle}`,
-        value: `${settings.main.applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`,
-      });
-    }
+    const url =
+      settings.main.applicationUrl && payload.media
+        ? `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`
+        : undefined;
 
     return {
       title: payload.subject,
+      url,
       description: payload.message,
       color,
       timestamp: new Date().toISOString(),
@@ -201,10 +201,13 @@ class DiscordAgent
     type: Notification,
     payload: NotificationPayload
   ): Promise<boolean> {
-    logger.debug('Sending discord notification', { label: 'Notifications' });
+    logger.debug('Sending Discord notification', { label: 'Notifications' });
     try {
-      const settings = getSettings();
-      const webhookUrl = this.getSettings().options.webhookUrl;
+      const {
+        botUsername,
+        botAvatarUrl,
+        webhookUrl,
+      } = this.getSettings().options;
 
       if (!webhookUrl) {
         return false;
@@ -214,7 +217,8 @@ class DiscordAgent
       let content = undefined;
 
       if (
-        payload.notifyUser.settings?.enableNotifications &&
+        payload.notifyUser &&
+        (payload.notifyUser.settings?.enableNotifications ?? true) &&
         payload.notifyUser.settings?.discordId
       ) {
         mentionedUsers.push(payload.notifyUser.settings.discordId);
@@ -222,7 +226,8 @@ class DiscordAgent
       }
 
       await axios.post(webhookUrl, {
-        username: settings.main.applicationTitle,
+        username: botUsername,
+        avatar_url: botAvatarUrl,
         embeds: [this.buildEmbed(type, payload)],
         content,
         allowed_mentions: {

server/lib/notifications/agents/email.ts

@@ -1,12 +1,13 @@
-import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
-import { hasNotificationType, Notification } from '..';
 import path from 'path';
-import { getSettings, NotificationAgentEmail } from '../../settings';
-import logger from '../../../logger';
 import { getRepository } from 'typeorm';
+import { hasNotificationType, Notification } from '..';
+import { MediaType } from '../../../constants/media';
 import { User } from '../../../entity/User';
-import { Permission } from '../../permissions';
+import logger from '../../../logger';
 import PreparedEmail from '../../email';
+import { Permission } from '../../permissions';
+import { getSettings, NotificationAgentEmail } from '../../settings';
+import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
 
 class EmailAgent
   extends BaseAgent<NotificationAgentEmail>
@@ -21,13 +22,12 @@ class EmailAgent
     return settings.notifications.agents.email;
   }
 
-  public shouldSend(type: Notification, payload: NotificationPayload): boolean {
+  public shouldSend(type: Notification): boolean {
     const settings = this.getSettings();
 
     if (
       settings.enabled &&
-      hasNotificationType(type, this.getSettings().types) &&
-      (payload.notifyUser.settings?.enableNotifications ?? true)
+      hasNotificationType(type, this.getSettings().types)
     ) {
       return true;
     }
@@ -44,9 +44,13 @@ class EmailAgent
 
       // Send to all users with the manage requests permission (or admins)
       users
-        .filter((user) => user.hasPermission(Permission.MANAGE_REQUESTS))
+        .filter(
+          (user) =>
+            user.hasPermission(Permission.MANAGE_REQUESTS) &&
+            (user.settings?.enableNotifications ?? true)
+        )
         .forEach((user) => {
-          const email = new PreparedEmail();
+          const email = new PreparedEmail(user.settings?.pgpKey);
 
           email.send({
             template: path.join(
@@ -57,23 +61,29 @@ class EmailAgent
               to: user.email,
             },
             locals: {
-              body: 'A user has requested new media!',
+              body: `A user has requested a new ${
+                payload.media?.mediaType === MediaType.TV ? 'series' : 'movie'
+              }!`,
               mediaName: payload.subject,
+              mediaPlot: payload.message,
+              mediaExtra: payload.extra ?? [],
               imageUrl: payload.image,
               timestamp: new Date().toTimeString(),
-              requestedBy: payload.notifyUser.displayName,
+              requestedBy: payload.request?.requestedBy.displayName,
               actionUrl: applicationUrl
                 ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
                 : undefined,
               applicationUrl,
               applicationTitle,
-              requestType: 'New Request',
+              requestType: `New ${
+                payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+              } Request`,
             },
           });
         });
       return true;
     } catch (e) {
-      logger.error('Mail notification failed to send', {
+      logger.error('Email notification failed to send', {
         label: 'Notifications',
         message: e.message,
       });
@@ -90,7 +100,117 @@ class EmailAgent
 
       // Send to all users with the manage requests permission (or admins)
       users
-        .filter((user) => user.hasPermission(Permission.MANAGE_REQUESTS))
+        .filter(
+          (user) =>
+            user.hasPermission(Permission.MANAGE_REQUESTS) &&
+            (user.settings?.enableNotifications ?? true)
+        )
+        .forEach((user) => {
+          const email = new PreparedEmail(user.settings?.pgpKey);
+
+          email.send({
+            template: path.join(
+              __dirname,
+              '../../../templates/email/media-request'
+            ),
+            message: {
+              to: user.email,
+            },
+            locals: {
+              body: `A new request for the following ${
+                payload.media?.mediaType === MediaType.TV ? 'series' : 'movie'
+              } could not be added to ${
+                payload.media?.mediaType === MediaType.TV ? 'Sonarr' : 'Radarr'
+              }:`,
+              mediaName: payload.subject,
+              mediaPlot: payload.message,
+              imageUrl: payload.image,
+              timestamp: new Date().toTimeString(),
+              requestedBy: payload.request?.requestedBy.displayName,
+              actionUrl: applicationUrl
+                ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
+                : undefined,
+              applicationUrl,
+              applicationTitle,
+              requestType: `Failed ${
+                payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+              } Request`,
+            },
+          });
+        });
+      return true;
+    } catch (e) {
+      logger.error('Email notification failed to send', {
+        label: 'Notifications',
+        message: e.message,
+      });
+      return false;
+    }
+  }
+
+  private async sendMediaApprovedEmail(payload: NotificationPayload) {
+    // This is getting main settings for the whole app
+    const { applicationUrl, applicationTitle } = getSettings().main;
+    try {
+      if (
+        payload.notifyUser &&
+        (payload.notifyUser.settings?.enableNotifications ?? true)
+      ) {
+        const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
+
+        await email.send({
+          template: path.join(
+            __dirname,
+            '../../../templates/email/media-request'
+          ),
+          message: {
+            to: payload.notifyUser.email,
+          },
+          locals: {
+            body: `Your request for the following ${
+              payload.media?.mediaType === MediaType.TV ? 'series' : 'movie'
+            } has been approved:`,
+            mediaName: payload.subject,
+            mediaExtra: payload.extra ?? [],
+            imageUrl: payload.image,
+            timestamp: new Date().toTimeString(),
+            requestedBy: payload.request?.requestedBy.displayName,
+            actionUrl: applicationUrl
+              ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
+              : undefined,
+            applicationUrl,
+            applicationTitle,
+            requestType: `${
+              payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+            } Request Approved`,
+          },
+        });
+      }
+
+      return true;
+    } catch (e) {
+      logger.error('Email notification failed to send', {
+        label: 'Notifications',
+        message: e.message,
+      });
+      return false;
+    }
+  }
+
+  private async sendMediaAutoApprovedEmail(payload: NotificationPayload) {
+    // This is getting main settings for the whole app
+    const { applicationUrl, applicationTitle } = getSettings().main;
+    try {
+      const userRepository = getRepository(User);
+      const users = await userRepository.find();
+
+      // Send to all users with the manage requests permission (or admins)
+      users
+        .filter(
+          (user) =>
+            user.hasPermission(Permission.MANAGE_REQUESTS) &&
+            (user.settings?.enableNotifications ?? true)
+        )
         .forEach((user) => {
           const email = new PreparedEmail();
 
@@ -103,62 +223,28 @@ class EmailAgent
               to: user.email,
             },
             locals: {
-              body:
-                "A user's new request has failed to add to Sonarr or Radarr",
+              body: `A new request for the following ${
+                payload.media?.mediaType === MediaType.TV ? 'series' : 'movie'
+              } has been automatically approved:`,
               mediaName: payload.subject,
+              mediaExtra: payload.extra ?? [],
               imageUrl: payload.image,
               timestamp: new Date().toTimeString(),
-              requestedBy: payload.notifyUser.displayName,
+              requestedBy: payload.request?.requestedBy.displayName,
               actionUrl: applicationUrl
                 ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
                 : undefined,
               applicationUrl,
               applicationTitle,
-              requestType: 'Failed Request',
+              requestType: `${
+                payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+              } Request Automatically Approved`,
             },
           });
         });
       return true;
     } catch (e) {
-      logger.error('Mail notification failed to send', {
-        label: 'Notifications',
-        message: e.message,
-      });
-      return false;
-    }
-  }
-
-  private async sendMediaApprovedEmail(payload: NotificationPayload) {
-    // This is getting main settings for the whole app
-    const { applicationUrl, applicationTitle } = getSettings().main;
-    try {
-      const email = new PreparedEmail();
-
-      await email.send({
-        template: path.join(
-          __dirname,
-          '../../../templates/email/media-request'
-        ),
-        message: {
-          to: payload.notifyUser.email,
-        },
-        locals: {
-          body: 'Your request for the following media has been approved:',
-          mediaName: payload.subject,
-          imageUrl: payload.image,
-          timestamp: new Date().toTimeString(),
-          requestedBy: payload.notifyUser.displayName,
-          actionUrl: applicationUrl
-            ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
-            : undefined,
-          applicationUrl,
-          applicationTitle,
-          requestType: 'Request Approved',
-        },
-      });
-      return true;
-    } catch (e) {
-      logger.error('Mail notification failed to send', {
+      logger.error('Email notification failed to send', {
         label: 'Notifications',
         message: e.message,
       });
@@ -170,33 +256,44 @@ class EmailAgent
     // This is getting main settings for the whole app
     const { applicationUrl, applicationTitle } = getSettings().main;
     try {
-      const email = new PreparedEmail();
+      if (
+        payload.notifyUser &&
+        (payload.notifyUser.settings?.enableNotifications ?? true)
+      ) {
+        const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
+
+        await email.send({
+          template: path.join(
+            __dirname,
+            '../../../templates/email/media-request'
+          ),
+          message: {
+            to: payload.notifyUser.email,
+          },
+          locals: {
+            body: `Your request for the following ${
+              payload.media?.mediaType === MediaType.TV ? 'series' : 'movie'
+            } was declined:`,
+            mediaName: payload.subject,
+            mediaExtra: payload.extra ?? [],
+            imageUrl: payload.image,
+            timestamp: new Date().toTimeString(),
+            requestedBy: payload.request?.requestedBy.displayName,
+            actionUrl: applicationUrl
+              ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
+              : undefined,
+            applicationUrl,
+            applicationTitle,
+            requestType: `${
+              payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+            } Request Declined`,
+          },
+        });
+      }
 
-      await email.send({
-        template: path.join(
-          __dirname,
-          '../../../templates/email/media-request'
-        ),
-        message: {
-          to: payload.notifyUser.email,
-        },
-        locals: {
-          body: 'Your request for the following media was declined:',
-          mediaName: payload.subject,
-          imageUrl: payload.image,
-          timestamp: new Date().toTimeString(),
-          requestedBy: payload.notifyUser.displayName,
-          actionUrl: applicationUrl
-            ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
-            : undefined,
-          applicationUrl,
-          applicationTitle,
-          requestType: 'Request Declined',
-        },
-      });
       return true;
     } catch (e) {
-      logger.error('Mail notification failed to send', {
+      logger.error('Email notification failed to send', {
         label: 'Notifications',
         message: e.message,
       });
@@ -208,33 +305,44 @@ class EmailAgent
     // This is getting main settings for the whole app
     const { applicationUrl, applicationTitle } = getSettings().main;
     try {
-      const email = new PreparedEmail();
+      if (
+        payload.notifyUser &&
+        (payload.notifyUser.settings?.enableNotifications ?? true)
+      ) {
+        const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
+
+        await email.send({
+          template: path.join(
+            __dirname,
+            '../../../templates/email/media-request'
+          ),
+          message: {
+            to: payload.notifyUser.email,
+          },
+          locals: {
+            body: `The following ${
+              payload.media?.mediaType === MediaType.TV ? 'series' : 'movie'
+            } you requested is now available!`,
+            mediaName: payload.subject,
+            mediaExtra: payload.extra ?? [],
+            imageUrl: payload.image,
+            timestamp: new Date().toTimeString(),
+            requestedBy: payload.request?.requestedBy.displayName,
+            actionUrl: applicationUrl
+              ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
+              : undefined,
+            applicationUrl,
+            applicationTitle,
+            requestType: `${
+              payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+            } Now Available`,
+          },
+        });
+      }
 
-      await email.send({
-        template: path.join(
-          __dirname,
-          '../../../templates/email/media-request'
-        ),
-        message: {
-          to: payload.notifyUser.email,
-        },
-        locals: {
-          body: 'Your requested media is now available!',
-          mediaName: payload.subject,
-          imageUrl: payload.image,
-          timestamp: new Date().toTimeString(),
-          requestedBy: payload.notifyUser.displayName,
-          actionUrl: applicationUrl
-            ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
-            : undefined,
-          applicationUrl,
-          applicationTitle,
-          requestType: 'Now Available',
-        },
-      });
       return true;
     } catch (e) {
-      logger.error('Mail notification failed to send', {
+      logger.error('Email notification failed to send', {
         label: 'Notifications',
         message: e.message,
       });
@@ -246,22 +354,25 @@ class EmailAgent
     // This is getting main settings for the whole app
     const { applicationUrl, applicationTitle } = getSettings().main;
     try {
-      const email = new PreparedEmail();
+      if (payload.notifyUser) {
+        const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
+
+        await email.send({
+          template: path.join(__dirname, '../../../templates/email/test-email'),
+          message: {
+            to: payload.notifyUser.email,
+          },
+          locals: {
+            body: payload.message,
+            applicationUrl,
+            applicationTitle,
+          },
+        });
+      }
 
-      await email.send({
-        template: path.join(__dirname, '../../../templates/email/test-email'),
-        message: {
-          to: payload.notifyUser.email,
-        },
-        locals: {
-          body: payload.message,
-          applicationUrl,
-          applicationTitle,
-        },
-      });
       return true;
     } catch (e) {
-      logger.error('Mail notification failed to send', {
+      logger.error('Email notification failed to send', {
         label: 'Notifications',
         message: e.message,
       });
@@ -282,6 +393,9 @@ class EmailAgent
       case Notification.MEDIA_APPROVED:
         this.sendMediaApprovedEmail(payload);
         break;
+      case Notification.MEDIA_AUTO_APPROVED:
+        this.sendMediaAutoApprovedEmail(payload);
+        break;
       case Notification.MEDIA_DECLINED:
         this.sendMediaDeclinedEmail(payload);
         break;

server/lib/notifications/agents/pushbullet.ts

@@ -3,6 +3,7 @@ import { hasNotificationType, Notification } from '..';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentPushbullet } from '../../settings';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import { MediaType } from '../../../constants/media';
 
 interface PushbulletPayload {
   title: string;
@@ -46,11 +47,13 @@ class PushbulletAgent
 
     const title = payload.subject;
     const plot = payload.message;
-    const username = payload.notifyUser.displayName;
+    const username = payload.request?.requestedBy.displayName;
 
     switch (type) {
       case Notification.MEDIA_PENDING:
-        messageTitle = 'New Request';
+        messageTitle = `New ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request`;
         message += `${title}`;
         if (plot) {
           message += `\n\n${plot}`;
@@ -59,7 +62,20 @@ class PushbulletAgent
         message += `\nStatus: Pending Approval`;
         break;
       case Notification.MEDIA_APPROVED:
-        messageTitle = 'Request Approved';
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Approved`;
+        message += `${title}`;
+        if (plot) {
+          message += `\n\n${plot}`;
+        }
+        message += `\n\nRequested By: ${username}`;
+        message += `\nStatus: Processing`;
+        break;
+      case Notification.MEDIA_AUTO_APPROVED:
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Automatically Approved`;
         message += `${title}`;
         if (plot) {
           message += `\n\n${plot}`;
@@ -68,7 +84,9 @@ class PushbulletAgent
         message += `\nStatus: Processing`;
         break;
       case Notification.MEDIA_AVAILABLE:
-        messageTitle = 'Now Available';
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Now Available`;
         message += `${title}`;
         if (plot) {
           message += `\n\n${plot}`;
@@ -77,7 +95,9 @@ class PushbulletAgent
         message += `\nStatus: Available`;
         break;
       case Notification.MEDIA_DECLINED:
-        messageTitle = 'Request Declined';
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Declined`;
         message += `${title}`;
         if (plot) {
           message += `\n\n${plot}`;
@@ -86,7 +106,9 @@ class PushbulletAgent
         message += `\nStatus: Declined`;
         break;
       case Notification.MEDIA_FAILED:
-        messageTitle = 'Failed Request';
+        messageTitle = `Failed ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request`;
         message += `${title}`;
         if (plot) {
           message += `\n\n${plot}`;
@@ -100,6 +122,10 @@ class PushbulletAgent
         break;
     }
 
+    for (const extra of payload.extra ?? []) {
+      message += `\n${extra.name}: ${extra.value}`;
+    }
+
     return {
       title: messageTitle,
       body: message,

server/lib/notifications/agents/pushover.ts

@@ -3,6 +3,7 @@ import { hasNotificationType, Notification } from '..';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentPushover } from '../../settings';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import { MediaType } from '../../../constants/media';
 
 interface PushoverPayload {
   token: string;
@@ -60,62 +61,87 @@ class PushoverAgent
 
     const title = payload.subject;
     const plot = payload.message;
-    const username = payload.notifyUser.displayName;
+    const username = payload.request?.requestedBy.displayName;
 
     switch (type) {
       case Notification.MEDIA_PENDING:
-        messageTitle = 'New Request';
+        messageTitle = `New ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request`;
         message += `<b>${title}</b>`;
         if (plot) {
-          message += `\n${plot}`;
+          message += `<small>\n${plot}</small>`;
         }
-        message += `\n\n<b>Requested By</b>\n${username}`;
-        message += `\n\n<b>Status</b>\nPending Approval`;
+        message += `<small>\n\n<b>Requested By</b>\n${username}</small>`;
+        message += `<small>\n\n<b>Status</b>\nPending Approval</small>`;
         break;
       case Notification.MEDIA_APPROVED:
-        messageTitle = 'Request Approved';
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Approved`;
         message += `<b>${title}</b>`;
         if (plot) {
-          message += `\n${plot}`;
+          message += `<small>\n${plot}</small>`;
         }
-        message += `\n\n<b>Requested By</b>\n${username}`;
-        message += `\n\n<b>Status</b>\nProcessing`;
+        message += `<small>\n\n<b>Requested By</b>\n${username}</small>`;
+        message += `<small>\n\n<b>Status</b>\nProcessing</small>`;
+        break;
+      case Notification.MEDIA_AUTO_APPROVED:
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Automatically Approved`;
+        message += `<b>${title}</b>`;
+        if (plot) {
+          message += `<small>\n${plot}</small>`;
+        }
+        message += `<small>\n\n<b>Requested By</b>\n${username}</small>`;
+        message += `<small>\n\n<b>Status</b>\nProcessing</small>`;
         break;
       case Notification.MEDIA_AVAILABLE:
-        messageTitle = 'Now Available';
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Now Available`;
         message += `<b>${title}</b>`;
         if (plot) {
-          message += `\n${plot}`;
+          message += `<small>\n${plot}</small>`;
         }
-        message += `\n\n<b>Requested By</b>\n${username}`;
-        message += `\n\n<b>Status</b>\nAvailable`;
+        message += `<small>\n\n<b>Requested By</b>\n${username}</small>`;
+        message += `<small>\n\n<b>Status</b>\nAvailable</small>`;
         break;
       case Notification.MEDIA_DECLINED:
-        messageTitle = 'Request Declined';
+        messageTitle = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Declined`;
         message += `<b>${title}</b>`;
         if (plot) {
-          message += `\n${plot}`;
+          message += `<small>\n${plot}</small>`;
         }
-        message += `\n\n<b>Requested By</b>\n${username}`;
-        message += `\n\n<b>Status</b>\nDeclined`;
+        message += `<small>\n\n<b>Requested By</b>\n${username}</small>`;
+        message += `<small>\n\n<b>Status</b>\nDeclined</small>`;
         priority = 1;
         break;
       case Notification.MEDIA_FAILED:
-        messageTitle = 'Failed Request';
+        messageTitle = `Failed ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request`;
         message += `<b>${title}</b>`;
         if (plot) {
-          message += `\n${plot}`;
+          message += `<small>\n${plot}</small>`;
         }
-        message += `\n\n<b>Requested By</b>\n${username}`;
-        message += `\n\n<b>Status</b>\nFailed`;
+        message += `<small>\n\n<b>Requested By</b>\n${username}</small>`;
+        message += `<small>\n\n<b>Status</b>\nFailed</small>`;
         priority = 1;
         break;
       case Notification.TEST_NOTIFICATION:
         messageTitle = 'Test Notification';
-        message += `${plot}`;
+        message += `<small>${plot}</small>`;
         break;
     }
 
+    for (const extra of payload.extra ?? []) {
+      message += `<small>\n\n<b>${extra.name}</b>\n${extra.value}</small>`;
+    }
+
     if (settings.main.applicationUrl && payload.media) {
       url = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
       url_title = `Open in ${settings.main.applicationTitle}`;

server/lib/notifications/agents/slack.ts

@@ -3,6 +3,7 @@ import { hasNotificationType, Notification } from '..';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentSlack } from '../../settings';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import { MediaType } from '../../../constants/media';
 
 interface EmbedField {
   type: 'plain_text' | 'mrkdwn';
@@ -66,41 +67,62 @@ class SlackAgent
     if (payload.request) {
       fields.push({
         type: 'mrkdwn',
-        text: `*Requested By*\n${payload.notifyUser.displayName ?? ''}`,
+        text: `*Requested By*\n${
+          payload.request?.requestedBy.displayName ?? ''
+        }`,
       });
     }
 
     switch (type) {
       case Notification.MEDIA_PENDING:
-        header = 'New Request';
+        header = `New ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request`;
         fields.push({
           type: 'mrkdwn',
           text: '*Status*\nPending Approval',
         });
         break;
       case Notification.MEDIA_APPROVED:
-        header = 'Request Approved';
+        header = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Approved`;
+        fields.push({
+          type: 'mrkdwn',
+          text: '*Status*\nProcessing',
+        });
+        break;
+      case Notification.MEDIA_AUTO_APPROVED:
+        header = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Automatically Approved`;
         fields.push({
           type: 'mrkdwn',
           text: '*Status*\nProcessing',
         });
         break;
       case Notification.MEDIA_AVAILABLE:
-        header = 'Now Available';
+        header = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Now Available`;
         fields.push({
           type: 'mrkdwn',
           text: '*Status*\nAvailable',
         });
         break;
       case Notification.MEDIA_DECLINED:
-        header = 'Request Declined';
+        header = `${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Declined`;
         fields.push({
           type: 'mrkdwn',
           text: '*Status*\nDeclined',
         });
         break;
       case Notification.MEDIA_FAILED:
-        header = 'Failed Request';
+        header = `Failed ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request`;
         fields.push({
           type: 'mrkdwn',
           text: '*Status*\nFailed',
@@ -111,6 +133,13 @@ class SlackAgent
         break;
     }
 
+    for (const extra of payload.extra ?? []) {
+      fields.push({
+        type: 'mrkdwn',
+        text: `*${extra.name}*\n${extra.value}`,
+      });
+    }
+
     if (settings.main.applicationUrl && payload.media) {
       actionUrl = `${settings.main.applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`;
     }
@@ -206,7 +235,7 @@ class SlackAgent
     type: Notification,
     payload: NotificationPayload
   ): Promise<boolean> {
-    logger.debug('Sending slack notification', { label: 'Notifications' });
+    logger.debug('Sending Slack notification', { label: 'Notifications' });
     try {
       const webhookUrl = this.getSettings().options.webhookUrl;
 

server/lib/notifications/agents/telegram.ts

@@ -1,16 +1,25 @@
 import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
+import { MediaType } from '../../../constants/media';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentTelegram } from '../../settings';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
 
-interface TelegramPayload {
+interface TelegramMessagePayload {
   text: string;
   parse_mode: string;
   chat_id: string;
   disable_notification: boolean;
 }
 
+interface TelegramPhotoPayload {
+  photo: string;
+  caption: string;
+  parse_mode: string;
+  chat_id: string;
+  disable_notification: boolean;
+}
+
 class TelegramAgent
   extends BaseAgent<NotificationAgentTelegram>
   implements NotificationAgent {
@@ -52,13 +61,15 @@ class TelegramAgent
 
     const title = this.escapeText(payload.subject);
     const plot = this.escapeText(payload.message);
-    const user = this.escapeText(payload.notifyUser.displayName);
+    const user = this.escapeText(payload.request?.requestedBy.displayName);
     const applicationTitle = this.escapeText(settings.main.applicationTitle);
 
     /* eslint-disable no-useless-escape */
     switch (type) {
       case Notification.MEDIA_PENDING:
-        message += `\*New Request\*`;
+        message += `\*New ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request\*`;
         message += `\n\n\*${title}\*`;
         if (plot) {
           message += `\n${plot}`;
@@ -67,7 +78,20 @@ class TelegramAgent
         message += `\n\n\*Status\*\nPending Approval`;
         break;
       case Notification.MEDIA_APPROVED:
-        message += `\*Request Approved\*`;
+        message += `\*${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Approved\*`;
+        message += `\n\n\*${title}\*`;
+        if (plot) {
+          message += `\n${plot}`;
+        }
+        message += `\n\n\*Requested By\*\n${user}`;
+        message += `\n\n\*Status\*\nProcessing`;
+        break;
+      case Notification.MEDIA_AUTO_APPROVED:
+        message += `\*${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Automatically Approved\*`;
         message += `\n\n\*${title}\*`;
         if (plot) {
           message += `\n${plot}`;
@@ -76,7 +100,9 @@ class TelegramAgent
         message += `\n\n\*Status\*\nProcessing`;
         break;
       case Notification.MEDIA_AVAILABLE:
-        message += `\*Now Available\*`;
+        message += `\*${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Now Available\*`;
         message += `\n\n\*${title}\*`;
         if (plot) {
           message += `\n${plot}`;
@@ -85,7 +111,9 @@ class TelegramAgent
         message += `\n\n\*Status\*\nAvailable`;
         break;
       case Notification.MEDIA_DECLINED:
-        message += `\*Request Declined\*`;
+        message += `\*${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request Declined\*`;
         message += `\n\n\*${title}\*`;
         if (plot) {
           message += `\n${plot}`;
@@ -94,7 +122,9 @@ class TelegramAgent
         message += `\n\n\*Status\*\nDeclined`;
         break;
       case Notification.MEDIA_FAILED:
-        message += `\*Failed Request\*`;
+        message += `\*Failed ${
+          payload.media?.mediaType === MediaType.TV ? 'Series' : 'Movie'
+        } Request\*`;
         message += `\n\n\*${title}\*`;
         if (plot) {
           message += `\n${plot}`;
@@ -108,6 +138,10 @@ class TelegramAgent
         break;
     }
 
+    for (const extra of payload.extra ?? []) {
+      message += `\n\n\*${extra.name}\*\n${extra.value}`;
+    }
+
     if (settings.main.applicationUrl && payload.media) {
       const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
       message += `\n\n\[Open in ${applicationTitle}\]\(${actionUrl}\)`;
@@ -121,18 +155,53 @@ class TelegramAgent
     type: Notification,
     payload: NotificationPayload
   ): Promise<boolean> {
-    logger.debug('Sending telegram notification', { label: 'Notifications' });
+    logger.debug('Sending Telegram notification', { label: 'Notifications' });
     try {
       const endpoint = `${this.baseUrl}bot${
         this.getSettings().options.botAPI
-      }/sendMessage`;
+      }/${payload.image ? 'sendPhoto' : 'sendMessage'}`;
 
-      await axios.post(endpoint, {
-        text: this.buildMessage(type, payload),
-        parse_mode: 'MarkdownV2',
-        chat_id: `${this.getSettings().options.chatId}`,
-        disable_notification: this.getSettings().options.sendSilently,
-      } as TelegramPayload);
+      // Send system notification
+      await (payload.image
+        ? axios.post(endpoint, {
+            photo: payload.image,
+            caption: this.buildMessage(type, payload),
+            parse_mode: 'MarkdownV2',
+            chat_id: `${this.getSettings().options.chatId}`,
+            disable_notification: this.getSettings().options.sendSilently,
+          } as TelegramPhotoPayload)
+        : axios.post(endpoint, {
+            text: this.buildMessage(type, payload),
+            parse_mode: 'MarkdownV2',
+            chat_id: `${this.getSettings().options.chatId}`,
+            disable_notification: this.getSettings().options.sendSilently,
+          } as TelegramMessagePayload));
+
+      // Send user notification
+      if (
+        payload.notifyUser &&
+        (payload.notifyUser.settings?.enableNotifications ?? true) &&
+        payload.notifyUser.settings?.telegramChatId &&
+        payload.notifyUser.settings?.telegramChatId !==
+          this.getSettings().options.chatId
+      ) {
+        await (payload.image
+          ? axios.post(endpoint, {
+              photo: payload.image,
+              caption: this.buildMessage(type, payload),
+              parse_mode: 'MarkdownV2',
+              chat_id: `${payload.notifyUser.settings.telegramChatId}`,
+              disable_notification:
+                payload.notifyUser.settings.telegramSendSilently,
+            } as TelegramPhotoPayload)
+          : axios.post(endpoint, {
+              text: this.buildMessage(type, payload),
+              parse_mode: 'MarkdownV2',
+              chat_id: `${payload.notifyUser.settings.telegramChatId}`,
+              disable_notification:
+                payload.notifyUser.settings.telegramSendSilently,
+            } as TelegramMessagePayload));
+      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/webhook.ts

@@ -20,6 +20,7 @@ const KeyMap: Record<string, string | KeyMapFunction> = {
   notifyuser_email: 'notifyUser.email',
   notifyuser_avatar: 'notifyUser.avatar',
   notifyuser_settings_discordId: 'notifyUser.settings.discordId',
+  notifyuser_settings_telegramChatId: 'notifyUser.settings.telegramChatId',
   media_tmdbid: 'media.tmdbId',
   media_imdbid: 'media.imdbId',
   media_tvdbid: 'media.tvdbId',
@@ -137,7 +138,7 @@ class WebhookAgent
 
       return true;
     } catch (e) {
-      logger.error('Error sending Webhook notification', {
+      logger.error('Error sending webhook notification', {
         label: 'Notifications',
         errorMessage: e.message,
       });

server/lib/notifications/index.ts

@@ -9,6 +9,7 @@ export enum Notification {
   MEDIA_FAILED = 16,
   TEST_NOTIFICATION = 32,
   MEDIA_DECLINED = 64,
+  MEDIA_AUTO_APPROVED = 128,
 }
 
 export const hasNotificationType = (
@@ -49,7 +50,7 @@ class NotificationManager {
       label: 'Notifications',
     });
     this.activeAgents.forEach((agent) => {
-      if (settings.enabled && agent.shouldSend(type, payload)) {
+      if (settings.enabled && agent.shouldSend(type)) {
         agent.send(type, payload);
       }
     });

server/lib/scanners/baseScanner.ts

@@ -0,0 +1,616 @@
+import { getRepository } from 'typeorm';
+import { v4 as uuid } from 'uuid';
+import TheMovieDb from '../../api/themoviedb';
+import { MediaStatus, MediaType } from '../../constants/media';
+import Media from '../../entity/Media';
+import Season from '../../entity/Season';
+import logger from '../../logger';
+import AsyncLock from '../../utils/asyncLock';
+import { getSettings } from '../settings';
+
+// Default scan rates (can be overidden)
+const BUNDLE_SIZE = 20;
+const UPDATE_RATE = 4 * 1000;
+
+export type StatusBase = {
+  running: boolean;
+  progress: number;
+  total: number;
+};
+
+export interface RunnableScanner<T> {
+  run: () => Promise<void>;
+  status: () => T & StatusBase;
+}
+
+export interface MediaIds {
+  tmdbId: number;
+  imdbId?: string;
+  tvdbId?: number;
+  isHama?: boolean;
+}
+
+interface ProcessOptions {
+  is4k?: boolean;
+  mediaAddedAt?: Date;
+  ratingKey?: string;
+  serviceId?: number;
+  externalServiceId?: number;
+  externalServiceSlug?: string;
+  title?: string;
+  processing?: boolean;
+}
+
+export interface ProcessableSeason {
+  seasonNumber: number;
+  totalEpisodes: number;
+  episodes: number;
+  episodes4k: number;
+  is4kOverride?: boolean;
+  processing?: boolean;
+}
+
+class BaseScanner<T> {
+  private bundleSize;
+  private updateRate;
+  protected progress = 0;
+  protected items: T[] = [];
+  protected scannerName: string;
+  protected enable4kMovie = false;
+  protected enable4kShow = false;
+  protected sessionId: string;
+  protected running = false;
+  readonly asyncLock = new AsyncLock();
+  readonly tmdb = new TheMovieDb();
+
+  protected constructor(
+    scannerName: string,
+    {
+      updateRate,
+      bundleSize,
+    }: {
+      updateRate?: number;
+      bundleSize?: number;
+    } = {}
+  ) {
+    this.scannerName = scannerName;
+    this.bundleSize = bundleSize ?? BUNDLE_SIZE;
+    this.updateRate = updateRate ?? UPDATE_RATE;
+  }
+
+  private async getExisting(tmdbId: number, mediaType: MediaType) {
+    const mediaRepository = getRepository(Media);
+
+    const existing = await mediaRepository.findOne({
+      where: { tmdbId: tmdbId, mediaType },
+    });
+
+    return existing;
+  }
+
+  protected async processMovie(
+    tmdbId: number,
+    {
+      is4k = false,
+      mediaAddedAt,
+      ratingKey,
+      serviceId,
+      externalServiceId,
+      externalServiceSlug,
+      processing = false,
+      title = 'Unknown Title',
+    }: ProcessOptions = {}
+  ): Promise<void> {
+    const mediaRepository = getRepository(Media);
+
+    await this.asyncLock.dispatch(tmdbId, async () => {
+      const existing = await this.getExisting(tmdbId, MediaType.MOVIE);
+
+      if (existing) {
+        let changedExisting = false;
+
+        if (existing[is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE) {
+          existing[is4k ? 'status4k' : 'status'] = processing
+            ? MediaStatus.PROCESSING
+            : MediaStatus.AVAILABLE;
+          if (mediaAddedAt) {
+            existing.mediaAddedAt = mediaAddedAt;
+          }
+          changedExisting = true;
+        }
+
+        if (!changedExisting && !existing.mediaAddedAt && mediaAddedAt) {
+          existing.mediaAddedAt = mediaAddedAt;
+          changedExisting = true;
+        }
+
+        if (
+          ratingKey &&
+          existing[is4k ? 'ratingKey4k' : 'ratingKey'] !== ratingKey
+        ) {
+          existing[is4k ? 'ratingKey4k' : 'ratingKey'] = ratingKey;
+          changedExisting = true;
+        }
+
+        if (
+          serviceId !== undefined &&
+          existing[is4k ? 'serviceId4k' : 'serviceId'] !== serviceId
+        ) {
+          existing[is4k ? 'serviceId4k' : 'serviceId'] = serviceId;
+          changedExisting = true;
+        }
+
+        if (
+          externalServiceId !== undefined &&
+          existing[is4k ? 'externalServiceId4k' : 'externalServiceId'] !==
+            externalServiceId
+        ) {
+          existing[
+            is4k ? 'externalServiceId4k' : 'externalServiceId'
+          ] = externalServiceId;
+          changedExisting = true;
+        }
+
+        if (
+          externalServiceSlug !== undefined &&
+          existing[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] !==
+            externalServiceSlug
+        ) {
+          existing[
+            is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'
+          ] = externalServiceSlug;
+          changedExisting = true;
+        }
+
+        if (changedExisting) {
+          await mediaRepository.save(existing);
+          this.log(
+            `Media for ${title} exists. Changes were detected and the title will be updated.`,
+            'info'
+          );
+        } else {
+          this.log(`Title already exists and no changes detected for ${title}`);
+        }
+      } else {
+        const newMedia = new Media();
+        newMedia.tmdbId = tmdbId;
+
+        newMedia.status =
+          !is4k && !processing
+            ? MediaStatus.AVAILABLE
+            : !is4k && processing
+            ? MediaStatus.PROCESSING
+            : MediaStatus.UNKNOWN;
+        newMedia.status4k =
+          is4k && this.enable4kMovie && !processing
+            ? MediaStatus.AVAILABLE
+            : is4k && this.enable4kMovie && processing
+            ? MediaStatus.PROCESSING
+            : MediaStatus.UNKNOWN;
+        newMedia.mediaType = MediaType.MOVIE;
+        newMedia.serviceId = !is4k ? serviceId : undefined;
+        newMedia.serviceId4k = is4k ? serviceId : undefined;
+        newMedia.externalServiceId = !is4k ? externalServiceId : undefined;
+        newMedia.externalServiceId4k = is4k ? externalServiceId : undefined;
+        newMedia.externalServiceSlug = !is4k ? externalServiceSlug : undefined;
+        newMedia.externalServiceSlug4k = is4k ? externalServiceSlug : undefined;
+
+        if (mediaAddedAt) {
+          newMedia.mediaAddedAt = mediaAddedAt;
+        }
+
+        if (ratingKey) {
+          newMedia.ratingKey = !is4k ? ratingKey : undefined;
+          newMedia.ratingKey4k =
+            is4k && this.enable4kMovie ? ratingKey : undefined;
+        }
+        await mediaRepository.save(newMedia);
+        this.log(`Saved new media: ${title}`);
+      }
+    });
+  }
+
+  /**
+   * processShow takes a TMDb ID and an array of ProcessableSeasons, which
+   * should include the total episodes a sesaon has + the total available
+   * episodes that each season currently has. Unlike processMovie, this method
+   * does not take an `is4k` option. We handle both the 4k _and_ non 4k status
+   * in one method.
+   *
+   * Note: If 4k is not enable, ProcessableSeasons should combine their episode counts
+   * into the normal episodes properties and avoid using the 4k properties.
+   */
+  protected async processShow(
+    tmdbId: number,
+    tvdbId: number,
+    seasons: ProcessableSeason[],
+    {
+      mediaAddedAt,
+      ratingKey,
+      serviceId,
+      externalServiceId,
+      externalServiceSlug,
+      is4k = false,
+      title = 'Unknown Title',
+    }: ProcessOptions = {}
+  ): Promise<void> {
+    const mediaRepository = getRepository(Media);
+
+    await this.asyncLock.dispatch(tmdbId, async () => {
+      const media = await this.getExisting(tmdbId, MediaType.TV);
+
+      const newSeasons: Season[] = [];
+
+      const currentStandardSeasonsAvailable = (
+        media?.seasons.filter(
+          (season) => season.status === MediaStatus.AVAILABLE
+        ) ?? []
+      ).length;
+
+      const current4kSeasonsAvailable = (
+        media?.seasons.filter(
+          (season) => season.status4k === MediaStatus.AVAILABLE
+        ) ?? []
+      ).length;
+
+      for (const season of seasons) {
+        const existingSeason = media?.seasons.find(
+          (es) => es.seasonNumber === season.seasonNumber
+        );
+
+        // We update the rating keys in the seasons loop because we need episode counts
+        if (media && season.episodes > 0 && media.ratingKey !== ratingKey) {
+          media.ratingKey = ratingKey;
+        }
+
+        if (
+          media &&
+          season.episodes4k > 0 &&
+          this.enable4kShow &&
+          media.ratingKey4k !== ratingKey
+        ) {
+          media.ratingKey4k = ratingKey;
+        }
+
+        if (existingSeason) {
+          // Here we update seasons if they already exist.
+          // If the season is already marked as available, we
+          // force it to stay available (to avoid competing scanners)
+          existingSeason.status =
+            (season.totalEpisodes === season.episodes && season.episodes > 0) ||
+            existingSeason.status === MediaStatus.AVAILABLE
+              ? MediaStatus.AVAILABLE
+              : season.episodes > 0
+              ? MediaStatus.PARTIALLY_AVAILABLE
+              : !season.is4kOverride && season.processing
+              ? MediaStatus.PROCESSING
+              : existingSeason.status;
+
+          // Same thing here, except we only do updates if 4k is enabled
+          existingSeason.status4k =
+            (this.enable4kShow &&
+              season.episodes4k === season.totalEpisodes &&
+              season.episodes4k > 0) ||
+            existingSeason.status4k === MediaStatus.AVAILABLE
+              ? MediaStatus.AVAILABLE
+              : this.enable4kShow && season.episodes4k > 0
+              ? MediaStatus.PARTIALLY_AVAILABLE
+              : season.is4kOverride && season.processing
+              ? MediaStatus.PROCESSING
+              : existingSeason.status4k;
+        } else {
+          newSeasons.push(
+            new Season({
+              seasonNumber: season.seasonNumber,
+              status:
+                season.totalEpisodes === season.episodes && season.episodes > 0
+                  ? MediaStatus.AVAILABLE
+                  : season.episodes > 0
+                  ? MediaStatus.PARTIALLY_AVAILABLE
+                  : !season.is4kOverride && season.processing
+                  ? MediaStatus.PROCESSING
+                  : MediaStatus.UNKNOWN,
+              status4k:
+                this.enable4kShow &&
+                season.totalEpisodes === season.episodes4k &&
+                season.episodes4k > 0
+                  ? MediaStatus.AVAILABLE
+                  : this.enable4kShow && season.episodes4k > 0
+                  ? MediaStatus.PARTIALLY_AVAILABLE
+                  : season.is4kOverride && season.processing
+                  ? MediaStatus.PROCESSING
+                  : MediaStatus.UNKNOWN,
+            })
+          );
+        }
+      }
+
+      const isAllStandardSeasons =
+        seasons.length &&
+        seasons.every(
+          (season) =>
+            season.episodes === season.totalEpisodes && season.episodes > 0
+        );
+
+      const isAll4kSeasons =
+        seasons.length &&
+        seasons.every(
+          (season) =>
+            season.episodes4k === season.totalEpisodes && season.episodes4k > 0
+        );
+
+      if (media) {
+        media.seasons = [...media.seasons, ...newSeasons];
+
+        const newStandardSeasonsAvailable = (
+          media.seasons.filter(
+            (season) => season.status === MediaStatus.AVAILABLE
+          ) ?? []
+        ).length;
+
+        const new4kSeasonsAvailable = (
+          media.seasons.filter(
+            (season) => season.status4k === MediaStatus.AVAILABLE
+          ) ?? []
+        ).length;
+
+        // If at least one new season has become available, update
+        // the lastSeasonChange field so we can trigger notifications
+        if (newStandardSeasonsAvailable > currentStandardSeasonsAvailable) {
+          this.log(
+            `Detected ${
+              newStandardSeasonsAvailable - currentStandardSeasonsAvailable
+            } new standard season(s) for ${title}`,
+            'debug'
+          );
+          media.lastSeasonChange = new Date();
+
+          if (mediaAddedAt) {
+            media.mediaAddedAt = mediaAddedAt;
+          }
+        }
+
+        if (new4kSeasonsAvailable > current4kSeasonsAvailable) {
+          this.log(
+            `Detected ${
+              new4kSeasonsAvailable - current4kSeasonsAvailable
+            } new 4K season(s) for ${title}`,
+            'debug'
+          );
+          media.lastSeasonChange = new Date();
+        }
+
+        if (!media.mediaAddedAt && mediaAddedAt) {
+          media.mediaAddedAt = mediaAddedAt;
+        }
+
+        if (serviceId !== undefined) {
+          media[is4k ? 'serviceId4k' : 'serviceId'] = serviceId;
+        }
+
+        if (externalServiceId !== undefined) {
+          media[
+            is4k ? 'externalServiceId4k' : 'externalServiceId'
+          ] = externalServiceId;
+        }
+
+        if (externalServiceSlug !== undefined) {
+          media[
+            is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'
+          ] = externalServiceSlug;
+        }
+
+        // If the show is already available, and there are no new seasons, dont adjust
+        // the status
+        const shouldStayAvailable =
+          media.status === MediaStatus.AVAILABLE &&
+          newSeasons.filter((season) => season.status !== MediaStatus.UNKNOWN)
+            .length === 0;
+        const shouldStayAvailable4k =
+          media.status4k === MediaStatus.AVAILABLE &&
+          newSeasons.filter((season) => season.status4k !== MediaStatus.UNKNOWN)
+            .length === 0;
+
+        media.status =
+          isAllStandardSeasons || shouldStayAvailable
+            ? MediaStatus.AVAILABLE
+            : media.seasons.some(
+                (season) =>
+                  season.status === MediaStatus.PARTIALLY_AVAILABLE ||
+                  season.status === MediaStatus.AVAILABLE
+              )
+            ? MediaStatus.PARTIALLY_AVAILABLE
+            : media.seasons.some(
+                (season) => season.status === MediaStatus.PROCESSING
+              )
+            ? MediaStatus.PROCESSING
+            : MediaStatus.UNKNOWN;
+        media.status4k =
+          (isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
+            ? MediaStatus.AVAILABLE
+            : this.enable4kShow &&
+              media.seasons.some(
+                (season) =>
+                  season.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
+                  season.status4k === MediaStatus.AVAILABLE
+              )
+            ? MediaStatus.PARTIALLY_AVAILABLE
+            : media.seasons.some(
+                (season) => season.status4k === MediaStatus.PROCESSING
+              )
+            ? MediaStatus.PROCESSING
+            : MediaStatus.UNKNOWN;
+        await mediaRepository.save(media);
+        this.log(`Updating existing title: ${title}`);
+      } else {
+        const newMedia = new Media({
+          mediaType: MediaType.TV,
+          seasons: newSeasons,
+          tmdbId,
+          tvdbId,
+          mediaAddedAt,
+          serviceId: !is4k ? serviceId : undefined,
+          serviceId4k: is4k ? serviceId : undefined,
+          externalServiceId: !is4k ? externalServiceId : undefined,
+          externalServiceId4k: is4k ? externalServiceId : undefined,
+          externalServiceSlug: !is4k ? externalServiceSlug : undefined,
+          externalServiceSlug4k: is4k ? externalServiceSlug : undefined,
+          ratingKey: newSeasons.some(
+            (sn) =>
+              sn.status === MediaStatus.PARTIALLY_AVAILABLE ||
+              sn.status === MediaStatus.AVAILABLE
+          )
+            ? ratingKey
+            : undefined,
+          ratingKey4k:
+            this.enable4kShow &&
+            newSeasons.some(
+              (sn) =>
+                sn.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
+                sn.status4k === MediaStatus.AVAILABLE
+            )
+              ? ratingKey
+              : undefined,
+          status: isAllStandardSeasons
+            ? MediaStatus.AVAILABLE
+            : newSeasons.some(
+                (season) =>
+                  season.status === MediaStatus.PARTIALLY_AVAILABLE ||
+                  season.status === MediaStatus.AVAILABLE
+              )
+            ? MediaStatus.PARTIALLY_AVAILABLE
+            : newSeasons.some(
+                (season) => season.status === MediaStatus.PROCESSING
+              )
+            ? MediaStatus.PROCESSING
+            : MediaStatus.UNKNOWN,
+          status4k:
+            isAll4kSeasons && this.enable4kShow
+              ? MediaStatus.AVAILABLE
+              : this.enable4kShow &&
+                newSeasons.some(
+                  (season) =>
+                    season.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
+                    season.status4k === MediaStatus.AVAILABLE
+                )
+              ? MediaStatus.PARTIALLY_AVAILABLE
+              : newSeasons.some(
+                  (season) => season.status4k === MediaStatus.PROCESSING
+                )
+              ? MediaStatus.PROCESSING
+              : MediaStatus.UNKNOWN,
+        });
+        await mediaRepository.save(newMedia);
+        this.log(`Saved ${title}`);
+      }
+    });
+  }
+
+  /**
+   * Call startRun from child class whenever a run is starting to
+   * ensure required values are set
+   *
+   * Returns the session ID which is requried for the cleanup method
+   */
+  protected startRun(): string {
+    const settings = getSettings();
+    const sessionId = uuid();
+    this.sessionId = sessionId;
+
+    this.log('Scan starting', 'info', { sessionId });
+
+    this.enable4kMovie = settings.radarr.some((radarr) => radarr.is4k);
+    if (this.enable4kMovie) {
+      this.log(
+        'At least one 4K Radarr server was detected. 4K movie detection is now enabled',
+        'info'
+      );
+    }
+
+    this.enable4kShow = settings.sonarr.some((sonarr) => sonarr.is4k);
+    if (this.enable4kShow) {
+      this.log(
+        'At least one 4K Sonarr server was detected. 4K series detection is now enabled',
+        'info'
+      );
+    }
+
+    this.running = true;
+
+    return sessionId;
+  }
+
+  /**
+   * Call at end of run loop to perform cleanup
+   */
+  protected endRun(sessionId: string): void {
+    if (this.sessionId === sessionId) {
+      this.running = false;
+    }
+  }
+
+  public cancel(): void {
+    this.running = false;
+  }
+
+  protected async loop(
+    processFn: (item: T) => Promise<void>,
+    {
+      start = 0,
+      end = this.bundleSize,
+      sessionId,
+    }: {
+      start?: number;
+      end?: number;
+      sessionId?: string;
+    } = {}
+  ): Promise<void> {
+    const slicedItems = this.items.slice(start, end);
+
+    if (!this.running) {
+      throw new Error('Sync was aborted.');
+    }
+
+    if (this.sessionId !== sessionId) {
+      throw new Error('New session was started. Old session aborted.');
+    }
+
+    if (start < this.items.length) {
+      this.progress = start;
+      await this.processItems(processFn, slicedItems);
+
+      await new Promise<void>((resolve, reject) =>
+        setTimeout(() => {
+          this.loop(processFn, {
+            start: start + this.bundleSize,
+            end: end + this.bundleSize,
+            sessionId,
+          })
+            .then(() => resolve())
+            .catch((e) => reject(new Error(e.message)));
+        }, this.updateRate)
+      );
+    }
+  }
+
+  private async processItems(
+    processFn: (items: T) => Promise<void>,
+    items: T[]
+  ) {
+    await Promise.all(
+      items.map(async (item) => {
+        await processFn(item);
+      })
+    );
+  }
+
+  protected log(
+    message: string,
+    level: 'info' | 'error' | 'debug' | 'warn' = 'debug',
+    optional?: Record<string, unknown>
+  ): void {
+    logger[level](message, { label: this.scannerName, ...optional });
+  }
+}
+
+export default BaseScanner;

server/lib/scanners/plex/index.ts

@@ -0,0 +1,463 @@
+import { uniqWith } from 'lodash';
+import { getRepository } from 'typeorm';
+import animeList from '../../../api/animelist';
+import PlexAPI, { PlexLibraryItem, PlexMetadata } from '../../../api/plexapi';
+import { TmdbTvDetails } from '../../../api/themoviedb/interfaces';
+import { User } from '../../../entity/User';
+import { getSettings, Library } from '../../settings';
+import BaseScanner, {
+  MediaIds,
+  RunnableScanner,
+  StatusBase,
+  ProcessableSeason,
+} from '../baseScanner';
+
+const imdbRegex = new RegExp(/imdb:\/\/(tt[0-9]+)/);
+const tmdbRegex = new RegExp(/tmdb:\/\/([0-9]+)/);
+const tvdbRegex = new RegExp(/tvdb:\/\/([0-9]+)/);
+const tmdbShowRegex = new RegExp(/themoviedb:\/\/([0-9]+)/);
+const plexRegex = new RegExp(/plex:\/\//);
+// Hama agent uses ASS naming, see details here:
+// https://github.com/ZeroQI/Absolute-Series-Scanner/blob/master/README.md#forcing-the-movieseries-id
+const hamaTvdbRegex = new RegExp(/hama:\/\/tvdb[0-9]?-([0-9]+)/);
+const hamaAnidbRegex = new RegExp(/hama:\/\/anidb[0-9]?-([0-9]+)/);
+const HAMA_AGENT = 'com.plexapp.agents.hama';
+
+type SyncStatus = StatusBase & {
+  currentLibrary: Library;
+  libraries: Library[];
+};
+
+class PlexScanner
+  extends BaseScanner<PlexLibraryItem>
+  implements RunnableScanner<SyncStatus> {
+  private plexClient: PlexAPI;
+  private libraries: Library[];
+  private currentLibrary: Library;
+  private isRecentOnly = false;
+
+  public constructor(isRecentOnly = false) {
+    super('Plex Scan');
+    this.isRecentOnly = isRecentOnly;
+  }
+
+  public status(): SyncStatus {
+    return {
+      running: this.running,
+      progress: this.progress,
+      total: this.items.length,
+      currentLibrary: this.currentLibrary,
+      libraries: this.libraries,
+    };
+  }
+
+  public async run(): Promise<void> {
+    const settings = getSettings();
+    const sessionId = this.startRun();
+    try {
+      const userRepository = getRepository(User);
+      const admin = await userRepository.findOne({
+        select: ['id', 'plexToken'],
+        order: { id: 'ASC' },
+      });
+
+      if (!admin) {
+        return this.log('No admin configured. Plex scan skipped.', 'warn');
+      }
+
+      this.plexClient = new PlexAPI({ plexToken: admin.plexToken });
+
+      this.libraries = settings.plex.libraries.filter(
+        (library) => library.enabled
+      );
+
+      const hasHama = await this.hasHamaAgent();
+      if (hasHama) {
+        await animeList.sync();
+      }
+
+      if (this.isRecentOnly) {
+        for (const library of this.libraries) {
+          this.currentLibrary = library;
+          this.log(
+            `Beginning to process recently added for library: ${library.name}`,
+            'info'
+          );
+          const libraryItems = await this.plexClient.getRecentlyAdded(
+            library.id
+          );
+
+          // Bundle items up by rating keys
+          this.items = uniqWith(libraryItems, (mediaA, mediaB) => {
+            if (mediaA.grandparentRatingKey && mediaB.grandparentRatingKey) {
+              return (
+                mediaA.grandparentRatingKey === mediaB.grandparentRatingKey
+              );
+            }
+
+            if (mediaA.parentRatingKey && mediaB.parentRatingKey) {
+              return mediaA.parentRatingKey === mediaB.parentRatingKey;
+            }
+
+            return mediaA.ratingKey === mediaB.ratingKey;
+          });
+
+          await this.loop(this.processItem.bind(this), { sessionId });
+        }
+      } else {
+        for (const library of this.libraries) {
+          this.currentLibrary = library;
+          this.log(`Beginning to process library: ${library.name}`, 'info');
+          this.items = await this.plexClient.getLibraryContents(library.id);
+          await this.loop(this.processItem.bind(this), { sessionId });
+        }
+      }
+      this.log(
+        this.isRecentOnly
+          ? 'Recently Added Scan Complete'
+          : 'Full Scan Complete',
+        'info'
+      );
+    } catch (e) {
+      this.log('Scan interrupted', 'error', { errorMessage: e.message });
+    } finally {
+      this.endRun(sessionId);
+    }
+  }
+
+  private async processItem(plexitem: PlexLibraryItem) {
+    try {
+      if (plexitem.type === 'movie') {
+        await this.processPlexMovie(plexitem);
+      } else if (
+        plexitem.type === 'show' ||
+        plexitem.type === 'episode' ||
+        plexitem.type === 'season'
+      ) {
+        await this.processPlexShow(plexitem);
+      }
+    } catch (e) {
+      this.log('Failed to process Plex media', 'error', {
+        errorMessage: e.message,
+        title: plexitem.title,
+      });
+    }
+  }
+
+  private async processPlexMovie(plexitem: PlexLibraryItem) {
+    const mediaIds = await this.getMediaIds(plexitem);
+    const metadata = await this.plexClient.getMetadata(plexitem.ratingKey);
+
+    const has4k = metadata.Media.some(
+      (media) => media.videoResolution === '4k'
+    );
+
+    await this.processMovie(mediaIds.tmdbId, {
+      is4k: has4k && this.enable4kMovie,
+      mediaAddedAt: new Date(plexitem.addedAt * 1000),
+      ratingKey: plexitem.ratingKey,
+      title: plexitem.title,
+    });
+  }
+
+  private async processPlexMovieByTmdbId(
+    plexitem: PlexMetadata,
+    tmdbId: number
+  ) {
+    const has4k = plexitem.Media.some(
+      (media) => media.videoResolution === '4k'
+    );
+
+    await this.processMovie(tmdbId, {
+      is4k: has4k && this.enable4kMovie,
+      mediaAddedAt: new Date(plexitem.addedAt * 1000),
+      ratingKey: plexitem.ratingKey,
+      title: plexitem.title,
+    });
+  }
+
+  private async processPlexShow(plexitem: PlexLibraryItem) {
+    const ratingKey =
+      plexitem.grandparentRatingKey ??
+      plexitem.parentRatingKey ??
+      plexitem.ratingKey;
+    const metadata = await this.plexClient.getMetadata(ratingKey, {
+      includeChildren: true,
+    });
+
+    const mediaIds = await this.getMediaIds(metadata);
+
+    // If the media is from HAMA, and doesn't have a TVDb ID, we will treat it
+    // as a special HAMA movie
+    if (mediaIds.tmdbId && !mediaIds.tvdbId && mediaIds.isHama) {
+      this.processHamaMovie(metadata, mediaIds.tmdbId);
+      return;
+    }
+
+    // If the media is from HAMA and we have a TVDb ID, we will attempt
+    // to process any specials that may exist
+    if (mediaIds.tvdbId && mediaIds.isHama) {
+      await this.processHamaSpecials(metadata, mediaIds.tvdbId);
+    }
+
+    const tvShow = await this.tmdb.getTvShow({ tvId: mediaIds.tmdbId });
+
+    const seasons = tvShow.seasons;
+    const processableSeasons: ProcessableSeason[] = [];
+
+    const filteredSeasons = seasons.filter((sn) => sn.season_number !== 0);
+
+    for (const season of filteredSeasons) {
+      const matchedPlexSeason = metadata.Children?.Metadata.find(
+        (md) => Number(md.index) === season.season_number
+      );
+
+      if (matchedPlexSeason) {
+        // If we have a matched Plex season, get its children metadata so we can check details
+        const episodes = await this.plexClient.getChildrenMetadata(
+          matchedPlexSeason.ratingKey
+        );
+        // Total episodes that are in standard definition (not 4k)
+        const totalStandard = episodes.filter((episode) =>
+          !this.enable4kShow
+            ? true
+            : episode.Media.some((media) => media.videoResolution !== '4k')
+        ).length;
+
+        // Total episodes that are in 4k
+        const total4k = this.enable4kShow
+          ? episodes.filter((episode) =>
+              episode.Media.some((media) => media.videoResolution === '4k')
+            ).length
+          : 0;
+
+        processableSeasons.push({
+          seasonNumber: season.season_number,
+          episodes: totalStandard,
+          episodes4k: total4k,
+          totalEpisodes: season.episode_count,
+        });
+      } else {
+        processableSeasons.push({
+          seasonNumber: season.season_number,
+          episodes: 0,
+          episodes4k: 0,
+          totalEpisodes: season.episode_count,
+        });
+      }
+    }
+
+    if (mediaIds.tvdbId) {
+      await this.processShow(
+        mediaIds.tmdbId,
+        mediaIds.tvdbId ?? tvShow.external_ids.tvdb_id,
+        processableSeasons,
+        {
+          mediaAddedAt: new Date(metadata.addedAt * 1000),
+          ratingKey: ratingKey,
+          title: metadata.title,
+        }
+      );
+    }
+  }
+
+  private async getMediaIds(plexitem: PlexLibraryItem): Promise<MediaIds> {
+    const mediaIds: Partial<MediaIds> = {};
+    // Check if item is using new plex movie/tv agent
+    if (plexitem.guid.match(plexRegex)) {
+      const metadata = await this.plexClient.getMetadata(plexitem.ratingKey);
+
+      // If there is no Guid field at all, then we bail
+      if (!metadata.Guid) {
+        throw new Error(
+          'No Guid metadata for this title. Skipping. (Try refreshing the metadata in Plex for this media!)'
+        );
+      }
+
+      // Map all IDs to MediaId object
+      metadata.Guid.forEach((ref) => {
+        if (ref.id.match(imdbRegex)) {
+          mediaIds.imdbId = ref.id.match(imdbRegex)?.[1] ?? undefined;
+        } else if (ref.id.match(tmdbRegex)) {
+          const tmdbMatch = ref.id.match(tmdbRegex)?.[1];
+          mediaIds.tmdbId = Number(tmdbMatch);
+        } else if (ref.id.match(tvdbRegex)) {
+          const tvdbMatch = ref.id.match(tvdbRegex)?.[1];
+          mediaIds.tvdbId = Number(tvdbMatch);
+        }
+      });
+
+      // If we got an IMDb ID, but no TMDb ID, lookup the TMDb ID with the IMDb ID
+      if (mediaIds.imdbId && !mediaIds.tmdbId) {
+        const tmdbMovie = await this.tmdb.getMovieByImdbId({
+          imdbId: mediaIds.imdbId,
+        });
+        mediaIds.tmdbId = tmdbMovie.id;
+      }
+      // Check if the agent is IMDb
+    } else if (plexitem.guid.match(imdbRegex)) {
+      const imdbMatch = plexitem.guid.match(imdbRegex);
+      if (imdbMatch) {
+        mediaIds.imdbId = imdbMatch[1];
+        const tmdbMovie = await this.tmdb.getMovieByImdbId({
+          imdbId: mediaIds.imdbId,
+        });
+        mediaIds.tmdbId = tmdbMovie.id;
+      }
+      // Check if the agent is TMDb
+    } else if (plexitem.guid.match(tmdbRegex)) {
+      const tmdbMatch = plexitem.guid.match(tmdbRegex);
+      if (tmdbMatch) {
+        mediaIds.tmdbId = Number(tmdbMatch[1]);
+      }
+      // Check if the agent is TVDb
+    } else if (plexitem.guid.match(tvdbRegex)) {
+      const matchedtvdb = plexitem.guid.match(tvdbRegex);
+
+      // If we can find a tvdb Id, use it to get the full tmdb show details
+      if (matchedtvdb) {
+        const show = await this.tmdb.getShowByTvdbId({
+          tvdbId: Number(matchedtvdb[1]),
+        });
+
+        mediaIds.tvdbId = Number(matchedtvdb[1]);
+        mediaIds.tmdbId = show.id;
+      }
+      // Check if the agent (for shows) is TMDb
+    } else if (plexitem.guid.match(tmdbShowRegex)) {
+      const matchedtmdb = plexitem.guid.match(tmdbShowRegex);
+      if (matchedtmdb) {
+        mediaIds.tmdbId = Number(matchedtmdb[1]);
+      }
+      // Check for HAMA (with TVDb guid)
+    } else if (plexitem.guid.match(hamaTvdbRegex)) {
+      const matchedtvdb = plexitem.guid.match(hamaTvdbRegex);
+
+      if (matchedtvdb) {
+        const show = await this.tmdb.getShowByTvdbId({
+          tvdbId: Number(matchedtvdb[1]),
+        });
+
+        mediaIds.tvdbId = Number(matchedtvdb[1]);
+        mediaIds.tmdbId = show.id;
+        // Set isHama to true, so we can know to add special processing to this item
+        mediaIds.isHama = true;
+      }
+      // Check for HAMA (with anidb guid)
+    } else if (plexitem.guid.match(hamaAnidbRegex)) {
+      const matchedhama = plexitem.guid.match(hamaAnidbRegex);
+
+      if (!animeList.isLoaded()) {
+        this.log(
+          `Hama ID ${plexitem.guid} detected, but library agent is not set to Hama`,
+          'warn',
+          { title: plexitem.title }
+        );
+      } else if (matchedhama) {
+        const anidbId = Number(matchedhama[1]);
+        const result = animeList.getFromAnidbId(anidbId);
+        let tvShow: TmdbTvDetails | null = null;
+
+        // Set isHama to true, so we can know to add special processing to this item
+        mediaIds.isHama = true;
+
+        // First try to lookup the show by TVDb ID
+        if (result?.tvdbId) {
+          const extResponse = await this.tmdb.getByExternalId({
+            externalId: result.tvdbId,
+            type: 'tvdb',
+          });
+          if (extResponse.tv_results[0]) {
+            tvShow = await this.tmdb.getTvShow({
+              tvId: extResponse.tv_results[0].id,
+            });
+            mediaIds.tvdbId = result.tvdbId;
+            mediaIds.tmdbId = tvShow.id;
+          } else {
+            this.log(
+              `Missing TVDB ${result.tvdbId} entry in TMDB for AniDB ${anidbId}`
+            );
+          }
+        }
+
+        if (!tvShow) {
+          // if lookup of tvshow above failed, then try movie with tmdbid/imdbid
+          // note - some tv shows have imdbid set too, that's why this need to go second
+          if (result?.tmdbId) {
+            mediaIds.tmdbId = result.tmdbId;
+            mediaIds.imdbId = result?.imdbId;
+          } else if (result?.imdbId) {
+            const tmdbMovie = await this.tmdb.getMovieByImdbId({
+              imdbId: result.imdbId,
+            });
+            mediaIds.tmdbId = tmdbMovie.id;
+            mediaIds.imdbId = result.imdbId;
+          }
+        }
+      }
+    }
+
+    if (!mediaIds.tmdbId) {
+      throw new Error('Unable to find TMDb ID');
+    }
+
+    // We check above if we have the TMDb ID, so we can safely assert the type below
+    return mediaIds as MediaIds;
+  }
+
+  // movies with hama agent actually are tv shows with at least one episode in it
+  // try to get first episode of any season - cannot hardcode season or episode number
+  // because sometimes user can have it in other season/ep than s01e01
+  private async processHamaMovie(metadata: PlexMetadata, tmdbId: number) {
+    const season = metadata.Children?.Metadata[0];
+    if (season) {
+      const episodes = await this.plexClient.getChildrenMetadata(
+        season.ratingKey
+      );
+      if (episodes) {
+        await this.processPlexMovieByTmdbId(episodes[0], tmdbId);
+      }
+    }
+  }
+
+  // this adds all movie episodes from specials season for Hama agent
+  private async processHamaSpecials(metadata: PlexMetadata, tvdbId: number) {
+    const specials = metadata.Children?.Metadata.find(
+      (md) => Number(md.index) === 0
+    );
+    if (specials) {
+      const episodes = await this.plexClient.getChildrenMetadata(
+        specials.ratingKey
+      );
+      if (episodes) {
+        for (const episode of episodes) {
+          const special = animeList.getSpecialEpisode(tvdbId, episode.index);
+          if (special) {
+            if (special.tmdbId) {
+              await this.processPlexMovieByTmdbId(episode, special.tmdbId);
+            } else if (special.imdbId) {
+              const tmdbMovie = await this.tmdb.getMovieByImdbId({
+                imdbId: special.imdbId,
+              });
+              await this.processPlexMovieByTmdbId(episode, tmdbMovie.id);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // checks if any of this.libraries has Hama agent set in Plex
+  private async hasHamaAgent() {
+    const plexLibraries = await this.plexClient.getLibraries();
+    return this.libraries.some((library) =>
+      plexLibraries.some(
+        (plexLibrary) =>
+          plexLibrary.agent === HAMA_AGENT && library.id === plexLibrary.key
+      )
+    );
+  }
+}
+
+export const plexFullScanner = new PlexScanner();
+export const plexRecentScanner = new PlexScanner(true);

server/lib/scanners/radarr/index.ts

@@ -0,0 +1,94 @@
+import { uniqWith } from 'lodash';
+import RadarrAPI, { RadarrMovie } from '../../../api/radarr';
+import { getSettings, RadarrSettings } from '../../settings';
+import BaseScanner, { RunnableScanner, StatusBase } from '../baseScanner';
+
+type SyncStatus = StatusBase & {
+  currentServer: RadarrSettings;
+  servers: RadarrSettings[];
+};
+
+class RadarrScanner
+  extends BaseScanner<RadarrMovie>
+  implements RunnableScanner<SyncStatus> {
+  private servers: RadarrSettings[];
+  private currentServer: RadarrSettings;
+  private radarrApi: RadarrAPI;
+
+  constructor() {
+    super('Radarr Scan', { bundleSize: 50 });
+  }
+
+  public status(): SyncStatus {
+    return {
+      running: this.running,
+      progress: this.progress,
+      total: this.items.length,
+      currentServer: this.currentServer,
+      servers: this.servers,
+    };
+  }
+
+  public async run(): Promise<void> {
+    const settings = getSettings();
+    const sessionId = this.startRun();
+
+    try {
+      this.servers = uniqWith(settings.radarr, (radarrA, radarrB) => {
+        return (
+          radarrA.hostname === radarrB.hostname &&
+          radarrA.port === radarrB.port &&
+          radarrA.baseUrl === radarrB.baseUrl
+        );
+      });
+
+      for (const server of this.servers) {
+        this.currentServer = server;
+        if (server.syncEnabled) {
+          this.log(
+            `Beginning to process Radarr server: ${server.name}`,
+            'info'
+          );
+
+          this.radarrApi = new RadarrAPI({
+            apiKey: server.apiKey,
+            url: RadarrAPI.buildRadarrUrl(server, '/api/v3'),
+          });
+
+          this.items = await this.radarrApi.getMovies();
+
+          await this.loop(this.processRadarrMovie.bind(this), { sessionId });
+        } else {
+          this.log(`Sync not enabled. Skipping Radarr server: ${server.name}`);
+        }
+      }
+
+      this.log('Radarr scan complete', 'info');
+    } catch (e) {
+      this.log('Scan interrupted', 'error', { errorMessage: e.message });
+    } finally {
+      this.endRun(sessionId);
+    }
+  }
+
+  private async processRadarrMovie(radarrMovie: RadarrMovie): Promise<void> {
+    try {
+      const server4k = this.enable4kMovie && this.currentServer.is4k;
+      await this.processMovie(radarrMovie.tmdbId, {
+        is4k: server4k,
+        serviceId: this.currentServer.id,
+        externalServiceId: radarrMovie.id,
+        externalServiceSlug: radarrMovie.titleSlug,
+        title: radarrMovie.title,
+        processing: !radarrMovie.downloaded,
+      });
+    } catch (e) {
+      this.log('Failed to process Radarr media', 'error', {
+        errorMessage: e.message,
+        title: radarrMovie.title,
+      });
+    }
+  }
+}
+
+export const radarrScanner = new RadarrScanner();

server/lib/scanners/sonarr/index.ts

@@ -0,0 +1,134 @@
+import { uniqWith } from 'lodash';
+import { getRepository } from 'typeorm';
+import SonarrAPI, { SonarrSeries } from '../../../api/sonarr';
+import Media from '../../../entity/Media';
+import { getSettings, SonarrSettings } from '../../settings';
+import BaseScanner, {
+  ProcessableSeason,
+  RunnableScanner,
+  StatusBase,
+} from '../baseScanner';
+
+type SyncStatus = StatusBase & {
+  currentServer: SonarrSettings;
+  servers: SonarrSettings[];
+};
+
+class SonarrScanner
+  extends BaseScanner<SonarrSeries>
+  implements RunnableScanner<SyncStatus> {
+  private servers: SonarrSettings[];
+  private currentServer: SonarrSettings;
+  private sonarrApi: SonarrAPI;
+
+  constructor() {
+    super('Sonarr Scan', { bundleSize: 50 });
+  }
+
+  public status(): SyncStatus {
+    return {
+      running: this.running,
+      progress: this.progress,
+      total: this.items.length,
+      currentServer: this.currentServer,
+      servers: this.servers,
+    };
+  }
+
+  public async run(): Promise<void> {
+    const settings = getSettings();
+    const sessionId = this.startRun();
+
+    try {
+      this.servers = uniqWith(settings.sonarr, (sonarrA, sonarrB) => {
+        return (
+          sonarrA.hostname === sonarrB.hostname &&
+          sonarrA.port === sonarrB.port &&
+          sonarrA.baseUrl === sonarrB.baseUrl
+        );
+      });
+
+      for (const server of this.servers) {
+        this.currentServer = server;
+        if (server.syncEnabled) {
+          this.log(
+            `Beginning to process Sonarr server: ${server.name}`,
+            'info'
+          );
+
+          this.sonarrApi = new SonarrAPI({
+            apiKey: server.apiKey,
+            url: SonarrAPI.buildSonarrUrl(server, '/api/v3'),
+          });
+
+          this.items = await this.sonarrApi.getSeries();
+
+          await this.loop(this.processSonarrSeries.bind(this), { sessionId });
+        } else {
+          this.log(`Sync not enabled. Skipping Sonarr server: ${server.name}`);
+        }
+      }
+
+      this.log('Sonarr scan complete', 'info');
+    } catch (e) {
+      this.log('Scan interrupted', 'error', { errorMessage: e.message });
+    } finally {
+      this.endRun(sessionId);
+    }
+  }
+
+  private async processSonarrSeries(sonarrSeries: SonarrSeries) {
+    try {
+      const mediaRepository = getRepository(Media);
+      const server4k = this.enable4kShow && this.currentServer.is4k;
+      const processableSeasons: ProcessableSeason[] = [];
+      let tmdbId: number;
+
+      const media = await mediaRepository.findOne({
+        where: { tvdbId: sonarrSeries.tvdbId },
+      });
+
+      if (!media || !media.tmdbId) {
+        const tvShow = await this.tmdb.getShowByTvdbId({
+          tvdbId: sonarrSeries.tvdbId,
+        });
+
+        tmdbId = tvShow.id;
+      } else {
+        tmdbId = media.tmdbId;
+      }
+
+      const filteredSeasons = sonarrSeries.seasons.filter(
+        (sn) => sn.seasonNumber !== 0
+      );
+
+      for (const season of filteredSeasons) {
+        const totalAvailableEpisodes = season.statistics?.episodeFileCount ?? 0;
+
+        processableSeasons.push({
+          seasonNumber: season.seasonNumber,
+          episodes: !server4k ? totalAvailableEpisodes : 0,
+          episodes4k: server4k ? totalAvailableEpisodes : 0,
+          totalEpisodes: season.statistics?.totalEpisodeCount ?? 0,
+          processing: season.monitored && totalAvailableEpisodes === 0,
+          is4kOverride: server4k,
+        });
+      }
+
+      await this.processShow(tmdbId, sonarrSeries.tvdbId, processableSeasons, {
+        serviceId: this.currentServer.id,
+        externalServiceId: sonarrSeries.id,
+        externalServiceSlug: sonarrSeries.titleSlug,
+        title: sonarrSeries.title,
+        is4k: server4k,
+      });
+    } catch (e) {
+      this.log('Failed to process Sonarr media', 'error', {
+        errorMessage: e.message,
+        title: sonarrSeries.title,
+      });
+    }
+  }
+}
+
+export const sonarrScanner = new SonarrScanner();

server/lib/settings.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
-import path from 'path';
 import { merge } from 'lodash';
+import path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 import { Permission } from './permissions';
 
@@ -61,17 +61,28 @@ export interface SonarrSettings extends DVRSettings {
   enableSeasonFolders: boolean;
 }
 
+interface Quota {
+  quotaLimit?: number;
+  quotaDays?: number;
+}
+
 export interface MainSettings {
   apiKey: string;
   applicationTitle: string;
   applicationUrl: string;
   csrfProtection: boolean;
+  cacheImages: boolean;
   defaultPermissions: number;
+  defaultQuotas: {
+    movie: Quota;
+    tv: Quota;
+  };
   hideAvailable: boolean;
   localLogin: boolean;
   region: string;
   originalLanguage: string;
   trustProxy: boolean;
+  partialRequestsEnabled: boolean;
 }
 
 interface PublicSettings {
@@ -86,6 +97,8 @@ interface FullPublicSettings extends PublicSettings {
   series4kEnabled: boolean;
   region: string;
   originalLanguage: string;
+  partialRequestsEnabled: boolean;
+  cacheImages: boolean;
 }
 
 export interface NotificationAgentConfig {
@@ -95,6 +108,8 @@ export interface NotificationAgentConfig {
 }
 export interface NotificationAgentDiscord extends NotificationAgentConfig {
   options: {
+    botUsername?: string;
+    botAvatarUrl?: string;
     webhookUrl: string;
   };
 }
@@ -115,11 +130,14 @@ export interface NotificationAgentEmail extends NotificationAgentConfig {
     authPass?: string;
     allowSelfSigned: boolean;
     senderName: string;
+    pgpPrivateKey?: string;
+    pgpPassword?: string;
   };
 }
 
 export interface NotificationAgentTelegram extends NotificationAgentConfig {
   options: {
+    botUsername?: string;
     botAPI: string;
     chatId: string;
     sendSilently: boolean;
@@ -160,7 +178,6 @@ interface NotificationAgents {
 
 interface NotificationSettings {
   enabled: boolean;
-  autoapprovalEnabled: boolean;
   agents: NotificationAgents;
 }
 
@@ -189,12 +206,18 @@ class Settings {
         applicationTitle: 'Overseerr',
         applicationUrl: '',
         csrfProtection: false,
+        cacheImages: false,
         defaultPermissions: Permission.REQUEST,
+        defaultQuotas: {
+          movie: {},
+          tv: {},
+        },
         hideAvailable: false,
         localLogin: true,
         region: '',
         originalLanguage: '',
         trustProxy: false,
+        partialRequestsEnabled: true,
       },
       plex: {
         name: '',
@@ -210,7 +233,6 @@ class Settings {
       },
       notifications: {
         enabled: true,
-        autoapprovalEnabled: false,
         agents: {
           email: {
             enabled: false,
@@ -228,6 +250,8 @@ class Settings {
             enabled: false,
             types: 0,
             options: {
+              botUsername: '',
+              botAvatarUrl: '',
               webhookUrl: '',
             },
           },
@@ -242,6 +266,7 @@ class Settings {
             enabled: false,
             types: 0,
             options: {
+              botUsername: '',
               botAPI: '',
               chatId: '',
               sendSilently: false,
@@ -339,6 +364,8 @@ class Settings {
       ),
       region: this.data.main.region,
       originalLanguage: this.data.main.originalLanguage,
+      partialRequestsEnabled: this.data.main.partialRequestsEnabled,
+      cacheImages: this.data.main.cacheImages,
     };
   }
 

server/migration/1614334195680-AddTelegramSettingsToUserSettings.ts

@@ -0,0 +1,32 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddTelegramSettingsToUserSettings1614334195680
+  implements MigrationInterface {
+  name = 'AddTelegramSettingsToUserSettings1614334195680';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "enableNotifications" boolean NOT NULL DEFAULT (1), "discordId" varchar, "userId" integer, "region" varchar, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user_settings"("id", "enableNotifications", "discordId", "userId", "region", "originalLanguage") SELECT "id", "enableNotifications", "discordId", "userId", "region", "originalLanguage" FROM "user_settings"`
+    );
+    await queryRunner.query(`DROP TABLE "user_settings"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_user_settings" RENAME TO "user_settings"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" RENAME TO "temporary_user_settings"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "enableNotifications" boolean NOT NULL DEFAULT (1), "discordId" varchar, "userId" integer, "region" varchar, "originalLanguage" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user_settings"("id", "enableNotifications", "discordId", "userId", "region", "originalLanguage") SELECT "id", "enableNotifications", "discordId", "userId", "region", "originalLanguage" FROM "temporary_user_settings"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user_settings"`);
+  }
+}

server/migration/1615333940450-AddPGPToUserSettings.ts

@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddPGPToUserSettings1615333940450 implements MigrationInterface {
+  name = 'AddPGPToUserSettings1615333940450';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "enableNotifications" boolean NOT NULL DEFAULT (1), "discordId" varchar, "userId" integer, "region" varchar, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user_settings"("id", "enableNotifications", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently") SELECT "id", "enableNotifications", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently" FROM "user_settings"`
+    );
+    await queryRunner.query(`DROP TABLE "user_settings"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_user_settings" RENAME TO "user_settings"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" RENAME TO "temporary_user_settings"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "enableNotifications" boolean NOT NULL DEFAULT (1), "discordId" varchar, "userId" integer, "region" varchar, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user_settings"("id", "enableNotifications", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently") SELECT "id", "enableNotifications", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently" FROM "temporary_user_settings"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user_settings"`);
+  }
+}

server/migration/1616576677254-AddUserQuotaFields.ts

@@ -0,0 +1,27 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddUserQuotaFields1616576677254 implements MigrationInterface {
+  name = 'AddUserQuotaFields1616576677254';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), "plexUsername" varchar, "resetPasswordGuid" varchar, "recoveryLinkExpirationDate" date, "movieQuotaLimit" integer, "movieQuotaDays" integer, "tvQuotaLimit" integer, "tvQuotaDays" integer, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate" FROM "user"`
+    );
+    await queryRunner.query(`DROP TABLE "user"`);
+    await queryRunner.query(`ALTER TABLE "temporary_user" RENAME TO "user"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "user" RENAME TO "temporary_user"`);
+    await queryRunner.query(
+      `CREATE TABLE "user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), "plexUsername" varchar, "resetPasswordGuid" varchar, "recoveryLinkExpirationDate" date, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate" FROM "temporary_user"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user"`);
+  }
+}

server/models/Movie.ts

@@ -1,6 +1,7 @@
 import type {
   TmdbMovieDetails,
   TmdbMovieReleaseResult,
+  TmdbProductionCompany,
 } from '../api/themoviedb/interfaces';
 import {
   ProductionCompany,
@@ -79,6 +80,18 @@ export interface MovieDetails {
   plexUrl?: string;
 }
 
+export const mapProductionCompany = (
+  company: TmdbProductionCompany
+): ProductionCompany => ({
+  id: company.id,
+  name: company.name,
+  originCountry: company.origin_country,
+  description: company.description,
+  headquarters: company.headquarters,
+  homepage: company.homepage,
+  logoPath: company.logo_path,
+});
+
 export const mapMovieDetails = (
   movie: TmdbMovieDetails,
   media?: Media
@@ -91,12 +104,7 @@ export const mapMovieDetails = (
   originalLanguage: movie.original_language,
   originalTitle: movie.original_title,
   popularity: movie.popularity,
-  productionCompanies: movie.production_companies.map((company) => ({
-    id: company.id,
-    logoPath: company.logo_path,
-    originCountry: company.origin_country,
-    name: company.name,
-  })),
+  productionCompanies: movie.production_companies.map(mapProductionCompany),
   productionCountries: movie.production_countries,
   releaseDate: movie.release_date,
   releases: movie.release_dates,

server/models/Person.ts

@@ -8,6 +8,7 @@ import Media from '../entity/Media';
 export interface PersonDetail {
   id: number;
   name: string;
+  birthday: string;
   deathday: string;
   knownForDepartment: string;
   alsoKnownAs?: string[];
@@ -64,6 +65,7 @@ export interface CombinedCredit {
 export const mapPersonDetails = (person: TmdbPersonDetail): PersonDetail => ({
   id: person.id,
   name: person.name,
+  birthday: person.birthday,
   deathday: person.deathday,
   knownForDepartment: person.known_for_department,
   alsoKnownAs: person.also_known_as,

server/models/Tv.ts

@@ -9,6 +9,7 @@ import {
   mapExternalIds,
   Keyword,
   mapVideos,
+  TvNetwork,
 } from './common';
 import type {
   TmdbTvEpisodeResult,
@@ -16,6 +17,7 @@ import type {
   TmdbTvDetails,
   TmdbSeasonWithEpisodes,
   TmdbTvRatingResult,
+  TmdbNetwork,
 } from '../api/themoviedb/interfaces';
 import type Media from '../entity/Media';
 import { Video } from './Movie';
@@ -77,7 +79,7 @@ export interface TvDetails {
   lastEpisodeToAir?: Episode;
   name: string;
   nextEpisodeToAir?: Episode;
-  networks: ProductionCompany[];
+  networks: TvNetwork[];
   numberOfEpisodes: number;
   numberOfSeasons: number;
   originCountry: string[];
@@ -89,6 +91,7 @@ export interface TvDetails {
   spokenLanguages: SpokenLanguage[];
   seasons: Season[];
   status: string;
+  tagline?: string;
   type: string;
   voteAverage: number;
   voteCount: number;
@@ -139,6 +142,15 @@ export const mapSeasonWithEpisodes = (
   posterPath: season.poster_path,
 });
 
+export const mapNetwork = (network: TmdbNetwork): TvNetwork => ({
+  id: network.id,
+  name: network.name,
+  originCountry: network.origin_country,
+  headquarters: network.headquarters,
+  homepage: network.homepage,
+  logoPath: network.logo_path,
+});
+
 export const mapTvDetails = (
   show: TmdbTvDetails,
   media?: Media
@@ -157,17 +169,13 @@ export const mapTvDetails = (
   languages: show.languages,
   lastAirDate: show.last_air_date,
   name: show.name,
-  networks: show.networks.map((network) => ({
-    id: network.id,
-    name: network.name,
-    originCountry: network.origin_country,
-    logoPath: network.logo_path,
-  })),
+  networks: show.networks.map(mapNetwork),
   numberOfEpisodes: show.number_of_episodes,
   numberOfSeasons: show.number_of_seasons,
   originCountry: show.origin_country,
   originalLanguage: show.original_language,
   originalName: show.original_name,
+  tagline: show.tagline,
   overview: show.overview,
   popularity: show.popularity,
   productionCompanies: show.production_companies.map((company) => ({

server/models/common.ts

@@ -14,6 +14,18 @@ export interface ProductionCompany {
   logoPath?: string;
   originCountry: string;
   name: string;
+  description?: string;
+  headquarters?: string;
+  homepage?: string;
+}
+
+export interface TvNetwork {
+  id: number;
+  logoPath?: string;
+  originCountry?: string;
+  name: string;
+  headquarters?: string;
+  homepage?: string;
 }
 
 export interface Keyword {

server/routes/discover.ts

@@ -6,6 +6,11 @@ import { isMovie, isPerson } from '../utils/typeHelpers';
 import { MediaType } from '../constants/media';
 import { getSettings } from '../lib/settings';
 import { User } from '../entity/User';
+import { mapProductionCompany } from '../models/Movie';
+import { mapNetwork } from '../models/Tv';
+import logger from '../logger';
+import { sortBy } from 'lodash';
+import { GenreSliderItem } from '../interfaces/api/discoverInterfaces';
 
 const createTmdbWithRegionLanaguage = (user?: User): TheMovieDb => {
   const settings = getSettings();
@@ -38,6 +43,8 @@ discoverRoutes.get('/movies', async (req, res) => {
   const data = await tmdb.getDiscoverMovies({
     page: Number(req.query.page),
     language: req.query.language as string,
+    genre: req.query.genre ? Number(req.query.genre) : undefined,
+    studio: req.query.studio ? Number(req.query.studio) : undefined,
   });
 
   const media = await Media.getRelatedMedia(
@@ -59,6 +66,133 @@ discoverRoutes.get('/movies', async (req, res) => {
   });
 });
 
+discoverRoutes.get<{ language: string }>(
+  '/movies/language/:language',
+  async (req, res, next) => {
+    const tmdb = createTmdbWithRegionLanaguage(req.user);
+
+    const languages = await tmdb.getLanguages();
+
+    const language = languages.find(
+      (lang) => lang.iso_639_1 === req.params.language
+    );
+
+    if (!language) {
+      return next({ status: 404, message: 'Unable to retrieve language' });
+    }
+
+    const data = await tmdb.getDiscoverMovies({
+      page: Number(req.query.page),
+      language: req.query.language as string,
+      originalLanguage: req.params.language,
+    });
+
+    const media = await Media.getRelatedMedia(
+      data.results.map((result) => result.id)
+    );
+
+    return res.status(200).json({
+      page: data.page,
+      totalPages: data.total_pages,
+      totalResults: data.total_results,
+      language,
+      results: data.results.map((result) =>
+        mapMovieResult(
+          result,
+          media.find(
+            (req) =>
+              req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+          )
+        )
+      ),
+    });
+  }
+);
+
+discoverRoutes.get<{ genreId: string }>(
+  '/movies/genre/:genreId',
+  async (req, res, next) => {
+    const tmdb = createTmdbWithRegionLanaguage(req.user);
+
+    const genres = await tmdb.getMovieGenres({
+      language: req.query.language as string,
+    });
+
+    const genre = genres.find(
+      (genre) => genre.id === Number(req.params.genreId)
+    );
+
+    if (!genre) {
+      return next({ status: 404, message: 'Unable to retrieve genre' });
+    }
+
+    const data = await tmdb.getDiscoverMovies({
+      page: Number(req.query.page),
+      language: req.query.language as string,
+      genre: Number(req.params.genreId),
+    });
+
+    const media = await Media.getRelatedMedia(
+      data.results.map((result) => result.id)
+    );
+
+    return res.status(200).json({
+      page: data.page,
+      totalPages: data.total_pages,
+      totalResults: data.total_results,
+      genre,
+      results: data.results.map((result) =>
+        mapMovieResult(
+          result,
+          media.find(
+            (req) =>
+              req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+          )
+        )
+      ),
+    });
+  }
+);
+
+discoverRoutes.get<{ studioId: string }>(
+  '/movies/studio/:studioId',
+  async (req, res, next) => {
+    const tmdb = new TheMovieDb();
+
+    try {
+      const studio = await tmdb.getStudio(Number(req.params.studioId));
+
+      const data = await tmdb.getDiscoverMovies({
+        page: Number(req.query.page),
+        language: req.query.language as string,
+        studio: Number(req.params.studioId),
+      });
+
+      const media = await Media.getRelatedMedia(
+        data.results.map((result) => result.id)
+      );
+
+      return res.status(200).json({
+        page: data.page,
+        totalPages: data.total_pages,
+        totalResults: data.total_results,
+        studio: mapProductionCompany(studio),
+        results: data.results.map((result) =>
+          mapMovieResult(
+            result,
+            media.find(
+              (med) =>
+                med.tmdbId === result.id && med.mediaType === MediaType.MOVIE
+            )
+          )
+        ),
+      });
+    } catch (e) {
+      return next({ status: 404, message: 'Unable to retrieve studio' });
+    }
+  }
+);
+
 discoverRoutes.get('/movies/upcoming', async (req, res) => {
   const tmdb = createTmdbWithRegionLanaguage(req.user);
 
@@ -99,6 +233,8 @@ discoverRoutes.get('/tv', async (req, res) => {
   const data = await tmdb.getDiscoverTv({
     page: Number(req.query.page),
     language: req.query.language as string,
+    genre: req.query.genre ? Number(req.query.genre) : undefined,
+    network: req.query.network ? Number(req.query.network) : undefined,
   });
 
   const media = await Media.getRelatedMedia(
@@ -120,6 +256,131 @@ discoverRoutes.get('/tv', async (req, res) => {
   });
 });
 
+discoverRoutes.get<{ language: string }>(
+  '/tv/language/:language',
+  async (req, res, next) => {
+    const tmdb = createTmdbWithRegionLanaguage(req.user);
+
+    const languages = await tmdb.getLanguages();
+
+    const language = languages.find(
+      (lang) => lang.iso_639_1 === req.params.language
+    );
+
+    if (!language) {
+      return next({ status: 404, message: 'Unable to retrieve language' });
+    }
+
+    const data = await tmdb.getDiscoverTv({
+      page: Number(req.query.page),
+      language: req.query.language as string,
+      originalLanguage: req.params.language,
+    });
+
+    const media = await Media.getRelatedMedia(
+      data.results.map((result) => result.id)
+    );
+
+    return res.status(200).json({
+      page: data.page,
+      totalPages: data.total_pages,
+      totalResults: data.total_results,
+      language,
+      results: data.results.map((result) =>
+        mapTvResult(
+          result,
+          media.find(
+            (med) => med.tmdbId === result.id && med.mediaType === MediaType.TV
+          )
+        )
+      ),
+    });
+  }
+);
+
+discoverRoutes.get<{ genreId: string }>(
+  '/tv/genre/:genreId',
+  async (req, res, next) => {
+    const tmdb = createTmdbWithRegionLanaguage(req.user);
+
+    const genres = await tmdb.getTvGenres({
+      language: req.query.language as string,
+    });
+
+    const genre = genres.find(
+      (genre) => genre.id === Number(req.params.genreId)
+    );
+
+    if (!genre) {
+      return next({ status: 404, message: 'Unable to retrieve genre' });
+    }
+
+    const data = await tmdb.getDiscoverTv({
+      page: Number(req.query.page),
+      language: req.query.language as string,
+      genre: Number(req.params.genreId),
+    });
+
+    const media = await Media.getRelatedMedia(
+      data.results.map((result) => result.id)
+    );
+
+    return res.status(200).json({
+      page: data.page,
+      totalPages: data.total_pages,
+      totalResults: data.total_results,
+      genre,
+      results: data.results.map((result) =>
+        mapTvResult(
+          result,
+          media.find(
+            (med) => med.tmdbId === result.id && med.mediaType === MediaType.TV
+          )
+        )
+      ),
+    });
+  }
+);
+
+discoverRoutes.get<{ networkId: string }>(
+  '/tv/network/:networkId',
+  async (req, res, next) => {
+    const tmdb = new TheMovieDb();
+
+    try {
+      const network = await tmdb.getNetwork(Number(req.params.networkId));
+
+      const data = await tmdb.getDiscoverTv({
+        page: Number(req.query.page),
+        language: req.query.language as string,
+        network: Number(req.params.networkId),
+      });
+
+      const media = await Media.getRelatedMedia(
+        data.results.map((result) => result.id)
+      );
+
+      return res.status(200).json({
+        page: data.page,
+        totalPages: data.total_pages,
+        totalResults: data.total_results,
+        network: mapNetwork(network),
+        results: data.results.map((result) =>
+          mapTvResult(
+            result,
+            media.find(
+              (med) =>
+                med.tmdbId === result.id && med.mediaType === MediaType.TV
+            )
+          )
+        ),
+      });
+    } catch (e) {
+      return next({ status: 404, message: 'Unable to retrieve network' });
+    }
+  }
+);
+
 discoverRoutes.get('/tv/upcoming', async (req, res) => {
   const tmdb = createTmdbWithRegionLanaguage(req.user);
 
@@ -175,15 +436,18 @@ discoverRoutes.get('/trending', async (req, res) => {
         ? mapMovieResult(
             result,
             media.find(
-              (req) =>
-                req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+              (med) =>
+                med.tmdbId === result.id && med.mediaType === MediaType.MOVIE
             )
           )
         : isPerson(result)
         ? mapPersonResult(result)
         : mapTvResult(
             result,
-            media.find((req) => req.tmdbId === result.id && MediaType.TV)
+            media.find(
+              (med) =>
+                med.tmdbId === result.id && med.mediaType === MediaType.TV
+            )
           )
     ),
   });
@@ -212,8 +476,8 @@ discoverRoutes.get<{ keywordId: string }>(
         mapMovieResult(
           result,
           media.find(
-            (req) =>
-              req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+            (med) =>
+              med.tmdbId === result.id && med.mediaType === MediaType.MOVIE
           )
         )
       ),
@@ -221,4 +485,86 @@ discoverRoutes.get<{ keywordId: string }>(
   }
 );
 
+discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
+  '/genreslider/movie',
+  async (req, res, next) => {
+    const tmdb = new TheMovieDb();
+
+    try {
+      const mappedGenres: GenreSliderItem[] = [];
+
+      const genres = await tmdb.getMovieGenres({
+        language: req.query.language as string,
+      });
+
+      await Promise.all(
+        genres.map(async (genre) => {
+          const genreData = await tmdb.getDiscoverMovies({ genre: genre.id });
+
+          mappedGenres.push({
+            id: genre.id,
+            name: genre.name,
+            backdrops: genreData.results
+              .filter((title) => !!title.backdrop_path)
+              .map((title) => title.backdrop_path) as string[],
+          });
+        })
+      );
+
+      const sortedData = sortBy(mappedGenres, 'name');
+
+      return res.status(200).json(sortedData);
+    } catch (e) {
+      logger.error('Something went wrong retrieving the movie genre slider', {
+        errorMessage: e.message,
+      });
+      return next({
+        status: 500,
+        message: 'Unable to retrieve movie genre slider.',
+      });
+    }
+  }
+);
+
+discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
+  '/genreslider/tv',
+  async (req, res, next) => {
+    const tmdb = new TheMovieDb();
+
+    try {
+      const mappedGenres: GenreSliderItem[] = [];
+
+      const genres = await tmdb.getTvGenres({
+        language: req.query.language as string,
+      });
+
+      await Promise.all(
+        genres.map(async (genre) => {
+          const genreData = await tmdb.getDiscoverTv({ genre: genre.id });
+
+          mappedGenres.push({
+            id: genre.id,
+            name: genre.name,
+            backdrops: genreData.results
+              .filter((title) => !!title.backdrop_path)
+              .map((title) => title.backdrop_path) as string[],
+          });
+        })
+      );
+
+      const sortedData = sortBy(mappedGenres, 'name');
+
+      return res.status(200).json(sortedData);
+    } catch (e) {
+      logger.error('Something went wrong retrieving the tv genre slider', {
+        errorMessage: e.message,
+      });
+      return next({
+        status: 500,
+        message: 'Unable to retrieve tv genre slider.',
+      });
+    }
+  }
+);
+
 export default discoverRoutes;

server/routes/index.ts

@@ -17,6 +17,8 @@ import { getAppVersion, getCommitTag } from '../utils/appVersion';
 import serviceRoutes from './service';
 import { appDataStatus, appDataPath } from '../utils/appDataVolume';
 import TheMovieDb from '../api/themoviedb';
+import { mapProductionCompany } from '../models/Movie';
+import { mapNetwork } from '../models/Tv';
 
 const router = Router();
 
@@ -74,6 +76,42 @@ router.get('/languages', isAuthenticated(), async (req, res) => {
   return res.status(200).json(languages);
 });
 
+router.get<{ id: string }>('/studio/:id', async (req, res) => {
+  const tmdb = new TheMovieDb();
+
+  const studio = await tmdb.getStudio(Number(req.params.id));
+
+  return res.status(200).json(mapProductionCompany(studio));
+});
+
+router.get<{ id: string }>('/network/:id', async (req, res) => {
+  const tmdb = new TheMovieDb();
+
+  const network = await tmdb.getNetwork(Number(req.params.id));
+
+  return res.status(200).json(mapNetwork(network));
+});
+
+router.get('/genres/movie', isAuthenticated(), async (req, res) => {
+  const tmdb = new TheMovieDb();
+
+  const genres = await tmdb.getMovieGenres({
+    language: req.query.language as string,
+  });
+
+  return res.status(200).json(genres);
+});
+
+router.get('/genres/tv', isAuthenticated(), async (req, res) => {
+  const tmdb = new TheMovieDb();
+
+  const genres = await tmdb.getTvGenres({
+    language: req.query.language as string,
+  });
+
+  return res.status(200).json(genres);
+});
+
 router.get('/', (_req, res) => {
   return res.status(200).json({
     api: 'Overseerr API',

server/routes/request.ts

@@ -1,15 +1,15 @@
 import { Router } from 'express';
-import { isAuthenticated } from '../middleware/auth';
-import { Permission } from '../lib/permissions';
 import { getRepository } from 'typeorm';
-import { MediaRequest } from '../entity/MediaRequest';
 import TheMovieDb from '../api/themoviedb';
+import { MediaRequestStatus, MediaStatus, MediaType } from '../constants/media';
 import Media from '../entity/Media';
-import { MediaStatus, MediaRequestStatus, MediaType } from '../constants/media';
+import { MediaRequest } from '../entity/MediaRequest';
 import SeasonRequest from '../entity/SeasonRequest';
-import logger from '../logger';
-import { RequestResultsResponse } from '../interfaces/api/requestInterfaces';
 import { User } from '../entity/User';
+import { RequestResultsResponse } from '../interfaces/api/requestInterfaces';
+import { Permission } from '../lib/permissions';
+import logger from '../logger';
+import { isAuthenticated } from '../middleware/auth';
 
 const requestRoutes = Router();
 
@@ -17,6 +17,9 @@ requestRoutes.get('/', async (req, res, next) => {
   try {
     const pageSize = req.query.take ? Number(req.query.take) : 10;
     const skip = req.query.skip ? Number(req.query.skip) : 0;
+    const requestedBy = req.query.requestedBy
+      ? Number(req.query.requestedBy)
+      : null;
 
     let statusFilter: MediaRequestStatus[];
 
@@ -100,9 +103,20 @@ requestRoutes.get('/', async (req, res, next) => {
         { type: 'or' }
       )
     ) {
+      if (requestedBy && requestedBy !== req.user?.id) {
+        return next({
+          status: 403,
+          message: "You do not have permission to view this user's requests.",
+        });
+      }
+
       query = query.andWhere('requestedBy.id = :id', {
         id: req.user?.id,
       });
+    } else if (requestedBy) {
+      query = query.andWhere('requestedBy.id = :id', {
+        id: requestedBy,
+      });
     }
 
     const [requests, requestCount] = await query
@@ -154,8 +168,29 @@ requestRoutes.post(
         });
       }
 
+      if (!requestUser) {
+        return next({
+          status: 500,
+          message: 'User missing from request context.',
+        });
+      }
+
+      const quotas = await requestUser.getQuota();
+
+      if (req.body.mediaType === MediaType.MOVIE && quotas.movie.restricted) {
+        return next({
+          status: 403,
+          message: 'Movie Quota Exceeded',
+        });
+      } else if (req.body.mediaType === MediaType.TV && quotas.tv.restricted) {
+        return next({
+          status: 403,
+          message: 'Series Quota Exceeded',
+        });
+      }
+
       const tmdbMedia =
-        req.body.mediaType === 'movie'
+        req.body.mediaType === MediaType.MOVIE
           ? await tmdb.getMovie({ movieId: req.body.mediaId })
           : await tmdb.getTvShow({ tvId: req.body.mediaId });
 
@@ -182,7 +217,7 @@ requestRoutes.post(
         }
       }
 
-      if (req.body.mediaType === 'movie') {
+      if (req.body.mediaType === MediaType.MOVIE) {
         const existing = await requestRepository.findOne({
           where: {
             media: {
@@ -211,32 +246,34 @@ requestRoutes.post(
           media,
           requestedBy: requestUser,
           // If the user is an admin or has the "auto approve" permission, automatically approve the request
-          status:
-            req.user?.hasPermission(
+          status: req.user?.hasPermission(
+            [
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K
-                : Permission.AUTO_APPROVE
-            ) ||
-            req.user?.hasPermission(
+                : Permission.AUTO_APPROVE,
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K_MOVIE
-                : Permission.AUTO_APPROVE_MOVIE
-            )
-              ? MediaRequestStatus.APPROVED
-              : MediaRequestStatus.PENDING,
-          modifiedBy:
-            req.user?.hasPermission(
+                : Permission.AUTO_APPROVE_MOVIE,
+              Permission.MANAGE_REQUESTS,
+            ],
+            { type: 'or' }
+          )
+            ? MediaRequestStatus.APPROVED
+            : MediaRequestStatus.PENDING,
+          modifiedBy: req.user?.hasPermission(
+            [
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K
-                : Permission.AUTO_APPROVE
-            ) ||
-            req.user?.hasPermission(
+                : Permission.AUTO_APPROVE,
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K_MOVIE
-                : Permission.AUTO_APPROVE_MOVIE
-            )
-              ? req.user
-              : undefined,
+                : Permission.AUTO_APPROVE_MOVIE,
+              Permission.MANAGE_REQUESTS,
+            ],
+            { type: 'or' }
+          )
+            ? req.user
+            : undefined,
           is4k: req.body.is4k,
           serverId: req.body.serverId,
           profileId: req.body.profileId,
@@ -245,7 +282,7 @@ requestRoutes.post(
 
         await requestRepository.save(request);
         return res.status(201).json(request);
-      } else if (req.body.mediaType === 'tv') {
+      } else if (req.body.mediaType === MediaType.TV) {
         const requestedSeasons = req.body.seasons as number[];
         let existingSeasons: number[] = [];
 
@@ -286,32 +323,34 @@ requestRoutes.post(
           media,
           requestedBy: requestUser,
           // If the user is an admin or has the "auto approve" permission, automatically approve the request
-          status:
-            req.user?.hasPermission(
+          status: req.user?.hasPermission(
+            [
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K
-                : Permission.AUTO_APPROVE
-            ) ||
-            req.user?.hasPermission(
+                : Permission.AUTO_APPROVE,
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K_TV
-                : Permission.AUTO_APPROVE_TV
-            )
-              ? MediaRequestStatus.APPROVED
-              : MediaRequestStatus.PENDING,
-          modifiedBy:
-            req.user?.hasPermission(
+                : Permission.AUTO_APPROVE_TV,
+              Permission.MANAGE_REQUESTS,
+            ],
+            { type: 'or' }
+          )
+            ? MediaRequestStatus.APPROVED
+            : MediaRequestStatus.PENDING,
+          modifiedBy: req.user?.hasPermission(
+            [
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K
-                : Permission.AUTO_APPROVE
-            ) ||
-            req.user?.hasPermission(
+                : Permission.AUTO_APPROVE,
               req.body.is4k
                 ? Permission.AUTO_APPROVE_4K_TV
-                : Permission.AUTO_APPROVE_TV
-            )
-              ? req.user
-              : undefined,
+                : Permission.AUTO_APPROVE_TV,
+              Permission.MANAGE_REQUESTS,
+            ],
+            { type: 'or' }
+          )
+            ? req.user
+            : undefined,
           is4k: req.body.is4k,
           serverId: req.body.serverId,
           profileId: req.body.profileId,
@@ -321,19 +360,20 @@ requestRoutes.post(
             (sn) =>
               new SeasonRequest({
                 seasonNumber: sn,
-                status:
-                  req.user?.hasPermission(
+                status: req.user?.hasPermission(
+                  [
                     req.body.is4k
                       ? Permission.AUTO_APPROVE_4K
-                      : Permission.AUTO_APPROVE
-                  ) ||
-                  req.user?.hasPermission(
+                      : Permission.AUTO_APPROVE,
                     req.body.is4k
                       ? Permission.AUTO_APPROVE_4K_TV
-                      : Permission.AUTO_APPROVE_TV
-                  )
-                    ? MediaRequestStatus.APPROVED
-                    : MediaRequestStatus.PENDING,
+                      : Permission.AUTO_APPROVE_TV,
+                    Permission.MANAGE_REQUESTS,
+                  ],
+                  { type: 'or' }
+                )
+                  ? MediaRequestStatus.APPROVED
+                  : MediaRequestStatus.PENDING,
               })
           ),
         });
@@ -453,14 +493,14 @@ requestRoutes.put<{ requestId: string }>(
         });
       }
 
-      if (req.body.mediaType === 'movie') {
+      if (req.body.mediaType === MediaType.MOVIE) {
         request.serverId = req.body.serverId;
         request.profileId = req.body.profileId;
         request.rootFolder = req.body.rootFolder;
         request.requestedBy = requestUser as User;
 
         requestRepository.save(request);
-      } else if (req.body.mediaType === 'tv') {
+      } else if (req.body.mediaType === MediaType.TV) {
         const mediaRepository = getRepository(Media);
         request.serverId = req.body.serverId;
         request.profileId = req.body.profileId;

server/routes/settings/index.ts

@@ -1,22 +1,30 @@
 import { Router } from 'express';
-import { getSettings, Library, MainSettings } from '../../lib/settings';
+import rateLimit from 'express-rate-limit';
+import fs from 'fs';
+import { merge, omit } from 'lodash';
+import path from 'path';
 import { getRepository } from 'typeorm';
-import { User } from '../../entity/User';
 import PlexAPI from '../../api/plexapi';
 import PlexTvAPI from '../../api/plextv';
-import { jobPlexFullSync } from '../../job/plexsync';
-import { scheduledJobs } from '../../job/schedule';
-import { Permission } from '../../lib/permissions';
-import { isAuthenticated } from '../../middleware/auth';
-import { merge, omit } from 'lodash';
 import Media from '../../entity/Media';
 import { MediaRequest } from '../../entity/MediaRequest';
-import { getAppVersion } from '../../utils/appVersion';
-import { SettingsAboutResponse } from '../../interfaces/api/settingsInterfaces';
-import notificationRoutes from './notifications';
-import sonarrRoutes from './sonarr';
-import radarrRoutes from './radarr';
+import { User } from '../../entity/User';
+import {
+  LogMessage,
+  LogsResultsResponse,
+  SettingsAboutResponse,
+} from '../../interfaces/api/settingsInterfaces';
+import { scheduledJobs } from '../../job/schedule';
 import cacheManager, { AvailableCacheIds } from '../../lib/cache';
+import { Permission } from '../../lib/permissions';
+import { plexFullScanner } from '../../lib/scanners/plex';
+import { getSettings, Library, MainSettings } from '../../lib/settings';
+import logger from '../../logger';
+import { isAuthenticated } from '../../middleware/auth';
+import { getAppVersion } from '../../utils/appVersion';
+import notificationRoutes from './notifications';
+import radarrRoutes from './radarr';
+import sonarrRoutes from './sonarr';
 
 const settingsRoutes = Router();
 
@@ -211,18 +219,98 @@ settingsRoutes.get('/plex/library', async (req, res) => {
 });
 
 settingsRoutes.get('/plex/sync', (_req, res) => {
-  return res.status(200).json(jobPlexFullSync.status());
+  return res.status(200).json(plexFullScanner.status());
 });
 
 settingsRoutes.post('/plex/sync', (req, res) => {
   if (req.body.cancel) {
-    jobPlexFullSync.cancel();
+    plexFullScanner.cancel();
   } else if (req.body.start) {
-    jobPlexFullSync.run();
+    plexFullScanner.run();
   }
-  return res.status(200).json(jobPlexFullSync.status());
+  return res.status(200).json(plexFullScanner.status());
 });
 
+settingsRoutes.get(
+  '/logs',
+  rateLimit({ windowMs: 60 * 1000, max: 50 }),
+  (req, res, next) => {
+    const pageSize = req.query.take ? Number(req.query.take) : 25;
+    const skip = req.query.skip ? Number(req.query.skip) : 0;
+
+    let filter: string[] = [];
+    switch (req.query.filter) {
+      case 'debug':
+        filter.push('debug');
+      // falls through
+      case 'info':
+        filter.push('info');
+      // falls through
+      case 'warn':
+        filter.push('warn');
+      // falls through
+      case 'error':
+        filter.push('error');
+        break;
+      default:
+        filter = ['debug', 'info', 'warn', 'error'];
+    }
+
+    const logFile = process.env.CONFIG_DIRECTORY
+      ? `${process.env.CONFIG_DIRECTORY}/logs/overseerr.log`
+      : path.join(__dirname, '../../../config/logs/overseerr.log');
+    const logs: LogMessage[] = [];
+
+    try {
+      fs.readFileSync(logFile)
+        .toString()
+        .split('\n')
+        .forEach((line) => {
+          if (!line.length) return;
+
+          const timestamp = line.match(new RegExp(/^.{24}/)) || [];
+          const level = line.match(new RegExp(/\s\[\w+\]/)) || [];
+          const label = line.match(new RegExp(/\]\[.+?\]/)) || [];
+          const message = line.match(new RegExp(/:\s([^{}]+)({.*})?/)) || [];
+
+          if (level.length && filter.includes(level[0].slice(2, -1))) {
+            logs.push({
+              timestamp: timestamp[0],
+              level: level.length ? level[0].slice(2, -1) : '',
+              label: label.length ? label[0].slice(2, -1) : '',
+              message: message.length && message[1] ? message[1] : '',
+              data:
+                message.length && message[2]
+                  ? JSON.parse(message[2])
+                  : undefined,
+            });
+          }
+        });
+
+      const displayedLogs = logs.reverse().slice(skip, skip + pageSize);
+
+      return res.status(200).json({
+        pageInfo: {
+          pages: Math.ceil(logs.length / pageSize),
+          pageSize,
+          results: logs.length,
+          page: Math.ceil(skip / pageSize) + 1,
+        },
+        results: displayedLogs,
+      } as LogsResultsResponse);
+    } catch (error) {
+      logger.error('Something went wrong while fetching the logs', {
+        label: 'Logs',
+        errorMessage: error.message,
+      });
+      return next({
+        status: 500,
+        message: 'Something went wrong while fetching the logs',
+      });
+    }
+  }
+);
+
 settingsRoutes.get('/jobs', (_req, res) => {
   return res.status(200).json(
     scheduledJobs.map((job) => ({

server/routes/settings/notifications.ts

@@ -15,7 +15,6 @@ notificationRoutes.get('/', (_req, res) => {
   const settings = getSettings().notifications;
   return res.status(200).json({
     enabled: settings.enabled,
-    autoapprovalEnabled: settings.autoapprovalEnabled,
   });
 });
 
@@ -24,13 +23,11 @@ notificationRoutes.post('/', (req, res) => {
 
   Object.assign(settings.notifications, {
     enabled: req.body.enabled,
-    autoapprovalEnabled: req.body.autoapprovalEnabled,
   });
   settings.save();
 
   return res.status(200).json({
     enabled: settings.notifications.enabled,
-    autoapprovalEnabled: settings.notifications.autoapprovalEnabled,
   });
 });
 

server/routes/user/index.ts

@@ -1,16 +1,19 @@
 import { Router } from 'express';
+import gravatarUrl from 'gravatar-url';
 import { getRepository, Not } from 'typeorm';
 import PlexTvAPI from '../../api/plextv';
+import { UserType } from '../../constants/user';
 import { MediaRequest } from '../../entity/MediaRequest';
 import { User } from '../../entity/User';
+import {
+  QuotaResponse,
+  UserRequestsResponse,
+  UserResultsResponse,
+} from '../../interfaces/api/userInterfaces';
 import { hasPermission, Permission } from '../../lib/permissions';
 import { getSettings } from '../../lib/settings';
 import logger from '../../logger';
-import gravatarUrl from 'gravatar-url';
-import { UserType } from '../../constants/user';
 import { isAuthenticated } from '../../middleware/auth';
-import { UserResultsResponse } from '../../interfaces/api/userInterfaces';
-import { UserRequestsResponse } from '../../interfaces/api/userInterfaces';
 import userSettingsRoutes from './usersettings';
 
 const router = Router();
@@ -167,7 +170,10 @@ router.get<{ id: string }, UserRequestsResponse>(
   }
 );
 
-const canMakePermissionsChange = (permissions: number, user?: User) =>
+export const canMakePermissionsChange = (
+  permissions: number,
+  user?: User
+): boolean =>
   // Only let the owner grant admin privileges
   !(hasPermission(Permission.ADMIN, permissions) && user?.id !== 1) ||
   // Only let users with the manage settings permission, grant the same permission
@@ -377,4 +383,36 @@ router.post(
   }
 );
 
+router.get<{ id: string }, QuotaResponse>(
+  '/:id/quota',
+  async (req, res, next) => {
+    try {
+      const userRepository = getRepository(User);
+
+      if (
+        Number(req.params.id) !== req.user?.id &&
+        !req.user?.hasPermission(
+          [Permission.MANAGE_USERS, Permission.MANAGE_REQUESTS],
+          { type: 'and' }
+        )
+      ) {
+        return next({
+          status: 403,
+          message: 'You do not have permission to access this endpoint.',
+        });
+      }
+
+      const user = await userRepository.findOneOrFail({
+        where: { id: Number(req.params.id) },
+      });
+
+      const quotas = await user.getQuota();
+
+      return res.status(200).json(quotas);
+    } catch (e) {
+      next({ status: 404, message: e.message });
+    }
+  }
+);
+
 export default router;