fix: use new SettingsBadge component

Issues dropdown and the login page transition including the language picker were set as fragments

.all-contributorsrc

@@ -620,6 +620,123 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "schambers",
+      "name": "Sean Chambers",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31563?v=4",
+      "profile": "https://github.com/schambers",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "deniscerri",
+      "name": "deniscerri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64997243?v=4",
+      "profile": "https://github.com/deniscerri",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "tomgacz",
+      "name": "tomgacz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14138209?v=4",
+      "profile": "https://github.com/tomgacz",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Andersborrits",
+      "name": "Andersborrits",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29452218?v=4",
+      "profile": "https://github.com/Andersborrits",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Maxentr",
+      "name": "Maxent",
+      "avatar_url": "https://avatars.githubusercontent.com/u/67283154?v=4",
+      "profile": "http://maxentrouault.fr",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "sambartik",
+      "name": "Samuel Bartík",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63553146?v=4",
+      "profile": "https://github.com/sambartik",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "frank-cywong",
+      "name": "Chun Yeung Wong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/90653148?v=4",
+      "profile": "https://github.com/frank-cywong",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "TheMeanCanEHdian",
+      "name": "TheMeanCanEHdian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16025103?v=4",
+      "profile": "https://github.com/TheMeanCanEHdian",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Gylesie",
+      "name": "Gylesie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86306812?v=4",
+      "profile": "https://github.com/Gylesie",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fhd-pro",
+      "name": "Fhd-pro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/82862079?v=4",
+      "profile": "https://github.com/Fhd-pro",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "PovilasID",
+      "name": "PovilasID",
+      "avatar_url": "https://avatars.githubusercontent.com/u/396243?v=4",
+      "profile": "https://github.com/PovilasID",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "byakurau",
+      "name": "byakurau",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1811683?v=4",
+      "profile": "https://github.com/byakurau",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "miknii",
+      "name": "miknii",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109232569?v=4",
+      "profile": "https://github.com/miknii",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
@@ -628,5 +745,5 @@
   "projectOwner": "sct",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "skipCi": true
+  "skipCi": false
 }

.dockerignore

@@ -10,6 +10,7 @@
 .gitconfig
 .github
 .gitignore
+.husky
 .next
 .prettierignore
 config/db/*
@@ -25,3 +26,4 @@ public/os_logo_filled.png
 public/preview.jpg
 snap
 stylelint.config.js
+cypress

.eslintrc.js

@@ -7,6 +7,7 @@ module.exports = {
     'plugin:jsx-a11y/recommended',
     'plugin:react/recommended',
     'plugin:react-hooks/recommended',
+    'plugin:react/jsx-runtime',
     'prettier',
   ],
   parserOptions: {
@@ -26,11 +27,21 @@ module.exports = {
     'react-hooks/rules-of-hooks': 'error',
     'react-hooks/exhaustive-deps': 'warn',
     '@typescript-eslint/explicit-function-return-type': 'off',
-    'prettier/prettier': ['error', { endOfLine: 'auto' }],
     'formatjs/no-offset': 'error',
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': ['error'],
+    '@typescript-eslint/array-type': ['error', { default: 'array' }],
     'jsx-a11y/no-onchange': 'off',
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      {
+        prefer: 'type-imports',
+      },
+    ],
+    'no-relative-import-paths/no-relative-import-paths': [
+      'error',
+      { allowSameFolder: true },
+    ],
   },
   overrides: [
     {
@@ -40,7 +51,7 @@ module.exports = {
       },
     },
   ],
-  plugins: ['jsx-a11y', 'prettier', 'react-hooks', 'formatjs'],
+  plugins: ['jsx-a11y', 'react-hooks', 'formatjs', 'no-relative-import-paths'],
   settings: {
     react: {
       pragma: 'React',

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # Global code ownership
-*                               @sct
+*                               @sct @TheCatLady @danshilm
 
 # Documentation
 /.all-contributorsrc            @TheCatLady @samwiseg0 @danshilm
@@ -12,3 +12,4 @@
 
 # i18n locale files
 /src/i18n/locale/               @sct @TheCatLady
+/src/i18n/locale/en.json        @sct @TheCatLady @danshilm

.github/dependabot.yml

@@ -1,14 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: '/'
-    schedule:
-      interval: daily
-      time: '20:00'
-    open-pull-requests-limit: 10
-  - package-ecosystem: github-actions
-    directory: '/'
-    schedule:
-      interval: daily
-      time: '20:00'
-    open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -11,52 +11,54 @@ on:
 jobs:
   test:
     name: Lint & Test Build
+    if: github.event_name == 'pull_request'
     runs-on: ubuntu-20.04
-    container: node:14.18-alpine
+    container: node:16.17-alpine
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
       - name: Install dependencies
         env:
-          HUSKY_SKIP_INSTALL: 1
+          HUSKY: 0
         run: yarn
       - name: Lint
         run: yarn lint
+      - name: Formatting
+        run: yarn format:check
       - name: Build
         run: yarn build
 
   build_and_push:
     name: Build & Publish Docker Images
-    needs: test
     if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.3.0
+        uses: docker/setup-buildx-action@v2
       - name: Cache Docker layers
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile
@@ -86,7 +88,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2.1.6
+        uses: technote-space/workflow-conclusion-action@v3
       - name: Combine Job Status
         id: status
         run: |

.github/workflows/cypress.yml

@@ -0,0 +1,30 @@
+name: Cypress Tests
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - develop
+
+jobs:
+  cypress-run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Cypress run
+        uses: cypress-io/github-action@v4
+        with:
+          build: yarn cypress:build
+          start: yarn start
+          wait-on: 'http://localhost:5055'
+          record: true
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_MIGRATIONS: true
+          # Fix test titles in cypress dashboard
+          COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
+          COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}

.github/workflows/deploy_docs.yml

@@ -9,14 +9,14 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Generate Swagger UI
-        uses: Legion2/swagger-ui-action@v1.1.2
+        uses: Legion2/swagger-ui-action@v1
         with:
           output: swagger-ui
           spec-file: overseerr-api.yml
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3.8.0
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: swagger-ui

.github/workflows/preview.yml

@@ -11,27 +11,27 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.3.0
+        uses: docker/setup-buildx-action@v2
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile

.github/workflows/release.yml

@@ -6,46 +6,29 @@ on:
       - master
 
 jobs:
-  test:
-    name: Lint & Test Build
-    runs-on: ubuntu-20.04
-    container: node:14.18-alpine
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.4
-      - name: Install dependencies
-        env:
-          HUSKY_SKIP_INSTALL: 1
-        run: yarn
-      - name: Lint
-        run: yarn lint
-      - name: Build
-        run: yarn build
-
   semantic-release:
     name: Tag and release latest version
-    needs: test
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.3.0
+        uses: docker/setup-buildx-action@v2
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -72,7 +55,7 @@ jobs:
           - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Switch to master branch
@@ -89,7 +72,7 @@ jobs:
             echo ::set-output name=RELEASE::edge
           fi
       - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2
         with:
           image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
       - name: Build Snap Package
@@ -98,12 +81,12 @@ jobs:
         with:
           architecture: ${{ matrix.architecture }}
       - name: Upload Snap Package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: overseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}
       - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@v1.3.0
+        uses: diddlesnaps/snapcraft-review-tools-action@v1
         with:
           snap: ${{ steps.build.outputs.snap }}
       - name: Publish Snap Package
@@ -120,7 +103,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2.1.6
+        uses: technote-space/workflow-conclusion-action@v3
       - name: Combine Job Status
         id: status
         run: |

.github/workflows/snap.yaml

@@ -12,30 +12,13 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.0
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ secrets.GITHUB_TOKEN }}
 
-  test:
-    name: Lint & Test Build
-    needs: jobs
-    runs-on: ubuntu-20.04
-    container: node:14.18-alpine
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.4
-      - name: Install dependencies
-        env:
-          HUSKY_SKIP_INSTALL: 1
-        run: yarn
-      - name: Lint
-        run: yarn lint
-      - name: Build
-        run: yarn build
-
   build-snap:
     name: Build Snap Package (${{ matrix.architecture }})
-    needs: test
+    needs: jobs
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -46,7 +29,7 @@ jobs:
           - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
       - name: Prepare
         id: prepare
         run: |
@@ -57,21 +40,19 @@ jobs:
             echo ::set-output name=RELEASE::edge
           fi
       - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
-        with:
-          image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
+        uses: docker/setup-qemu-action@v2
       - name: Build Snap Package
         uses: diddlesnaps/snapcraft-multiarch-action@v1
         id: build
         with:
           architecture: ${{ matrix.architecture }}
       - name: Upload Snap Package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: overseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}
       - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@v1.3.0
+        uses: diddlesnaps/snapcraft-review-tools-action@v1
         with:
           snap: ${{ steps.build.outputs.snap }}
       - name: Publish Snap Package
@@ -88,7 +69,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2.1.6
+        uses: technote-space/workflow-conclusion-action@v3
       - name: Combine Job Status
         id: status
         run: |

.github/workflows/support.yml

@@ -8,7 +8,7 @@ jobs:
   support:
     runs-on: ubuntu-20.04
     steps:
-      - uses: dessant/support-requests@v2.0.1
+      - uses: dessant/support-requests@v2
         with:
           github-token: ${{ github.token }}
           support-label: 'support'

.gitignore

@@ -39,6 +39,7 @@ config/settings.json
 config/logs/*.log*
 config/logs/*.json
 config/logs/*.log.gz
+config/logs/*.json.gz
 config/logs/*-audit.json
 
 # anidb mapping file
@@ -52,3 +53,14 @@ config/db/db.sqlite3-journal
 
 # VS Code
 .vscode/launch.json
+
+# Cypress
+cypress.env.json
+cypress/videos
+cypress/screenshots
+
+# ESLint
+.eslintcache
+
+# TS Build Info
+tsconfig.tsbuildinfo

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+[[ -n $HUSKY_BYPASS ]] || npx commitlint --edit $1

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.husky/prepare-commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+exec < /dev/tty && npx cz --hook || true

.prettierrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [require('./merged-prettier-plugin.js')],
+  singleQuote: true,
+  trailingComma: 'es5',
+};

.vscode/extensions.json

@@ -11,17 +11,11 @@
     // https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode
     "esbenp.prettier-vscode",
 
-    // https://marketplace.visualstudio.com/items?itemName=eg2.vscode-npm-script
-    "eg2.vscode-npm-script",
-
     // https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest
     "Orta.vscode-jest",
 
     "stylelint.vscode-stylelint",
 
-    "bradlc.vscode-tailwindcss",
-
-    // https://marketplace.visualstudio.com/items?itemName=heybourn.headwind
-    "heybourn.headwind"
+    "bradlc.vscode-tailwindcss"
   ]
 }

.vscode/settings.json

@@ -15,8 +15,6 @@
       "database": "./config/db/db.sqlite3"
     }
   ],
-  "editor.codeActionsOnSave": {
-    "source.organizeImports": true
-  },
-  "editor.formatOnSave": true
+  "editor.formatOnSave": true,
+  "typescript.preferences.importModuleSpecifier": "non-relative"
 }

CONTRIBUTING.md

@@ -68,9 +68,9 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 
 - 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 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.
+- Please make meaningful commits, or squash them prior to opening a pull request.
+  - Do not squash commits once people have begun reviewing your changes.
 - 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.
@@ -86,7 +86,7 @@ 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.
 3. Use the appropriate Unicode characters for ellipses, arrows, and other special characters/symbols.
-4. Capitalize proper nouns, such as Plex, Radarr, Sonarr, Telegram, Slack, Pushover, etc. Be sure to also use the official capitalization for any abbreviations; e.g., TMDb and IMDb have a lowercase 'b', whereas TheTVDB has a capital 'B'.
+4. Capitalize proper nouns, such as Plex, Radarr, Sonarr, Telegram, Slack, Pushover, etc. Be sure to also use the official capitalization for any abbreviations; e.g., IMDb has a lowercase 'b', whereas TMDB and TheTVDB have a capital 'B'.
 5. Title case headings, button text, and form labels. Note that verbs such as "is" should be capitalized, whereas prepositions like "from" should be lowercase (unless as the first or last word of the string, in which case they are also capitalized).
 6. Capitalize the first word in validation error messages, dropdowns, and form "tips." These strings should not end in punctuation.
 7. Ensure that toast notification strings are complete sentences ending in punctuation.

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.18-alpine AS BUILD_IMAGE
+FROM node:16.17-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -14,7 +14,7 @@ RUN \
   esac
 
 COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --network-timeout 1000000
+RUN CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
 
 COPY . ./
 
@@ -26,18 +26,18 @@ RUN yarn build
 # remove development dependencies
 RUN yarn install --production --ignore-scripts --prefer-offline
 
-RUN rm -rf src server
+RUN rm -rf src server .next/cache
 
 RUN touch config/DOCKER
 
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:14.18-alpine
+FROM node:16.17-alpine
 
 WORKDIR /app
 
-RUN apk add --no-cache tzdata tini
+RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
 
 # copy from build image
 COPY --from=BUILD_IMAGE /app ./

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:14.18-alpine
+FROM node:16.17-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-67-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-80-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -160,6 +160,23 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/skafte1990"><img src="https://avatars.githubusercontent.com/u/31465453?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shaaft</b></sub></a><br /><a href="#translation-skafte1990" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/sr093906"><img src="https://avatars.githubusercontent.com/u/8369201?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sr093906</b></sub></a><br /><a href="#translation-sr093906" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Nackophilz"><img src="https://avatars.githubusercontent.com/u/61667226?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nackophilz</b></sub></a><br /><a href="#translation-Nackophilz" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/schambers"><img src="https://avatars.githubusercontent.com/u/31563?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sean Chambers</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=schambers" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/deniscerri"><img src="https://avatars.githubusercontent.com/u/64997243?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deniscerri</b></sub></a><br /><a href="#translation-deniscerri" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/tomgacz"><img src="https://avatars.githubusercontent.com/u/14138209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tomgacz</b></sub></a><br /><a href="#translation-tomgacz" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Andersborrits"><img src="https://avatars.githubusercontent.com/u/29452218?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andersborrits</b></sub></a><br /><a href="#translation-Andersborrits" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://maxentrouault.fr"><img src="https://avatars.githubusercontent.com/u/67283154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maxent</b></sub></a><br /><a href="#translation-Maxentr" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/sambartik"><img src="https://avatars.githubusercontent.com/u/63553146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samuel Bartík</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=sambartik" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/frank-cywong"><img src="https://avatars.githubusercontent.com/u/90653148?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chun Yeung Wong</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=frank-cywong" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/TheMeanCanEHdian"><img src="https://avatars.githubusercontent.com/u/16025103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TheMeanCanEHdian</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=TheMeanCanEHdian" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Gylesie"><img src="https://avatars.githubusercontent.com/u/86306812?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gylesie</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Gylesie" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Fhd-pro"><img src="https://avatars.githubusercontent.com/u/82862079?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fhd-pro</b></sub></a><br /><a href="#translation-Fhd-pro" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/PovilasID"><img src="https://avatars.githubusercontent.com/u/396243?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PovilasID</b></sub></a><br /><a href="#translation-PovilasID" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/byakurau"><img src="https://avatars.githubusercontent.com/u/1811683?v=4?s=100" width="100px;" alt=""/><br /><sub><b>byakurau</b></sub></a><br /><a href="#translation-byakurau" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/miknii"><img src="https://avatars.githubusercontent.com/u/109232569?v=4?s=100" width="100px;" alt=""/><br /><sub><b>miknii</b></sub></a><br /><a href="#translation-miknii" title="Translation">🌍</a></td>
   </tr>
 </table>
 

cypress.config.ts

@@ -0,0 +1,19 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  projectId: 'onnqy3',
+  e2e: {
+    baseUrl: 'http://localhost:5055',
+    experimentalSessionAndOrigin: true,
+  },
+  env: {
+    ADMIN_EMAIL: 'admin@seerr.dev',
+    ADMIN_PASSWORD: 'test1234',
+    USER_EMAIL: 'friend@seerr.dev',
+    USER_PASSWORD: 'test1234',
+  },
+  retries: {
+    runMode: 2,
+    openMode: 0,
+  },
+});

cypress/config/settings.cypress.json

@@ -0,0 +1,149 @@
+{
+  "clientId": "6919275e-142a-48d8-be6b-93594cbd4626",
+  "vapidPrivate": "tmnslaO8ZWN6bNbSEv_rolPeBTlNxOwCCAHrM9oZz3M",
+  "vapidPublic": "BK_EpP8NDm9waor2zn6_S28o3ZYv4kCkJOfYpO3pt3W6jnPmxrgTLANUBNbbyaNatPnSQ12De9CeqSYQrqWzHTs",
+  "main": {
+   "apiKey": "testkey",
+   "applicationTitle": "Overseerr",
+   "applicationUrl": "",
+   "csrfProtection": false,
+   "cacheImages": false,
+   "defaultPermissions": 32,
+   "defaultQuotas": {
+    "movie": {},
+    "tv": {}
+   },
+   "hideAvailable": false,
+   "localLogin": true,
+   "newPlexLogin": true,
+   "region": "",
+   "originalLanguage": "",
+   "trustProxy": false,
+   "partialRequestsEnabled": true,
+   "locale": "en"
+  },
+  "plex": {
+   "name": "Seerr",
+   "ip": "192.168.1.1",
+   "port": 32400,
+   "useSsl": false,
+   "libraries": [
+    {
+     "id": "1",
+     "name": "Movies",
+     "enabled": true,
+     "type": "movie"
+    }
+   ],
+   "machineId": "test"
+  },
+  "tautulli": {},
+  "radarr": [],
+  "sonarr": [],
+  "public": {
+   "initialized": true
+  },
+  "notifications": {
+   "agents": {
+    "email": {
+     "enabled": false,
+     "options": {
+      "emailFrom": "",
+      "smtpHost": "",
+      "smtpPort": 587,
+      "secure": false,
+      "ignoreTls": false,
+      "requireTls": false,
+      "allowSelfSigned": false,
+      "senderName": "Overseerr"
+     }
+    },
+    "discord": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": "",
+      "enableMentions": true
+     }
+    },
+    "lunasea": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": ""
+     }
+    },
+    "slack": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": ""
+     }
+    },
+    "telegram": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "botAPI": "",
+      "chatId": "",
+      "sendSilently": false
+     }
+    },
+    "pushbullet": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "accessToken": ""
+     }
+    },
+    "pushover": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "accessToken": "",
+      "userToken": ""
+     }
+    },
+    "webhook": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": "",
+      "jsonPayload": "IntcbiAgICBcIm5vdGlmaWNhdGlvbl90eXBlXCI6IFwie3tub3RpZmljYXRpb25fdHlwZX19XCIsXG4gICAgXCJldmVudFwiOiBcInt7ZXZlbnR9fVwiLFxuICAgIFwic3ViamVjdFwiOiBcInt7c3ViamVjdH19XCIsXG4gICAgXCJtZXNzYWdlXCI6IFwie3ttZXNzYWdlfX1cIixcbiAgICBcImltYWdlXCI6IFwie3tpbWFnZX19XCIsXG4gICAgXCJ7e21lZGlhfX1cIjoge1xuICAgICAgICBcIm1lZGlhX3R5cGVcIjogXCJ7e21lZGlhX3R5cGV9fVwiLFxuICAgICAgICBcInRtZGJJZFwiOiBcInt7bWVkaWFfdG1kYmlkfX1cIixcbiAgICAgICAgXCJ0dmRiSWRcIjogXCJ7e21lZGlhX3R2ZGJpZH19XCIsXG4gICAgICAgIFwic3RhdHVzXCI6IFwie3ttZWRpYV9zdGF0dXN9fVwiLFxuICAgICAgICBcInN0YXR1czRrXCI6IFwie3ttZWRpYV9zdGF0dXM0a319XCJcbiAgICB9LFxuICAgIFwie3tyZXF1ZXN0fX1cIjoge1xuICAgICAgICBcInJlcXVlc3RfaWRcIjogXCJ7e3JlcXVlc3RfaWR9fVwiLFxuICAgICAgICBcInJlcXVlc3RlZEJ5X2VtYWlsXCI6IFwie3tyZXF1ZXN0ZWRCeV9lbWFpbH19XCIsXG4gICAgICAgIFwicmVxdWVzdGVkQnlfdXNlcm5hbWVcIjogXCJ7e3JlcXVlc3RlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXF1ZXN0ZWRCeV9hdmF0YXJcIjogXCJ7e3JlcXVlc3RlZEJ5X2F2YXRhcn19XCJcbiAgICB9LFxuICAgIFwie3tpc3N1ZX19XCI6IHtcbiAgICAgICAgXCJpc3N1ZV9pZFwiOiBcInt7aXNzdWVfaWR9fVwiLFxuICAgICAgICBcImlzc3VlX3R5cGVcIjogXCJ7e2lzc3VlX3R5cGV9fVwiLFxuICAgICAgICBcImlzc3VlX3N0YXR1c1wiOiBcInt7aXNzdWVfc3RhdHVzfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2VtYWlsXCI6IFwie3tyZXBvcnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X3VzZXJuYW1lXCI6IFwie3tyZXBvcnRlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2F2YXRhclwiOiBcInt7cmVwb3J0ZWRCeV9hdmF0YXJ9fVwiXG4gICAgfSxcbiAgICBcInt7Y29tbWVudH19XCI6IHtcbiAgICAgICAgXCJjb21tZW50X21lc3NhZ2VcIjogXCJ7e2NvbW1lbnRfbWVzc2FnZX19XCIsXG4gICAgICAgIFwiY29tbWVudGVkQnlfZW1haWxcIjogXCJ7e2NvbW1lbnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJjb21tZW50ZWRCeV91c2VybmFtZVwiOiBcInt7Y29tbWVudGVkQnlfdXNlcm5hbWV9fVwiLFxuICAgICAgICBcImNvbW1lbnRlZEJ5X2F2YXRhclwiOiBcInt7Y29tbWVudGVkQnlfYXZhdGFyfX1cIlxuICAgIH0sXG4gICAgXCJ7e2V4dHJhfX1cIjogW11cbn0i"
+     }
+    },
+    "webpush": {
+     "enabled": false,
+     "options": {}
+    },
+    "gotify": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "url": "",
+      "token": ""
+     }
+    }
+   }
+  },
+  "jobs": {
+   "plex-recently-added-scan": {
+    "schedule": "0 */5 * * * *"
+   },
+   "plex-full-scan": {
+    "schedule": "0 0 3 * * *"
+   },
+   "radarr-scan": {
+    "schedule": "0 0 4 * * *"
+   },
+   "sonarr-scan": {
+    "schedule": "0 30 4 * * *"
+   },
+   "download-sync": {
+    "schedule": "0 * * * * *"
+   },
+   "download-sync-reset": {
+    "schedule": "0 0 1 * * *"
+   }
+  }
+ }

cypress/e2e/discover.cy.ts

@@ -0,0 +1,210 @@
+const clickFirstTitleCardInSlider = (sliderTitle: string): void => {
+  cy.contains('.slider-header', sliderTitle)
+    .next('[data-testid=media-slider]')
+    .find('[data-testid=title-card]')
+    .first()
+    .trigger('mouseover')
+    .find('[data-testid=title-card-title]')
+    .invoke('text')
+    .then((text) => {
+      cy.contains('.slider-header', sliderTitle)
+        .next('[data-testid=media-slider]')
+        .find('[data-testid=title-card]')
+        .first()
+        .click();
+      cy.get('[data-testid=media-title]').should('contain', text);
+    });
+};
+
+describe('Discover', () => {
+  beforeEach(() => {
+    cy.loginAsAdmin();
+  });
+
+  it('loads a trending item', () => {
+    cy.intercept('/api/v1/discover/trending*').as('getTrending');
+    cy.visit('/');
+    cy.wait('@getTrending');
+    clickFirstTitleCardInSlider('Trending');
+  });
+
+  it('loads popular movies', () => {
+    cy.intercept('/api/v1/discover/movies*').as('getPopularMovies');
+    cy.visit('/');
+    cy.wait('@getPopularMovies');
+    clickFirstTitleCardInSlider('Popular Movies');
+  });
+
+  it('loads upcoming movies', () => {
+    cy.intercept('/api/v1/discover/movies/upcoming*').as('getUpcomingMovies');
+    cy.visit('/');
+    cy.wait('@getUpcomingMovies');
+    clickFirstTitleCardInSlider('Upcoming Movies');
+  });
+
+  it('loads popular series', () => {
+    cy.intercept('/api/v1/discover/tv*').as('getPopularTv');
+    cy.visit('/');
+    cy.wait('@getPopularTv');
+    clickFirstTitleCardInSlider('Popular Series');
+  });
+
+  it('loads upcoming series', () => {
+    cy.intercept('/api/v1/discover/tv/upcoming*').as('getUpcomingSeries');
+    cy.visit('/');
+    cy.wait('@getUpcomingSeries');
+    clickFirstTitleCardInSlider('Upcoming Series');
+  });
+
+  it('displays error for media with invalid TMDB ID', () => {
+    cy.intercept('GET', '/api/v1/media?*', {
+      pageInfo: { pages: 1, pageSize: 20, results: 1, page: 1 },
+      results: [
+        {
+          downloadStatus: [],
+          downloadStatus4k: [],
+          id: 1922,
+          mediaType: 'movie',
+          tmdbId: 998814,
+          tvdbId: null,
+          imdbId: null,
+          status: 5,
+          status4k: 1,
+          createdAt: '2022-08-18T18:11:13.000Z',
+          updatedAt: '2022-08-18T19:56:41.000Z',
+          lastSeasonChange: '2022-08-18T19:56:41.000Z',
+          mediaAddedAt: '2022-08-18T19:56:41.000Z',
+          serviceId: null,
+          serviceId4k: null,
+          externalServiceId: null,
+          externalServiceId4k: null,
+          externalServiceSlug: null,
+          externalServiceSlug4k: null,
+          ratingKey: null,
+          ratingKey4k: null,
+          seasons: [],
+        },
+      ],
+    }).as('getMedia');
+
+    cy.visit('/');
+    cy.wait('@getMedia');
+    cy.contains('.slider-header', 'Recently Added')
+      .next('[data-testid=media-slider]')
+      .find('[data-testid=title-card]')
+      .first()
+      .find('[data-testid=title-card-title]')
+      .contains('Movie Not Found');
+  });
+
+  it('displays error for request with invalid TMDB ID', () => {
+    cy.intercept('GET', '/api/v1/request?*', {
+      pageInfo: { pages: 1, pageSize: 10, results: 1, page: 1 },
+      results: [
+        {
+          id: 582,
+          status: 1,
+          createdAt: '2022-08-18T18:11:13.000Z',
+          updatedAt: '2022-08-18T18:11:13.000Z',
+          type: 'movie',
+          is4k: false,
+          serverId: null,
+          profileId: null,
+          rootFolder: null,
+          languageProfileId: null,
+          tags: null,
+          media: {
+            downloadStatus: [],
+            downloadStatus4k: [],
+            id: 1922,
+            mediaType: 'movie',
+            tmdbId: 998814,
+            tvdbId: null,
+            imdbId: null,
+            status: 2,
+            status4k: 1,
+            createdAt: '2022-08-18T18:11:13.000Z',
+            updatedAt: '2022-08-18T18:11:13.000Z',
+            lastSeasonChange: '2022-08-18T18:11:13.000Z',
+            mediaAddedAt: null,
+            serviceId: null,
+            serviceId4k: null,
+            externalServiceId: null,
+            externalServiceId4k: null,
+            externalServiceSlug: null,
+            externalServiceSlug4k: null,
+            ratingKey: null,
+            ratingKey4k: null,
+          },
+          seasons: [],
+          modifiedBy: null,
+          requestedBy: {
+            permissions: 4194336,
+            id: 18,
+            email: 'friend@seerr.dev',
+            plexUsername: null,
+            username: '',
+            recoveryLinkExpirationDate: null,
+            userType: 2,
+            avatar:
+              'https://gravatar.com/avatar/c77fdc27cab83732b8623d2ea873d330?default=mm&size=200',
+            movieQuotaLimit: null,
+            movieQuotaDays: null,
+            tvQuotaLimit: null,
+            tvQuotaDays: null,
+            createdAt: '2022-08-17T04:55:28.000Z',
+            updatedAt: '2022-08-17T04:55:28.000Z',
+            requestCount: 1,
+            displayName: 'friend@seerr.dev',
+          },
+          seasonCount: 0,
+        },
+      ],
+    }).as('getRequests');
+
+    cy.visit('/');
+    cy.wait('@getRequests');
+    cy.contains('.slider-header', 'Recent Requests')
+      .next('[data-testid=media-slider]')
+      .find('[data-testid=request-card]')
+      .first()
+      .find('[data-testid=request-card-title]')
+      .contains('Movie Not Found');
+  });
+
+  it('loads plex watchlist', () => {
+    cy.intercept('/api/v1/discover/watchlist', {
+      fixture: 'watchlist.json',
+    }).as('getWatchlist');
+    // Wait for one of the watchlist movies to resolve
+    cy.intercept('/api/v1/movie/361743').as('getTmdbMovie');
+
+    cy.visit('/');
+
+    cy.wait('@getWatchlist');
+
+    const sliderHeader = cy.contains('.slider-header', 'Your Plex Watchlist');
+
+    sliderHeader.scrollIntoView();
+
+    cy.wait('@getTmdbMovie');
+    // Wait a little longer to make sure the movie component reloaded
+    cy.wait(500);
+
+    sliderHeader
+      .next('[data-testid=media-slider]')
+      .find('[data-testid=title-card]')
+      .first()
+      .trigger('mouseover')
+      .find('[data-testid=title-card-title]')
+      .invoke('text')
+      .then((text) => {
+        cy.contains('.slider-header', 'Plex Watchlist')
+          .next('[data-testid=media-slider]')
+          .find('[data-testid=title-card]')
+          .first()
+          .click();
+        cy.get('[data-testid=media-title]').should('contain', text);
+      });
+  });
+});

cypress/e2e/login.cy.ts

@@ -0,0 +1,13 @@
+describe('Login Page', () => {
+  it('succesfully logs in as an admin', () => {
+    cy.loginAsAdmin();
+    cy.visit('/');
+    cy.contains('Trending');
+  });
+
+  it('succesfully logs in as a local user', () => {
+    cy.loginAsUser();
+    cy.visit('/');
+    cy.contains('Trending');
+  });
+});

cypress/e2e/movie-details.cy.ts

@@ -0,0 +1,12 @@
+describe('Movie Details', () => {
+  it('loads a movie page', () => {
+    cy.loginAsAdmin();
+    // Try to load minions: rise of gru
+    cy.visit('/movie/438148');
+
+    cy.get('[data-testid=media-title]').should(
+      'contain',
+      'Minions: The Rise of Gru (2022)'
+    );
+  });
+});

cypress/e2e/settings/general-settings.cy.ts

@@ -0,0 +1,32 @@
+describe('General Settings', () => {
+  beforeEach(() => {
+    cy.loginAsAdmin();
+  });
+
+  it('opens the settings page from the home page', () => {
+    cy.visit('/');
+
+    cy.get('[data-testid=sidebar-toggle]').click();
+    cy.get('[data-testid=sidebar-menu-settings-mobile]').click();
+
+    cy.get('.heading').should('contain', 'General Settings');
+  });
+
+  it('modifies setting that requires restart', () => {
+    cy.visit('/settings');
+
+    cy.get('#trustProxy').click();
+    cy.get('form').submit();
+    cy.get('[data-testid=modal-title]').should(
+      'contain',
+      'Server Restart Required'
+    );
+
+    cy.get('[data-testid=modal-ok-button]').click();
+    cy.get('[data-testid=modal-title]').should('not.exist');
+
+    cy.get('[type=checkbox]#trustProxy').click();
+    cy.get('form').submit();
+    cy.get('[data-testid=modal-title]').should('not.exist');
+  });
+});

cypress/e2e/tv-details.cy.ts

@@ -0,0 +1,28 @@
+describe('TV Details', () => {
+  it('loads a tv details page', () => {
+    cy.loginAsAdmin();
+    // Try to load stranger things
+    cy.visit('/tv/66732');
+
+    cy.get('[data-testid=media-title]').should(
+      'contain',
+      'Stranger Things (2016)'
+    );
+  });
+
+  it('shows seasons and expands episodes', () => {
+    cy.loginAsAdmin();
+
+    // Try to load stranger things
+    cy.visit('/tv/66732');
+
+    // intercept request for season info
+    cy.intercept('/api/v1/tv/66732/season/4').as('season4');
+
+    cy.contains('Season 4').should('be.visible').scrollIntoView().click();
+
+    cy.wait('@season4');
+
+    cy.contains('Chapter Nine').should('be.visible');
+  });
+});

cypress/e2e/user/auto-request-settings.cy.ts

@@ -0,0 +1,74 @@
+const visitUserEditPage = (email: string): void => {
+  cy.visit('/users');
+
+  cy.contains('[data-testid=user-list-row]', email).contains('Edit').click();
+};
+
+describe('Auto Request Settings', () => {
+  beforeEach(() => {
+    cy.loginAsAdmin();
+  });
+
+  it('should not see watchlist sync settings on an account without permissions', () => {
+    visitUserEditPage(Cypress.env('USER_EMAIL'));
+
+    cy.contains('Auto-Request Movies').should('not.exist');
+    cy.contains('Auto-Request Series').should('not.exist');
+  });
+
+  it('should see watchlist sync settings on an admin account', () => {
+    visitUserEditPage(Cypress.env('ADMIN_EMAIL'));
+
+    cy.contains('Auto-Request Movies').should('exist');
+    cy.contains('Auto-Request Series').should('exist');
+  });
+
+  it('should see auto-request settings after being given permission', () => {
+    visitUserEditPage(Cypress.env('USER_EMAIL'));
+
+    cy.get('[data-testid=settings-nav-desktop').contains('Permissions').click();
+
+    cy.get('#autorequest').should('not.be.checked').click();
+
+    cy.intercept('/api/v1/user/*/settings/permissions').as('userPermissions');
+
+    cy.contains('Save Changes').click();
+
+    cy.wait('@userPermissions');
+
+    cy.reload();
+
+    cy.get('#autorequest').should('be.checked');
+    cy.get('#autorequestmovies').should('be.checked');
+    cy.get('#autorequesttv').should('be.checked');
+
+    cy.get('[data-testid=settings-nav-desktop').contains('General').click();
+
+    cy.contains('Auto-Request Movies').should('exist');
+    cy.contains('Auto-Request Series').should('exist');
+
+    cy.get('#watchlistSyncMovies').should('not.be.checked').click();
+    cy.get('#watchlistSyncTv').should('not.be.checked').click();
+
+    cy.intercept('/api/v1/user/*/settings/main').as('userMain');
+
+    cy.contains('Save Changes').click();
+
+    cy.wait('@userMain');
+
+    cy.reload();
+
+    cy.get('#watchlistSyncMovies').should('be.checked').click();
+    cy.get('#watchlistSyncTv').should('be.checked').click();
+
+    cy.contains('Save Changes').click();
+
+    cy.wait('@userMain');
+
+    cy.get('[data-testid=settings-nav-desktop').contains('Permissions').click();
+
+    cy.get('#autorequest').should('be.checked').click();
+
+    cy.contains('Save Changes').click();
+  });
+});

cypress/e2e/user/profile.cy.ts

@@ -0,0 +1,50 @@
+describe('User Profile', () => {
+  beforeEach(() => {
+    cy.loginAsAdmin();
+  });
+
+  it('opens user profile page from the home page', () => {
+    cy.visit('/');
+
+    cy.get('[data-testid=user-menu]').click();
+    cy.get('[data-testid=user-menu-profile]').click();
+
+    cy.get('h1').should('contain', Cypress.env('ADMIN_EMAIL'));
+  });
+
+  it('loads plex watchlist', () => {
+    cy.intercept('/api/v1/user/[0-9]*/watchlist', {
+      fixture: 'watchlist.json',
+    }).as('getWatchlist');
+    // Wait for one of the watchlist movies to resolve
+    cy.intercept('/api/v1/movie/361743').as('getTmdbMovie');
+
+    cy.visit('/profile');
+
+    cy.wait('@getWatchlist');
+
+    const sliderHeader = cy.contains('.slider-header', 'Plex Watchlist');
+
+    sliderHeader.scrollIntoView();
+
+    cy.wait('@getTmdbMovie');
+    // Wait a little longer to make sure the movie component reloaded
+    cy.wait(500);
+
+    sliderHeader
+      .next('[data-testid=media-slider]')
+      .find('[data-testid=title-card]')
+      .first()
+      .trigger('mouseover')
+      .find('[data-testid=title-card-title]')
+      .invoke('text')
+      .then((text) => {
+        cy.contains('.slider-header', 'Plex Watchlist')
+          .next('[data-testid=media-slider]')
+          .find('[data-testid=title-card]')
+          .first()
+          .click();
+        cy.get('[data-testid=media-title]').should('contain', text);
+      });
+  });
+});

cypress/e2e/user/user-list.cy.ts

@@ -0,0 +1,70 @@
+const testUser = {
+  displayName: 'Test User',
+  emailAddress: 'test@seeerr.dev',
+  password: 'test1234',
+};
+
+describe('User List', () => {
+  beforeEach(() => {
+    cy.loginAsAdmin();
+  });
+
+  it('opens the user list from the home page', () => {
+    cy.visit('/');
+
+    cy.get('[data-testid=sidebar-toggle]').click();
+    cy.get('[data-testid=sidebar-menu-users-mobile]').click();
+
+    cy.get('[data-testid=page-header]').should('contain', 'User List');
+  });
+
+  it('can find the admin user and friend user in the user list', () => {
+    cy.visit('/users');
+
+    cy.get('[data-testid=user-list-row]').contains(Cypress.env('ADMIN_EMAIL'));
+    cy.get('[data-testid=user-list-row]').contains(Cypress.env('USER_EMAIL'));
+  });
+
+  it('can create a local user', () => {
+    cy.visit('/users');
+
+    cy.contains('Create Local User').click();
+
+    cy.get('[data-testid=modal-title]').should('contain', 'Create Local User');
+
+    cy.get('#displayName').type(testUser.displayName);
+    cy.get('#email').type(testUser.emailAddress);
+    cy.get('#password').type(testUser.password);
+
+    cy.intercept('/api/v1/user?take=10&skip=0&sort=displayname').as('user');
+
+    cy.get('[data-testid=modal-ok-button]').click();
+
+    cy.wait('@user');
+    // Wait a little longer for the user list to fully re-render
+    cy.wait(1000);
+
+    cy.get('[data-testid=user-list-row]').contains(testUser.emailAddress);
+  });
+
+  it('can delete the created local test user', () => {
+    cy.visit('/users');
+
+    cy.contains('[data-testid=user-list-row]', testUser.emailAddress)
+      .contains('Delete')
+      .click();
+
+    cy.get('[data-testid=modal-title]').should('contain', `Delete User`);
+
+    cy.intercept('/api/v1/user?take=10&skip=0&sort=displayname').as('user');
+
+    cy.get('[data-testid=modal-ok-button]').should('contain', 'Delete').click();
+
+    cy.wait('@user');
+    cy.wait(1000);
+
+    cy.get('[data-testid=user-list-row]')
+      .contains(testUser.emailAddress)
+      .should('not.exist');
+  });
+});

cypress/fixtures/watchlist.json

@@ -0,0 +1,25 @@
+{
+  "page": 1,
+  "totalPages": 1,
+  "totalResults": 3,
+  "results": [
+    {
+      "ratingKey": "5d776be17a53e9001e732ab9",
+      "title": "Top Gun: Maverick",
+      "mediaType": "movie",
+      "tmdbId": 361743
+    },
+    {
+      "ratingKey": "5e16338fbc1372003ea68ab3",
+      "title": "Nope",
+      "mediaType": "movie",
+      "tmdbId": 762504
+    },
+    {
+      "ratingKey": "5f409b8452f200004161e126",
+      "title": "Hocus Pocus 2",
+      "mediaType": "movie",
+      "tmdbId": 642885
+    }
+  ]
+}

cypress/support/commands.ts

@@ -0,0 +1,34 @@
+/// <reference types="cypress" />
+
+Cypress.Commands.add('login', (email, password) => {
+  cy.session(
+    [email, password],
+    () => {
+      cy.visit('/login');
+      cy.contains('Use your Overseerr account').click();
+
+      cy.get('[data-testid=email]').type(email);
+      cy.get('[data-testid=password]').type(password);
+
+      cy.intercept('/api/v1/auth/local').as('localLogin');
+      cy.get('[data-testid=local-signin-button]').click();
+
+      cy.wait('@localLogin');
+
+      cy.url().should('contain', '/');
+    },
+    {
+      validate() {
+        cy.request('/api/v1/auth/me').its('status').should('eq', 200);
+      },
+    }
+  );
+});
+
+Cypress.Commands.add('loginAsAdmin', () => {
+  cy.login(Cypress.env('ADMIN_EMAIL'), Cypress.env('ADMIN_PASSWORD'));
+});
+
+Cypress.Commands.add('loginAsUser', () => {
+  cy.login(Cypress.env('USER_EMAIL'), Cypress.env('USER_PASSWORD'));
+});

cypress/support/e2e.ts

@@ -0,0 +1,7 @@
+import './commands';
+
+before(() => {
+  if (Cypress.env('SEED_DATABASE')) {
+    cy.exec('yarn cypress:prepare');
+  }
+});

cypress/support/index.ts

@@ -0,0 +1,14 @@
+/* eslint-disable @typescript-eslint/no-namespace */
+/// <reference types="cypress" />
+
+declare global {
+  namespace Cypress {
+    interface Chainable {
+      login(email?: string, password?: string): Chainable<Element>;
+      loginAsAdmin(): Chainable<Element>;
+      loginAsUser(): Chainable<Element>;
+    }
+  }
+}
+
+export {};

cypress/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["es5", "dom"],
+    "types": ["cypress", "node"],
+    "resolveJsonModule": true,
+    "esModuleInterop": true
+  },
+  "include": ["**/*.ts"]
+}

docs/SUMMARY.md

@@ -14,6 +14,7 @@
   - [Email](using-overseerr/notifications/email.md)
   - [Web Push](using-overseerr/notifications/webpush.md)
   - [Discord](using-overseerr/notifications/discord.md)
+  - [Gotify](using-overseerr/notifications/gotify.md)
   - [LunaSea](using-overseerr/notifications/lunasea.md)
   - [Pushbullet](using-overseerr/notifications/pushbullet.md)
   - [Pushover](using-overseerr/notifications/pushover.md)

docs/extending-overseerr/fail2ban.md

@@ -8,7 +8,7 @@ To use Fail2ban with Overseerr, create a new file named `overseerr.local` in you
 
 ```
 [Definition]
-failregex = .*\[info\]\[Auth\]\: Failed sign-in attempt.*"ip":"<HOST>"
+failregex = .*\[warn\]\[API\]\: Failed sign-in attempt.*"ip":"<HOST>"
 ```
 
 You can then add a jail using this filter in `jail.local`. Please see the [Fail2ban documetation](https://www.fail2ban.org/wiki/index.php/MANUAL_0_8#Jails) for details on how to configure the jail.

docs/extending-overseerr/third-party.md

@@ -9,7 +9,7 @@
 - [LunaSea](https://docs.lunasea.app/modules/overseerr), a self-hosted controller for mobile and macOS
 - [Requestrr](https://github.com/darkalfx/requestrr/wiki/Configuring-Overseerr), a Discord chatbot
 - [Doplarr](https://github.com/kiranshila/Doplarr), a Discord request bot
-- [Overseerr Assistant](https://github.com/RemiRigal/Overseerr-Assistant), a browser extension for requesting directly from TMDb and IMDb
+- [Overseerr Assistant](https://github.com/RemiRigal/Overseerr-Assistant), a browser extension for requesting directly from TMDB and IMDb
 - [ha-overseerr](https://github.com/vaparr/ha-overseerr), a custom Home Assistant component
 - [OverCLIrr](https://github.com/WillFantom/OverCLIrr), a command-line tool
 - [Overseerr Exporter](https://github.com/WillFantom/overseerr-exporter), a Prometheus exporter

docs/getting-started/installation.md

@@ -143,7 +143,7 @@ or the Docker Desktop app:
 Then, create and start the Overseerr container:
 
 ```bash
-docker run -d -e LOG_LEVEL=debug -e TZ=Asia/Tokyo -p 5055:5055 -v "overseerr-data:/app/config" --restart unless-stopped sctx/overseerr
+docker run -d --name overseerr -e LOG_LEVEL=debug -e TZ=Asia/Tokyo -p 5055:5055 -v "overseerr-data:/app/config" --restart unless-stopped sctx/overseerr:latest
 ```
 
 If using a named volume like above, you can safely ignore the warning about the `/app/config` folder being incorrectly mounted on the setup page.

docs/support/faq.md

@@ -45,7 +45,7 @@ Overseerr currently supports the following agents:
 - New Plex TV
 - Legacy Plex TV
 - TheTVDB
-- TMDb
+- TMDB
 - [HAMA](https://github.com/ZeroQI/Hama.bundle)
 
 Please verify that your library is using one of the agents previously listed.
@@ -67,7 +67,7 @@ You can also perform the following to verify the media item has a GUID Overseerr
 1. Go to the media item in Plex and **"Get info"** and click on **"View XML"**.
 2. Verify that the media item's GUID follows one of the below formats:
 
-   1. TMDb agent `guid="com.plexapp.agents.themoviedb://1705"`
+   1. TMDB agent `guid="com.plexapp.agents.themoviedb://1705"`
    2. New Plex Movie agent `<Guid id="tmdb://464052"/>`
    3. TheTVDB agent `guid="com.plexapp.agents.thetvdb://78874/1/1"`
    4. Legacy Plex Movie agent `guid="com.plexapp.agents.imdb://tt0765446"`

docs/support/need-help.md

@@ -19,6 +19,11 @@ Please try to include as much information as possible. A vague statement like "i
 
 Try to answer the following questions:
 
+- What version of Overseerr are you running? (You can find this in Settings → About → Version.)
+- How did you install Overseerr? Are you using the official Docker or snap images, or images published by a third-party?
+- How are you accessing Overseerr?
+  - Are you accessing Overseerr through your reverse proxy or via a local IP address?
+  - What browser are you using? What browser extensions are enabled?
 - What were you trying to do, and how did you attempt it?
   - What command did you enter?
   - What did you click on?

docs/using-overseerr/notifications/README.md

@@ -7,6 +7,7 @@ Overseerr currently supports the following notification agents:
 - [Email](./email.md)
 - [Web Push](./webpush.md)
 - [Discord](./discord.md)
+- [Gotify](./gotify.md)
 - [LunaSea](./lunasea.md)
 - [Pushbullet](./pushbullet.md)
 - [Pushover](./pushover.md)

docs/using-overseerr/notifications/gotify.md

@@ -0,0 +1,15 @@
+# Gotify
+
+## Configuration
+
+### Server URL
+
+Set this to the URL of your Gotify server.
+
+### Application Token
+
+Add an application to your Gotify server, and set this field to the generated application token.
+
+{% hint style="info" %}
+Please refer to the [Gotify API documentation](https://gotify.net/docs) for more details on configuring these notifications.
+{% endhint %}

docs/using-overseerr/notifications/pushbullet.md

@@ -11,3 +11,7 @@ User notifications are separate from system notifications, and the available not
 ### Access Token
 
 [Create an access token](https://www.pushbullet.com/#settings) and set it here to grant Overseerr access to the Pushbullet API.
+
+### Channel Tag (optional)
+
+Optionally, [create a channel](https://www.pushbullet.com/my-channel) to allow other users to follow the notification feed using the specified channel tag.

docs/using-overseerr/notifications/webhooks.md

@@ -47,15 +47,15 @@ These variables are for the target recipient of the notification.
 {% hint style="info" %}
 The `notifyuser` variables are not defined for the following request notification types, as they are intended for application administrators rather than end users:
 
-- Media Requested
-- Media Automatically Approved
-- Media Failed
+- Request Pending Approval
+- Request Automatically Approved
+- Request Processing Failed
 
 On the other hand, the `notifyuser` variables _will_ be replaced with the requesting user's information for the below notification types:
 
-- Media Approved
-- Media Declined
-- Media Available
+- Request Approved
+- Request Declined
+- Request Available
 
 If you would like to use the requesting user's information in your webhook, please instead include the relevant variables from the [Request](#request) section below.
 {% endhint %}
@@ -81,7 +81,7 @@ These following special variables are only included in media-related notificatio
 | Variable             | Value                                                                                                          |
 | -------------------- | -------------------------------------------------------------------------------------------------------------- |
 | `{{media_type}}`     | The media type (`movie` or `tv`)                                                                               |
-| `{{media_tmdbid}}`   | The media's TMDb ID                                                                                            |
+| `{{media_tmdbid}}`   | The media's TMDB ID                                                                                            |
 | `{{media_tvdbid}}`   | The media's TheTVDB ID                                                                                         |
 | `{{media_status}}`   | The media's availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`)    |
 | `{{media_status4k}}` | The media's 4K availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`) |

docs/using-overseerr/users/README.md

@@ -8,9 +8,9 @@ The user account created during Overseerr setup is the "Owner" account, which ca
 
 There are currently two methods to add users to Overseerr: importing Plex users and creating "local users." All new users are created with the [default permissions](../settings/README.md#default-permissions) defined in **Settings → Users**.
 
-### Importing Users from Plex
+### Importing Plex Users
 
-Clicking the **Import Users from Plex** button on the **User List** page will fetch the list of users with access to the Plex server from [plex.tv](https://www.plex.tv/), and add them to Overseerr automatically.
+Clicking the **Import Plex Users** button on the **User List** page will fetch the list of users with access to the Plex server from [plex.tv](https://www.plex.tv/), and add them to Overseerr automatically.
 
 Importing Plex users is not required, however. Any user with access to the Plex server can log in to Overseerr even if they have not been imported, and will be assigned the configured [default permissions](../settings/README.md#default-permissions) upon their first login.
 

merged-prettier-plugin.js

@@ -0,0 +1,21 @@
+/* eslint-disable */
+const tailwind = require('prettier-plugin-tailwindcss');
+const organizeImports = require('prettier-plugin-organize-imports');
+
+const combinedFormatter = {
+  ...tailwind,
+  parsers: {
+    ...tailwind.parsers,
+    ...Object.keys(organizeImports.parsers).reduce((acc, key) => {
+      acc[key] = {
+        ...tailwind.parsers[key],
+        preprocess(code, options) {
+          return organizeImports.parsers[key].preprocess(code, options);
+        },
+      };
+      return acc;
+    }, {}),
+  },
+};
+
+module.exports = combinedFormatter;

next-env.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

next.config.js

@@ -1,3 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',

overseerr-api.yml

@@ -121,6 +121,9 @@ components:
         hideAvailable:
           type: boolean
           example: false
+        hideRequested:
+          type: boolean
+          example: false
         partialRequestsEnabled:
           type: boolean
           example: false
@@ -165,6 +168,9 @@ components:
         port:
           type: number
           example: 32400
+        useSsl:
+          type: boolean
+          nullable: true
         libraries:
           type: array
           readOnly: true
@@ -172,6 +178,7 @@ components:
             $ref: '#/components/schemas/PlexLibrary'
         webAppUrl:
           type: string
+          nullable: true
           example: 'https://app.plex.tv/desktop'
       required:
         - name
@@ -298,6 +305,26 @@ components:
         - provides
         - owned
         - connection
+    TautulliSettings:
+      type: object
+      properties:
+        hostname:
+          type: string
+          nullable: true
+          example: 'tautulli.example.com'
+        port:
+          type: number
+          nullable: true
+          example: 8181
+        useSsl:
+          type: boolean
+          nullable: true
+        apiKey:
+          type: string
+          nullable: true
+        externalUrl:
+          type: string
+          nullable: true
     RadarrSettings:
       type: object
       properties:
@@ -1138,6 +1165,8 @@ components:
               type: string
             webhookUrl:
               type: string
+            enableMentions:
+              type: boolean
     SlackSettings:
       type: object
       properties:
@@ -1213,6 +1242,9 @@ components:
           properties:
             accessToken:
               type: string
+            channelTag:
+              type: string
+              nullable: true
     PushoverSettings:
       type: object
       properties:
@@ -1229,6 +1261,22 @@ components:
               type: string
             userToken:
               type: string
+    GotifySettings:
+      type: object
+      properties:
+        enabled:
+          type: boolean
+          example: false
+        types:
+          type: number
+          example: 2
+        options:
+          type: object
+          properties:
+            url:
+              type: string
+            token:
+              type: string
     LunaSeaSettings:
       type: object
       properties:
@@ -1308,7 +1356,7 @@ components:
         running:
           type: boolean
           example: false
-    PersonDetail:
+    PersonDetails:
       type: object
       properties:
         id:
@@ -1748,14 +1796,14 @@ components:
 paths:
   /status:
     get:
-      summary: Get Overseerr version
-      description: Returns the current Overseerr version in a JSON object.
+      summary: Get Overseerr status
+      description: Returns the current Overseerr status in a JSON object.
       security: []
       tags:
         - public
       responses:
         '200':
-          description: Returned version
+          description: Returned status
           content:
             application/json:
               schema:
@@ -1766,6 +1814,12 @@ paths:
                     example: 1.0.0
                   commitTag:
                     type: string
+                  updateAvailable:
+                    type: boolean
+                  commitsBehind:
+                    type: number
+                  restartRequired:
+                    type: boolean
   /status/appdata:
     get:
       summary: Get application data volume status
@@ -1976,6 +2030,67 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/PlexDevice'
+  /settings/plex/users:
+    get:
+      summary: Get Plex users
+      description: |
+        Returns a list of Plex users in a JSON array.
+
+        Requires the `MANAGE_USERS` permission.
+      tags:
+        - settings
+        - users
+      responses:
+        '200':
+          description: Plex users
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: string
+                    title:
+                      type: string
+                    username:
+                      type: string
+                    email:
+                      type: string
+                    thumb:
+                      type: string
+  /settings/tautulli:
+    get:
+      summary: Get Tautulli settings
+      description: Retrieves current Tautulli settings.
+      tags:
+        - settings
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TautulliSettings'
+    post:
+      summary: Update Tautulli settings
+      description: Updates Tautulli settings with the provided values.
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/TautulliSettings'
+      responses:
+        '200':
+          description: 'Values were successfully updated'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TautulliSettings'
   /settings/radarr:
     get:
       summary: Get Radarr settings
@@ -2679,6 +2794,52 @@ paths:
       responses:
         '204':
           description: Test notification attempted
+  /settings/notifications/gotify:
+    get:
+      summary: Get Gotify notification settings
+      description: Returns current Gotify notification settings in a JSON object.
+      tags:
+        - settings
+      responses:
+        '200':
+          description: Returned Gotify settings
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GotifySettings'
+    post:
+      summary: Update Gotify notification settings
+      description: Update Gotify notification settings with the provided values.
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/GotifySettings'
+      responses:
+        '200':
+          description: 'Values were sucessfully updated'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GotifySettings'
+  /settings/notifications/gotify/test:
+    post:
+      summary: Test Gotify settings
+      description: Sends a test notification to the Gotify agent.
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/GotifySettings'
+      responses:
+        '204':
+          description: Test notification attempted
   /settings/notifications/slack:
     get:
       summary: Get Slack notification settings
@@ -2890,6 +3051,9 @@ paths:
                     type: string
                     nullable: true
                     example: Asia/Tokyo
+                  appDataPath:
+                    type: string
+                    example: /app/config
   /auth/me:
     get:
       summary: Get logged-in user
@@ -3010,6 +3174,13 @@ paths:
       security: []
       tags:
         - users
+      parameters:
+        - in: path
+          name: guid
+          required: true
+          schema:
+            type: string
+            example: '9afef5a7-ec89-4d5f-9397-261e96970b50'
       responses:
         '200':
           description: OK
@@ -3132,11 +3303,22 @@ paths:
     post:
       summary: Import all users from Plex
       description: |
-        Requests users from the Plex Server and creates a new user for each of them
+        Fetches and imports users from the Plex server. If a list of Plex IDs is provided in the request body, only the specified users will be imported. Otherwise, all users will be imported.
 
         Requires the `MANAGE_USERS` permission.
       tags:
         - users
+      requestBody:
+        required: false
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                plexIds:
+                  type: array
+                  items:
+                    type: string
       responses:
         '201':
           description: A list of the newly created users
@@ -3333,6 +3515,53 @@ paths:
                       restricted:
                         type: boolean
                         example: false
+  /user/{userId}/watchlist:
+    get:
+      summary: Get user by ID
+      description: |
+        Retrieves a user's Plex Watchlist in a JSON object.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+      responses:
+        '200':
+          description: Watchlist data returned
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                  totalPages:
+                    type: number
+                  totalResults:
+                    type: number
+                  results:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        tmdbId:
+                          type: number
+                          example: 1
+                        ratingKey:
+                          type: string
+                        type:
+                          type: string
+                        title:
+                          type: string
   /user/{userId}/settings/main:
     get:
       summary: Get general settings for a user
@@ -3538,6 +3767,35 @@ paths:
                   permissions:
                     type: number
                     example: 2
+  /user/{userId}/watch_data:
+    get:
+      summary: Get watch data
+      description: |
+        Returns play count, play duration, and recently watched media.
+
+        Requires the `ADMIN` permission to fetch results for other users.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '200':
+          description: Users
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  recentlyWatched:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/MediaInfo'
+                  playCount:
+                    type: number
   /search:
     get:
       summary: Search for movies, TV shows, or people
@@ -4195,6 +4453,46 @@ paths:
                     name:
                       type: string
                       example: Genre Name
+  /discover/watchlist:
+    get:
+      summary: Get the Plex watchlist.
+      tags:
+        - search
+      parameters:
+        - in: query
+          name: page
+          schema:
+            type: number
+            example: 1
+            default: 1
+      responses:
+        '200':
+          description: Watchlist data returned
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  page:
+                    type: number
+                  totalPages:
+                    type: number
+                  totalResults:
+                    type: number
+                  results:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        tmdbId:
+                          type: number
+                          example: 1
+                        ratingKey:
+                          type: string
+                        type:
+                          type: string
+                        title:
+                          type: string
   /request:
     get:
       summary: Get all requests
@@ -4222,7 +4520,16 @@ paths:
           schema:
             type: string
             nullable: true
-            enum: [all, approved, available, pending, processing, unavailable]
+            enum:
+              [
+                all,
+                approved,
+                available,
+                pending,
+                processing,
+                unavailable,
+                failed,
+              ]
         - in: query
           name: sort
           schema:
@@ -4317,21 +4624,22 @@ paths:
               schema:
                 type: object
                 properties:
+                  total:
+                    type: number
+                  movie:
+                    type: number
+                  tv:
+                    type: number
                   pending:
                     type: number
-                    example: 0
                   approved:
                     type: number
-                    example: 10
+                  declined:
+                    type: number
                   processing:
                     type: number
-                    example: 4
                   available:
                     type: number
-                    example: 6
-                required:
-                  - pending
-                  - approved
   /request/{requestId}:
     get:
       summary: Get MediaRequest
@@ -4807,8 +5115,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/PersonDetail'
-
+                $ref: '#/components/schemas/PersonDetails'
   /person/{personId}/combined_credits:
     get:
       summary: Get combined credits
@@ -4945,6 +5252,57 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/MediaInfo'
+  /media/{mediaId}/watch_data:
+    get:
+      summary: Get watch data
+      description: |
+        Returns play count, play duration, and users who have watched the media.
+
+        Requires the `ADMIN` permission.
+      tags:
+        - media
+      parameters:
+        - in: path
+          name: mediaId
+          description: Media ID
+          required: true
+          example: '1'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Users
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  data:
+                    type: object
+                    properties:
+                      playCount7Days:
+                        type: number
+                      playCount30Days:
+                        type: number
+                      playCount:
+                        type: number
+                      users:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/User'
+                  data4k:
+                    type: object
+                    properties:
+                      playCount7Days:
+                        type: number
+                      playCount30Days:
+                        type: number
+                      playCount:
+                        type: number
+                      users:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/User'
   /collection/{collectionId}:
     get:
       summary: Get collection details
@@ -5074,7 +5432,7 @@ paths:
                   $ref: '#/components/schemas/SonarrSeries'
   /regions:
     get:
-      summary: Regions supported by TMDb
+      summary: Regions supported by TMDB
       description: Returns a list of regions in a JSON object.
       tags:
         - tmdb
@@ -5096,7 +5454,7 @@ paths:
                       example: United States of America
   /languages:
     get:
-      summary: Languages supported by TMDb
+      summary: Languages supported by TMDB
       description: Returns a list of languages in a JSON object.
       tags:
         - tmdb
@@ -5161,7 +5519,7 @@ paths:
                 $ref: '#/components/schemas/ProductionCompany'
   /genres/movie:
     get:
-      summary: Get list of official TMDb movie genres
+      summary: Get list of official TMDB movie genres
       description: Returns a list of genres in a JSON array.
       tags:
         - tmdb
@@ -5189,7 +5547,7 @@ paths:
                       example: Family
   /genres/tv:
     get:
-      summary: Get list of official TMDb movie genres
+      summary: Get list of official TMDB movie genres
       description: Returns a list of genres in a JSON array.
       tags:
         - tmdb
@@ -5309,6 +5667,36 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Issue'
+
+  /issue/count:
+    get:
+      summary: Gets issue counts
+      description: |
+        Returns the number of open and closed issues, as well as the number of issues of each type.
+      tags:
+        - issue
+      responses:
+        '200':
+          description: Issue counts returned
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  total:
+                    type: number
+                  video:
+                    type: number
+                  audio:
+                    type: number
+                  subtitles:
+                    type: number
+                  others:
+                    type: number
+                  open:
+                    type: number
+                  closed:
+                    type: number
   /issue/{issueId}:
     get:
       summary: Get issue

package.json

@@ -3,17 +3,25 @@
   "version": "0.1.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",
-    "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates",
+    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
+    "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
     "build:next": "next build",
     "build": "yarn build:next && yarn build:server",
-    "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\"",
+    "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache",
     "start": "NODE_ENV=production node dist/index.js",
     "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/typeorm/cli.js migration:generate",
-    "migration:create": "ts-node --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create",
-    "migration:run": "ts-node --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run",
-    "format": "prettier --write ."
+    "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts",
+    "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts",
+    "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts",
+    "format": "prettier --loglevel warn --write --cache .",
+    "format:check": "prettier --check --cache .",
+    "typecheck": "yarn typecheck:server && yarn typecheck:client",
+    "typecheck:server": "tsc --project server/tsconfig.json --noEmit",
+    "typecheck:client": "tsc --noEmit",
+    "prepare": "husky install",
+    "cypress:open": "cypress open",
+    "cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts",
+    "cypress:build": "yarn build && yarn cypress:prepare"
   },
   "repository": {
     "type": "git",
@@ -21,145 +29,152 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@headlessui/react": "^1.4.1",
-    "@heroicons/react": "^1.0.4",
-    "@supercharge/request-ip": "^1.1.2",
-    "@svgr/webpack": "^5.5.0",
-    "@tanem/react-nprogress": "^3.0.79",
-    "ace-builds": "^1.4.12",
-    "axios": "^0.21.4",
-    "bcrypt": "^5.0.1",
-    "bowser": "^2.11.0",
-    "connect-typeorm": "^1.1.4",
-    "cookie-parser": "^1.4.5",
-    "copy-to-clipboard": "^3.3.1",
-    "country-flag-icons": "^1.4.10",
-    "csurf": "^1.11.0",
-    "email-templates": "^8.0.8",
-    "express": "^4.17.1",
-    "express-openapi-validator": "^4.13.1",
-    "express-rate-limit": "^5.3.0",
-    "express-session": "^1.17.2",
-    "formik": "^2.2.9",
+    "@formatjs/intl-displaynames": "6.0.3",
+    "@formatjs/intl-locale": "3.0.3",
+    "@formatjs/intl-pluralrules": "5.0.3",
+    "@formatjs/intl-utils": "3.8.4",
+    "@headlessui/react": "^0.0.0-insiders.b301f04",
+    "@heroicons/react": "1.0.6",
+    "@supercharge/request-ip": "1.2.0",
+    "@svgr/webpack": "6.3.1",
+    "@tanem/react-nprogress": "5.0.11",
+    "ace-builds": "1.9.6",
+    "axios": "0.27.2",
+    "axios-rate-limit": "1.3.0",
+    "bcrypt": "5.0.1",
+    "bowser": "2.11.0",
+    "connect-typeorm": "1.1.4",
+    "cookie-parser": "1.4.6",
+    "copy-to-clipboard": "3.3.2",
+    "country-flag-icons": "1.5.5",
+    "csurf": "1.11.0",
+    "date-fns": "2.29.1",
+    "email-templates": "9.0.0",
+    "express": "4.18.1",
+    "express-openapi-validator": "4.13.8",
+    "express-rate-limit": "6.5.1",
+    "express-session": "1.17.3",
+    "formik": "2.2.9",
     "gravatar-url": "3.1.0",
-    "intl": "^1.2.5",
-    "lodash": "^4.17.21",
-    "next": "11.1.2",
-    "node-cache": "^5.1.2",
-    "node-schedule": "^2.0.0",
-    "nodemailer": "^6.6.3",
-    "openpgp": "^5.0.0-3",
-    "plex-api": "^5.3.1",
-    "pug": "^3.0.2",
-    "react": "17.0.2",
-    "react-ace": "^9.3.0",
-    "react-animate-height": "^2.0.23",
-    "react-dom": "17.0.2",
-    "react-intersection-observer": "^8.32.1",
-    "react-intl": "5.20.10",
-    "react-markdown": "^6.0.2",
-    "react-select": "^4.3.1",
-    "react-spring": "^9.2.4",
-    "react-toast-notifications": "^2.5.1",
-    "react-transition-group": "^4.4.2",
-    "react-truncate-markup": "^5.1.0",
-    "react-use-clipboard": "1.0.7",
-    "reflect-metadata": "^0.1.13",
-    "secure-random-password": "^0.2.3",
-    "sqlite3": "^5.0.2",
-    "swagger-ui-express": "^4.1.6",
-    "swr": "^0.5.6",
-    "typeorm": "0.2.37",
-    "web-push": "^3.4.5",
-    "winston": "^3.3.3",
-    "winston-daily-rotate-file": "^4.5.5",
-    "xml2js": "^0.4.23",
-    "yamljs": "^0.3.0",
-    "yup": "^0.32.9"
+    "intl": "1.2.5",
+    "lodash": "4.17.21",
+    "next": "12.2.5",
+    "node-cache": "5.1.2",
+    "node-gyp": "9.1.0",
+    "node-schedule": "2.1.0",
+    "nodemailer": "6.7.8",
+    "openpgp": "5.4.0",
+    "plex-api": "5.3.2",
+    "pug": "3.0.2",
+    "react": "18.2.0",
+    "react-ace": "10.1.0",
+    "react-animate-height": "2.1.2",
+    "react-dom": "18.2.0",
+    "react-intersection-observer": "9.4.0",
+    "react-intl": "6.0.5",
+    "react-markdown": "8.0.3",
+    "react-popper-tooltip": "4.4.2",
+    "react-select": "5.4.0",
+    "react-spring": "9.5.2",
+    "react-toast-notifications": "2.5.1",
+    "react-truncate-markup": "5.1.2",
+    "react-use-clipboard": "1.0.8",
+    "reflect-metadata": "0.1.13",
+    "secure-random-password": "0.2.3",
+    "semver": "7.3.7",
+    "sqlite3": "5.0.11",
+    "swagger-ui-express": "4.5.0",
+    "swr": "1.3.0",
+    "typeorm": "0.3.7",
+    "web-push": "3.5.0",
+    "winston": "3.8.1",
+    "winston-daily-rotate-file": "4.7.1",
+    "xml2js": "0.4.23",
+    "yamljs": "0.3.0",
+    "yup": "0.32.11"
   },
   "devDependencies": {
-    "@babel/cli": "^7.15.7",
-    "@commitlint/cli": "^13.1.0",
-    "@commitlint/config-conventional": "^13.1.0",
-    "@semantic-release/changelog": "^5.0.1",
-    "@semantic-release/commit-analyzer": "^9.0.1",
-    "@semantic-release/exec": "^5.0.0",
-    "@semantic-release/git": "^9.0.1",
-    "@tailwindcss/aspect-ratio": "^0.2.1",
-    "@tailwindcss/forms": "^0.3.3",
-    "@tailwindcss/typography": "^0.4.1",
-    "@types/bcrypt": "^5.0.0",
-    "@types/cookie-parser": "^1.4.2",
-    "@types/country-flag-icons": "^1.2.0",
-    "@types/csurf": "^1.11.2",
-    "@types/email-templates": "^8.0.4",
-    "@types/express": "^4.17.13",
-    "@types/express-rate-limit": "^5.1.3",
-    "@types/express-session": "^1.17.3",
-    "@types/lodash": "^4.14.173",
-    "@types/node": "^15.6.1",
-    "@types/node-schedule": "^1.3.2",
-    "@types/nodemailer": "^6.4.4",
-    "@types/react": "^17.0.22",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-select": "^4.0.17",
-    "@types/react-toast-notifications": "^2.4.1",
-    "@types/react-transition-group": "^4.4.3",
-    "@types/secure-random-password": "^0.2.1",
-    "@types/swagger-ui-express": "^4.1.3",
-    "@types/web-push": "^3.3.2",
-    "@types/xml2js": "^0.4.9",
-    "@types/yamljs": "^0.2.31",
-    "@types/yup": "^0.29.13",
-    "@typescript-eslint/eslint-plugin": "^4.31.1",
-    "@typescript-eslint/parser": "^4.31.1",
-    "autoprefixer": "^10.3.4",
-    "babel-plugin-react-intl": "^8.2.25",
-    "babel-plugin-react-intl-auto": "^3.3.0",
-    "commitizen": "^4.2.4",
-    "copyfiles": "^2.4.1",
-    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^7.32.0",
-    "eslint-config-next": "^11.1.2",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-formatjs": "^2.17.6",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.25.3",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "extract-react-intl-messages": "^4.1.1",
-    "husky": "4.3.8",
-    "lint-staged": "^11.1.2",
-    "nodemon": "^2.0.12",
-    "postcss": "^8.3.6",
-    "prettier": "^2.4.1",
-    "semantic-release": "^18.0.0",
-    "semantic-release-docker-buildx": "^1.0.1",
-    "tailwindcss": "^2.2.15",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.4.3"
+    "@babel/cli": "7.18.10",
+    "@commitlint/cli": "17.0.3",
+    "@commitlint/config-conventional": "17.0.3",
+    "@semantic-release/changelog": "6.0.1",
+    "@semantic-release/commit-analyzer": "9.0.2",
+    "@semantic-release/exec": "6.0.3",
+    "@semantic-release/git": "10.0.1",
+    "@tailwindcss/aspect-ratio": "0.4.0",
+    "@tailwindcss/forms": "0.5.2",
+    "@tailwindcss/typography": "0.5.4",
+    "@types/bcrypt": "5.0.0",
+    "@types/cookie-parser": "1.4.3",
+    "@types/country-flag-icons": "1.2.0",
+    "@types/csurf": "1.11.2",
+    "@types/email-templates": "8.0.4",
+    "@types/express": "4.17.13",
+    "@types/express-session": "1.17.4",
+    "@types/lodash": "4.14.183",
+    "@types/node": "17.0.36",
+    "@types/node-schedule": "2.1.0",
+    "@types/nodemailer": "6.4.5",
+    "@types/react": "18.0.17",
+    "@types/react-dom": "18.0.6",
+    "@types/react-transition-group": "4.4.5",
+    "@types/secure-random-password": "0.2.1",
+    "@types/semver": "7.3.12",
+    "@types/swagger-ui-express": "4.1.3",
+    "@types/web-push": "3.3.2",
+    "@types/xml2js": "0.4.11",
+    "@types/yamljs": "0.2.31",
+    "@types/yup": "0.29.14",
+    "@typescript-eslint/eslint-plugin": "5.33.1",
+    "@typescript-eslint/parser": "5.33.1",
+    "autoprefixer": "10.4.8",
+    "babel-plugin-react-intl": "8.2.25",
+    "babel-plugin-react-intl-auto": "3.3.0",
+    "commitizen": "4.2.5",
+    "copyfiles": "2.4.1",
+    "cypress": "10.6.0",
+    "cz-conventional-changelog": "3.3.0",
+    "eslint": "8.22.0",
+    "eslint-config-next": "12.2.5",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-formatjs": "4.1.0",
+    "eslint-plugin-jsx-a11y": "6.6.1",
+    "eslint-plugin-no-relative-import-paths": "1.4.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-react": "7.30.1",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "extract-react-intl-messages": "4.1.1",
+    "husky": "8.0.1",
+    "lint-staged": "12.4.3",
+    "nodemon": "2.0.19",
+    "postcss": "8.4.16",
+    "prettier": "2.7.1",
+    "prettier-plugin-organize-imports": "3.1.0",
+    "prettier-plugin-tailwindcss": "0.1.13",
+    "semantic-release": "19.0.3",
+    "semantic-release-docker-buildx": "1.0.1",
+    "tailwindcss": "3.1.8",
+    "ts-node": "10.9.1",
+    "tsc-alias": "1.7.0",
+    "tsconfig-paths": "4.1.0",
+    "typescript": "4.7.4"
   },
   "resolutions": {
-    "sqlite3/node-gyp": "^5.1.0"
+    "sqlite3/node-gyp": "8.4.1",
+    "@types/react": "18.0.17",
+    "@types/react-dom": "18.0.6"
   },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "prepare-commit-msg": "exec < /dev/tty && git cz --hook || true",
-      "commit-msg": "[[ -n $HUSKY_BYPASS ]] || commitlint -E HUSKY_GIT_PARAMS"
-    }
-  },
   "lint-staged": {
     "**/*.{ts,tsx,js}": [
       "prettier --write",
       "eslint"
     ],
-    "**/*.{json,md}": [
+    "**/*.{json,md,css}": [
       "prettier --write"
     ]
   },
@@ -168,10 +183,6 @@
       "@commitlint/config-conventional"
     ]
   },
-  "prettier": {
-    "singleQuote": true,
-    "trailingComma": "es5"
-  },
   "release": {
     "plugins": [
       "@semantic-release/commit-analyzer",

public/offline.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#1f2937" />
 
     <title>You are offline</title>
 

renovate.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:js-app",
+    "group:allNonMajor",
+    "docker:disableMajor",
+    "helpers:disableTypesNodeMajor"
+  ],
+  "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "groupName": "GitHub Actions",
+      "groupSlug": "github-actions"
+    },
+    {
+      "matchPackageNames": ["node"],
+      "groupName": "Node.js",
+      "groupSlug": "node"
+    }
+  ]
+}

server/api/animelist.ts

@@ -1,8 +1,8 @@
+import logger from '@server/logger';
 import axios from 'axios';
-import xml2js from 'xml2js';
 import fs, { promises as fsp } from 'fs';
 import path from 'path';
-import logger from '../logger';
+import xml2js from 'xml2js';
 
 const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
 // originally at https://raw.githubusercontent.com/ScudLee/anime-lists/master/anime-list.xml
@@ -14,7 +14,7 @@ const LOCAL_PATH = process.env.CONFIG_DIRECTORY
 
 const mappingRegexp = new RegExp(/;[0-9]+-([0-9]+)/g);
 
-// Anime-List xml files are community maintained mappings that Hama agent uses to map AniDB IDs to TVDB/TMDb IDs
+// Anime-List xml files are community maintained mappings that Hama agent uses to map AniDB IDs to TVDB/TMDB IDs
 // https://github.com/Anime-Lists/anime-lists/
 
 interface AnimeMapping {

server/api/externalapi.ts

@@ -1,5 +1,7 @@
-import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
-import NodeCache from 'node-cache';
+import type { AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+import rateLimit from 'axios-rate-limit';
+import type NodeCache from 'node-cache';
 
 // 5 minute default TTL (in seconds)
 const DEFAULT_TTL = 300;
@@ -10,6 +12,10 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
   nodeCache?: NodeCache;
   headers?: Record<string, unknown>;
+  rateLimit?: {
+    maxRPS: number;
+    maxRequests: number;
+  };
 }
 
 class ExternalAPI {
@@ -31,6 +37,14 @@ class ExternalAPI {
         ...options.headers,
       },
     });
+
+    if (options.rateLimit) {
+      this.axios = rateLimit(this.axios, {
+        maxRequests: options.rateLimit.maxRequests,
+        maxRPS: options.rateLimit.maxRPS,
+      });
+    }
+
     this.baseUrl = baseUrl;
     this.cache = options.nodeCache;
   }

server/api/github.ts

@@ -1,5 +1,5 @@
-import cacheManager from '../lib/cache';
-import logger from '../logger';
+import cacheManager from '@server/lib/cache';
+import logger from '@server/logger';
 import ExternalAPI from './externalapi';
 
 interface GitHubRelease {

server/api/plexapi.ts

@@ -1,6 +1,7 @@
+import type { Library, PlexSettings } from '@server/lib/settings';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
 import NodePlexAPI from 'plex-api';
-import { getSettings, Library, PlexSettings } from '../lib/settings';
-import logger from '../logger';
 
 export interface PlexLibraryItem {
   ratingKey: string;
@@ -130,7 +131,6 @@ class PlexAPI {
     });
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   public async getStatus() {
     return await this.plexClient.query('/');
   }

server/api/plextv.ts

@@ -1,8 +1,9 @@
-import axios, { AxiosInstance } from 'axios';
+import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
+import cacheManager from '@server/lib/cache';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
 import xml2js from 'xml2js';
-import { PlexDevice } from '../interfaces/api/plexInterfaces';
-import { getSettings } from '../lib/settings';
-import logger from '../logger';
+import ExternalAPI from './externalapi';
 
 interface PlexAccountResponse {
   user: PlexUser;
@@ -111,20 +112,54 @@ interface UsersResponse {
   };
 }
 
-class PlexTvAPI {
+interface WatchlistResponse {
+  MediaContainer: {
+    totalSize: number;
+    Metadata?: {
+      ratingKey: string;
+    }[];
+  };
+}
+
+interface MetadataResponse {
+  MediaContainer: {
+    Metadata: {
+      ratingKey: string;
+      type: 'movie' | 'show';
+      title: string;
+      Guid: {
+        id: `imdb://tt${number}` | `tmdb://${number}` | `tvdb://${number}`;
+      }[];
+    }[];
+  };
+}
+
+export interface PlexWatchlistItem {
+  ratingKey: string;
+  tmdbId: number;
+  tvdbId?: number;
+  type: 'movie' | 'show';
+  title: string;
+}
+
+class PlexTvAPI extends ExternalAPI {
   private authToken: string;
-  private axios: AxiosInstance;
 
   constructor(authToken: string) {
+    super(
+      'https://plex.tv',
+      {},
+      {
+        headers: {
+          'X-Plex-Token': authToken,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+        nodeCache: cacheManager.getCache('plextv').data,
+      }
+    );
+
     this.authToken = authToken;
-    this.axios = axios.create({
-      baseURL: 'https://plex.tv',
-      headers: {
-        'X-Plex-Token': this.authToken,
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-    });
   }
 
   public async getDevices(): Promise<PlexDevice[]> {
@@ -224,7 +259,7 @@ class PlexTvAPI {
 
       const users = friends.MediaContainer.User;
 
-      const user = users.find((u) => Number(u.$.id) === userId);
+      const user = users.find((u) => parseInt(u.$.id) === userId);
 
       if (!user) {
         throw new Error(
@@ -252,6 +287,83 @@ class PlexTvAPI {
     )) as UsersResponse;
     return parsedXml;
   }
+
+  public async getWatchlist({
+    offset = 0,
+    size = 20,
+  }: { offset?: number; size?: number } = {}): Promise<{
+    offset: number;
+    size: number;
+    totalSize: number;
+    items: PlexWatchlistItem[];
+  }> {
+    try {
+      const response = await this.axios.get<WatchlistResponse>(
+        '/library/sections/watchlist/all',
+        {
+          params: {
+            'X-Plex-Container-Start': offset,
+            'X-Plex-Container-Size': size,
+          },
+          baseURL: 'https://metadata.provider.plex.tv',
+        }
+      );
+
+      const watchlistDetails = await Promise.all(
+        (response.data.MediaContainer.Metadata ?? []).map(
+          async (watchlistItem) => {
+            const detailedResponse = await this.getRolling<MetadataResponse>(
+              `/library/metadata/${watchlistItem.ratingKey}`,
+              {
+                baseURL: 'https://metadata.provider.plex.tv',
+              }
+            );
+
+            const metadata = detailedResponse.MediaContainer.Metadata[0];
+
+            const tmdbString = metadata.Guid.find((guid) =>
+              guid.id.startsWith('tmdb')
+            );
+            const tvdbString = metadata.Guid.find((guid) =>
+              guid.id.startsWith('tvdb')
+            );
+
+            return {
+              ratingKey: metadata.ratingKey,
+              // This should always be set? But I guess it also cannot be?
+              // We will filter out the 0's afterwards
+              tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
+              tvdbId: tvdbString
+                ? Number(tvdbString.id.split('//')[1])
+                : undefined,
+              title: metadata.title,
+              type: metadata.type,
+            };
+          }
+        )
+      );
+
+      const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
+
+      return {
+        offset,
+        size,
+        totalSize: response.data.MediaContainer.totalSize,
+        items: filteredList,
+      };
+    } catch (e) {
+      logger.error('Failed to retrieve watchlist items', {
+        label: 'Plex.TV Metadata API',
+        errorMessage: e.message,
+      });
+      return {
+        offset,
+        size,
+        totalSize: 0,
+        items: [],
+      };
+    }
+  }
 }
 
 export default PlexTvAPI;

server/api/rottentomatoes.ts

@@ -1,4 +1,4 @@
-import cacheManager from '../lib/cache';
+import cacheManager from '@server/lib/cache';
 import ExternalAPI from './externalapi';
 
 interface RTSearchResult {

server/api/servarr/base.ts

@@ -1,6 +1,7 @@
-import cacheManager, { AvailableCacheIds } from '../../lib/cache';
-import { DVRSettings } from '../../lib/settings';
-import ExternalAPI from '../externalapi';
+import ExternalAPI from '@server/api/externalapi';
+import type { AvailableCacheIds } from '@server/lib/cache';
+import cacheManager from '@server/lib/cache';
+import type { DVRSettings } from '@server/lib/settings';
 
 export interface SystemStatus {
   version: string;

server/api/servarr/radarr.ts

@@ -1,7 +1,7 @@
-import logger from '../../logger';
+import logger from '@server/logger';
 import ServarrBase from './base';
 
-interface RadarrMovieOptions {
+export interface RadarrMovieOptions {
   title: string;
   qualityProfileId: number;
   minimumAvailability: string;
@@ -27,7 +27,6 @@ export interface RadarrMovie {
   profileId: number;
   qualityProfileId: number;
   added: string;
-  downloaded: boolean;
   hasFile: boolean;
 }
 
@@ -70,7 +69,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
       return response.data[0];
     } catch (e) {
-      logger.error('Error retrieving movie by TMDb ID', {
+      logger.error('Error retrieving movie by TMDB ID', {
         label: 'Radarr API',
         errorMessage: e.message,
         tmdbId: id,
@@ -85,7 +84,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
     try {
       const movie = await this.getMovieByTmdbId(options.tmdbId);
 
-      if (movie.downloaded) {
+      if (movie.hasFile) {
         logger.info(
           'Title already exists and is available. Skipping add and returning success',
           {

server/api/servarr/sonarr.ts

@@ -1,4 +1,4 @@
-import logger from '../../logger';
+import logger from '@server/logger';
 import ServarrBase from './base';
 
 interface SonarrSeason {
@@ -63,7 +63,7 @@ export interface SonarrSeries {
   };
 }
 
-interface AddSeriesOptions {
+export interface AddSeriesOptions {
   tvdbid: number;
   title: string;
   profileId: number;
@@ -149,6 +149,7 @@ class SonarrAPI extends ServarrBase<{ seriesId: number; episodeId: number }> {
 
       // If the series already exists, we will simply just update it
       if (series.id) {
+        series.monitored = options.monitored ?? series.monitored;
         series.tags = options.tags ?? series.tags;
         series.seasons = this.buildSeasonList(options.seasons, series.seasons);
 

server/api/tautulli.ts

@@ -0,0 +1,294 @@
+import type { User } from '@server/entity/User';
+import type { TautulliSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import type { AxiosInstance } from 'axios';
+import axios from 'axios';
+import { uniqWith } from 'lodash';
+
+export interface TautulliHistoryRecord {
+  date: number;
+  duration: number;
+  friendly_name: string;
+  full_title: string;
+  grandparent_rating_key: number;
+  grandparent_title: string;
+  original_title: string;
+  group_count: number;
+  group_ids?: string;
+  guid: string;
+  ip_address: string;
+  live: number;
+  machine_id: string;
+  media_index: number;
+  media_type: string;
+  originally_available_at: string;
+  parent_media_index: number;
+  parent_rating_key: number;
+  parent_title: string;
+  paused_counter: number;
+  percent_complete: number;
+  platform: string;
+  product: string;
+  player: string;
+  rating_key: number;
+  reference_id?: number;
+  row_id?: number;
+  session_key?: string;
+  started: number;
+  state?: string;
+  stopped: number;
+  thumb: string;
+  title: string;
+  transcode_decision: string;
+  user: string;
+  user_id: number;
+  watched_status: number;
+  year: number;
+}
+
+interface TautulliHistoryResponse {
+  response: {
+    result: string;
+    message?: string;
+    data: {
+      draw: number;
+      recordsTotal: number;
+      recordsFiltered: number;
+      total_duration: string;
+      filter_duration: string;
+      data: TautulliHistoryRecord[];
+    };
+  };
+}
+
+interface TautulliWatchStats {
+  query_days: number;
+  total_time: number;
+  total_plays: number;
+}
+
+interface TautulliWatchStatsResponse {
+  response: {
+    result: string;
+    message?: string;
+    data: TautulliWatchStats[];
+  };
+}
+
+interface TautulliWatchUser {
+  friendly_name: string;
+  user_id: number;
+  user_thumb: string;
+  username: string;
+  total_plays: number;
+  total_time: number;
+}
+
+interface TautulliWatchUsersResponse {
+  response: {
+    result: string;
+    message?: string;
+    data: TautulliWatchUser[];
+  };
+}
+
+interface TautulliInfo {
+  tautulli_install_type: string;
+  tautulli_version: string;
+  tautulli_branch: string;
+  tautulli_commit: string;
+  tautulli_platform: string;
+  tautulli_platform_release: string;
+  tautulli_platform_version: string;
+  tautulli_platform_linux_distro: string;
+  tautulli_platform_device_name: string;
+  tautulli_python_version: string;
+}
+
+interface TautulliInfoResponse {
+  response: {
+    result: string;
+    message?: string;
+    data: TautulliInfo;
+  };
+}
+
+class TautulliAPI {
+  private axios: AxiosInstance;
+
+  constructor(settings: TautulliSettings) {
+    this.axios = axios.create({
+      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+        settings.port
+      }${settings.urlBase ?? ''}`,
+      params: { apikey: settings.apiKey },
+    });
+  }
+
+  public async getInfo(): Promise<TautulliInfo> {
+    try {
+      return (
+        await this.axios.get<TautulliInfoResponse>('/api/v2', {
+          params: { cmd: 'get_tautulli_info' },
+        })
+      ).data.response.data;
+    } catch (e) {
+      logger.error('Something went wrong fetching Tautulli server info', {
+        label: 'Tautulli API',
+        errorMessage: e.message,
+      });
+      throw new Error(
+        `[Tautulli] Failed to fetch Tautulli server info: ${e.message}`
+      );
+    }
+  }
+
+  public async getMediaWatchStats(
+    ratingKey: string
+  ): Promise<TautulliWatchStats[]> {
+    try {
+      return (
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_watch_time_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
+        })
+      ).data.response.data;
+    } catch (e) {
+      logger.error(
+        'Something went wrong fetching media watch stats from Tautulli',
+        {
+          label: 'Tautulli API',
+          errorMessage: e.message,
+          ratingKey,
+        }
+      );
+      throw new Error(
+        `[Tautulli] Failed to fetch media watch stats: ${e.message}`
+      );
+    }
+  }
+
+  public async getMediaWatchUsers(
+    ratingKey: string
+  ): Promise<TautulliWatchUser[]> {
+    try {
+      return (
+        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_user_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
+        })
+      ).data.response.data;
+    } catch (e) {
+      logger.error(
+        'Something went wrong fetching media watch users from Tautulli',
+        {
+          label: 'Tautulli API',
+          errorMessage: e.message,
+          ratingKey,
+        }
+      );
+      throw new Error(
+        `[Tautulli] Failed to fetch media watch users: ${e.message}`
+      );
+    }
+  }
+
+  public async getUserWatchStats(user: User): Promise<TautulliWatchStats> {
+    try {
+      if (!user.plexId) {
+        throw new Error('User does not have an associated Plex ID');
+      }
+
+      return (
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_user_watch_time_stats',
+            user_id: user.plexId,
+            query_days: 0,
+            grouping: 1,
+          },
+        })
+      ).data.response.data[0];
+    } catch (e) {
+      logger.error(
+        'Something went wrong fetching user watch stats from Tautulli',
+        {
+          label: 'Tautulli API',
+          errorMessage: e.message,
+          user: user.displayName,
+        }
+      );
+      throw new Error(
+        `[Tautulli] Failed to fetch user watch stats: ${e.message}`
+      );
+    }
+  }
+
+  public async getUserWatchHistory(
+    user: User
+  ): Promise<TautulliHistoryRecord[]> {
+    let results: TautulliHistoryRecord[] = [];
+
+    try {
+      if (!user.plexId) {
+        throw new Error('User does not have an associated Plex ID');
+      }
+
+      const take = 100;
+      let start = 0;
+
+      while (results.length < 20) {
+        const tautulliData = (
+          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
+            params: {
+              cmd: 'get_history',
+              grouping: 1,
+              order_column: 'date',
+              order_dir: 'desc',
+              user_id: user.plexId,
+              media_type: 'movie,episode',
+              length: take,
+              start,
+            },
+          })
+        ).data.response.data.data;
+
+        if (!tautulliData.length) {
+          return results;
+        }
+
+        results = uniqWith(results.concat(tautulliData), (recordA, recordB) =>
+          recordA.grandparent_rating_key && recordB.grandparent_rating_key
+            ? recordA.grandparent_rating_key === recordB.grandparent_rating_key
+            : recordA.parent_rating_key && recordB.parent_rating_key
+            ? recordA.parent_rating_key === recordB.parent_rating_key
+            : recordA.rating_key === recordB.rating_key
+        );
+
+        start += take;
+      }
+
+      return results.slice(0, 20);
+    } catch (e) {
+      logger.error(
+        'Something went wrong fetching user watch history from Tautulli',
+        {
+          label: 'Tautulli API',
+          errorMessage: e.message,
+          user: user.displayName,
+        }
+      );
+      throw new Error(
+        `[Tautulli] Failed to fetch user watch history: ${e.message}`
+      );
+    }
+  }
+}
+
+export default TautulliAPI;

server/api/themoviedb/index.ts

@@ -1,7 +1,7 @@
+import ExternalAPI from '@server/api/externalapi';
+import cacheManager from '@server/lib/cache';
 import { sortBy } from 'lodash';
-import cacheManager from '../../lib/cache';
-import ExternalAPI from '../externalapi';
-import {
+import type {
   TmdbCollection,
   TmdbExternalIdResponse,
   TmdbGenre,
@@ -10,7 +10,7 @@ import {
   TmdbMovieDetails,
   TmdbNetwork,
   TmdbPersonCombinedCredits,
-  TmdbPersonDetail,
+  TmdbPersonDetails,
   TmdbProductionCompany,
   TmdbRegion,
   TmdbSearchMovieResponse,
@@ -28,6 +28,10 @@ interface SearchOptions {
   language?: string;
 }
 
+interface SingleSearchOptions extends SearchOptions {
+  year?: number;
+}
+
 interface DiscoverMovieOptions {
   page?: number;
   includeAdult?: boolean;
@@ -88,6 +92,10 @@ class TheMovieDb extends ExternalAPI {
       },
       {
         nodeCache: cacheManager.getCache('tmdb').data,
+        rateLimit: {
+          maxRequests: 20,
+          maxRPS: 50,
+        },
       }
     );
     this.region = region;
@@ -116,21 +124,79 @@ class TheMovieDb extends ExternalAPI {
     }
   };
 
+  public searchMovies = async ({
+    query,
+    page = 1,
+    includeAdult = false,
+    language = 'en',
+    year,
+  }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
+    try {
+      const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
+        params: {
+          query,
+          page,
+          include_adult: includeAdult,
+          language,
+          primary_release_year: year,
+        },
+      });
+
+      return data;
+    } catch (e) {
+      return {
+        page: 1,
+        results: [],
+        total_pages: 1,
+        total_results: 0,
+      };
+    }
+  };
+
+  public searchTvShows = async ({
+    query,
+    page = 1,
+    includeAdult = false,
+    language = 'en',
+    year,
+  }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
+    try {
+      const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
+        params: {
+          query,
+          page,
+          include_adult: includeAdult,
+          language,
+          first_air_date_year: year,
+        },
+      });
+
+      return data;
+    } catch (e) {
+      return {
+        page: 1,
+        results: [],
+        total_pages: 1,
+        total_results: 0,
+      };
+    }
+  };
+
   public getPerson = async ({
     personId,
     language = 'en',
   }: {
     personId: number;
     language?: string;
-  }): Promise<TmdbPersonDetail> => {
+  }): Promise<TmdbPersonDetails> => {
     try {
-      const data = await this.get<TmdbPersonDetail>(`/person/${personId}`, {
+      const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
         params: { language },
       });
 
       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}`);
     }
   };
 
@@ -152,7 +218,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}`
       );
     }
   };
@@ -179,7 +245,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}`);
     }
   };
 
@@ -205,7 +271,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}`);
     }
   };
 
@@ -231,7 +297,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}`);
     }
   };
 
@@ -257,7 +323,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}`);
     }
   }
 
@@ -283,7 +349,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}`);
     }
   }
 
@@ -309,7 +375,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}`);
     }
   }
 
@@ -336,7 +402,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}`
       );
     }
   }
@@ -360,7 +426,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}`);
     }
   }
 
@@ -393,7 +459,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}`);
     }
   };
 
@@ -426,7 +492,7 @@ class TheMovieDb extends ExternalAPI {
 
       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}`);
     }
   };
 
@@ -452,7 +518,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}`);
     }
   };
 
@@ -479,7 +545,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}`);
     }
   };
 
@@ -502,7 +568,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}`);
     }
   };
 
@@ -525,7 +591,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}`);
     }
   };
 
@@ -557,17 +623,17 @@ 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}`);
     }
   }
 
-  public async getMovieByImdbId({
+  public async getMediaByImdbId({
     imdbId,
     language = 'en',
   }: {
     imdbId: string;
     language?: string;
-  }): Promise<TmdbMovieDetails> {
+  }): Promise<TmdbMovieDetails | TmdbTvDetails> {
     try {
       const extResponse = await this.getByExternalId({
         externalId: imdbId,
@@ -583,12 +649,19 @@ class TheMovieDb extends ExternalAPI {
         return movie;
       }
 
-      throw new Error(
-        '[TMDb] Failed to find a title with the provided IMDB id'
-      );
+      if (extResponse.tv_results[0]) {
+        const tvshow = await this.getTvShow({
+          tvId: extResponse.tv_results[0].id,
+          language,
+        });
+
+        return tvshow;
+      }
+
+      throw new Error(`No movie or show returned from API for ID ${imdbId}`);
     } catch (e) {
       throw new Error(
-        `[TMDb] Failed to get movie by external imdb ID: ${e.message}`
+        `[TMDB] Failed to find media using external IMDb ID: ${e.message}`
       );
     }
   }
@@ -618,7 +691,7 @@ class TheMovieDb extends ExternalAPI {
       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}`
       );
     }
   }
@@ -642,7 +715,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}`);
     }
   }
 
@@ -658,7 +731,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}`);
     }
   }
 
@@ -674,7 +747,7 @@ 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}`);
     }
   }
 
@@ -686,7 +759,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDb] Failed to fetch movie studio: ${e.message}`);
+      throw new Error(`[TMDB] Failed to fetch movie studio: ${e.message}`);
     }
   }
 
@@ -696,7 +769,7 @@ class TheMovieDb extends ExternalAPI {
 
       return data;
     } catch (e) {
-      throw new Error(`[TMDb] Failed to fetch TV network: ${e.message}`);
+      throw new Error(`[TMDB] Failed to fetch TV network: ${e.message}`);
     }
   }
 
@@ -747,7 +820,7 @@ class TheMovieDb extends ExternalAPI {
 
       return movieGenres;
     } catch (e) {
-      throw new Error(`[TMDb] Failed to fetch movie genres: ${e.message}`);
+      throw new Error(`[TMDB] Failed to fetch movie genres: ${e.message}`);
     }
   }
 
@@ -798,7 +871,7 @@ class TheMovieDb extends ExternalAPI {
 
       return tvGenres;
     } catch (e) {
-      throw new Error(`[TMDb] Failed to fetch TV genres: ${e.message}`);
+      throw new Error(`[TMDB] Failed to fetch TV genres: ${e.message}`);
     }
   }
 }

server/api/themoviedb/interfaces.ts

@@ -67,6 +67,7 @@ export interface TmdbUpcomingMoviesResponse extends TmdbPaginatedResponse {
 export interface TmdbExternalIdResponse {
   movie_results: TmdbMovieResult[];
   tv_results: TmdbTvResult[];
+  person_results: TmdbPersonResult[];
 }
 
 export interface TmdbCreditCast {
@@ -315,7 +316,7 @@ export interface TmdbKeyword {
   name: string;
 }
 
-export interface TmdbPersonDetail {
+export interface TmdbPersonDetails {
   id: number;
   name: string;
   birthday: string;
@@ -324,7 +325,7 @@ export interface TmdbPersonDetail {
   also_known_as?: string[];
   gender: number;
   biography: string;
-  popularity: string;
+  popularity: number;
   place_of_birth?: string;
   profile_path?: string;
   adult: boolean;

server/constants/media.ts

@@ -2,6 +2,7 @@ export enum MediaRequestStatus {
   PENDING = 1,
   APPROVED,
   DECLINED,
+  FAILED,
 }
 
 export enum MediaType {

server/datasource.ts

@@ -1,4 +1,8 @@
-const devConfig = {
+import 'reflect-metadata';
+import type { DataSourceOptions, EntityTarget, Repository } from 'typeorm';
+import { DataSource } from 'typeorm';
+
+const devConfig: DataSourceOptions = {
   type: 'sqlite',
   database: process.env.CONFIG_DIRECTORY
     ? `${process.env.CONFIG_DIRECTORY}/db/db.sqlite3`
@@ -10,31 +14,30 @@ const devConfig = {
   entities: ['server/entity/**/*.ts'],
   migrations: ['server/migration/**/*.ts'],
   subscribers: ['server/subscriber/**/*.ts'],
-  cli: {
-    entitiesDir: 'server/entity',
-    migrationsDir: 'server/migration',
-  },
 };
 
-const prodConfig = {
+const prodConfig: DataSourceOptions = {
   type: 'sqlite',
   database: process.env.CONFIG_DIRECTORY
     ? `${process.env.CONFIG_DIRECTORY}/db/db.sqlite3`
     : 'config/db/db.sqlite3',
   synchronize: false,
+  migrationsRun: false,
   logging: false,
   enableWAL: true,
   entities: ['dist/entity/**/*.js'],
   migrations: ['dist/migration/**/*.js'],
-  migrationsRun: false,
   subscribers: ['dist/subscriber/**/*.js'],
-  cli: {
-    entitiesDir: 'dist/entity',
-    migrationsDir: 'dist/migration',
-  },
 };
 
-const finalConfig =
-  process.env.NODE_ENV !== 'production' ? devConfig : prodConfig;
+const dataSource = new DataSource(
+  process.env.NODE_ENV !== 'production' ? devConfig : prodConfig
+);
 
-module.exports = finalConfig;
+export const getRepository = <Entity>(
+  target: EntityTarget<Entity>
+): Repository<Entity> => {
+  return dataSource.getRepository(target);
+};
+
+export default dataSource;

server/entity/Issue.ts

@@ -1,3 +1,5 @@
+import type { IssueType } from '@server/constants/issue';
+import { IssueStatus } from '@server/constants/issue';
 import {
   Column,
   CreateDateColumn,
@@ -7,7 +9,6 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
-import { IssueStatus, IssueType } from '../constants/issue';
 import IssueComment from './IssueComment';
 import Media from './Media';
 import { User } from './User';

server/entity/Media.ts

@@ -1,21 +1,22 @@
+import RadarrAPI from '@server/api/servarr/radarr';
+import SonarrAPI from '@server/api/servarr/sonarr';
+import { MediaStatus, MediaType } from '@server/constants/media';
+import { getRepository } from '@server/datasource';
+import type { DownloadingItem } from '@server/lib/downloadtracker';
+import downloadTracker from '@server/lib/downloadtracker';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
 import {
   AfterLoad,
   Column,
   CreateDateColumn,
   Entity,
-  getRepository,
   In,
   Index,
   OneToMany,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
-import RadarrAPI from '../api/servarr/radarr';
-import SonarrAPI from '../api/servarr/sonarr';
-import { MediaStatus, MediaType } from '../constants/media';
-import downloadTracker, { DownloadingItem } from '../lib/downloadtracker';
-import { getSettings } from '../lib/settings';
-import logger from '../logger';
 import Issue from './Issue';
 import { MediaRequest } from './MediaRequest';
 import Season from './Season';
@@ -36,7 +37,7 @@ class Media {
       }
 
       const media = await mediaRepository.find({
-        tmdbId: In(finalIds),
+        where: { tmdbId: In(finalIds) },
       });
 
       return media;
@@ -55,10 +56,10 @@ class Media {
     try {
       const media = await mediaRepository.findOne({
         where: { tmdbId: id, mediaType },
-        relations: ['requests', 'issues'],
+        relations: { requests: true, issues: true },
       });
 
-      return media;
+      return media ?? undefined;
     } catch (e) {
       logger.error(e.message);
       return undefined;
@@ -145,6 +146,12 @@ class Media {
   public plexUrl?: string;
   public plexUrl4k?: string;
 
+  public iOSPlexUrl?: string;
+  public iOSPlexUrl4k?: string;
+
+  public tautulliUrl?: string;
+  public tautulliUrl4k?: string;
+
   constructor(init?: Partial<Media>) {
     Object.assign(this, init);
   }
@@ -152,6 +159,7 @@ class Media {
   @AfterLoad()
   public setPlexUrls(): void {
     const { machineId, webAppUrl } = getSettings().plex;
+    const { externalUrl: tautulliUrl } = getSettings().tautulli;
 
     if (this.ratingKey) {
       this.plexUrl = `${
@@ -159,6 +167,12 @@ class Media {
       }#!/server/${machineId}/details?key=%2Flibrary%2Fmetadata%2F${
         this.ratingKey
       }`;
+
+      this.iOSPlexUrl = `plex://preplay/?metadataKey=%2Flibrary%2Fmetadata%2F${this.ratingKey}&server=${machineId}`;
+
+      if (tautulliUrl) {
+        this.tautulliUrl = `${tautulliUrl}/info?rating_key=${this.ratingKey}`;
+      }
     }
 
     if (this.ratingKey4k) {
@@ -167,6 +181,12 @@ class Media {
       }#!/server/${machineId}/details?key=%2Flibrary%2Fmetadata%2F${
         this.ratingKey4k
       }`;
+
+      this.iOSPlexUrl4k = `plex://preplay/?metadataKey=%2Flibrary%2Fmetadata%2F${this.ratingKey4k}&server=${machineId}`;
+
+      if (tautulliUrl) {
+        this.tautulliUrl4k = `${tautulliUrl}/info?rating_key=${this.ratingKey4k}`;
+      }
     }
   }
 

server/entity/Season.ts

@@ -1,12 +1,12 @@
+import { MediaStatus } from '@server/constants/media';
 import {
-  Entity,
-  PrimaryGeneratedColumn,
   Column,
-  ManyToOne,
   CreateDateColumn,
+  Entity,
+  ManyToOne,
+  PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
-import { MediaStatus } from '../constants/media';
 import Media from './Media';
 
 @Entity()

server/entity/SeasonRequest.ts

@@ -1,12 +1,12 @@
+import { MediaRequestStatus } from '@server/constants/media';
 import {
-  Entity,
-  PrimaryGeneratedColumn,
   Column,
   CreateDateColumn,
-  UpdateDateColumn,
+  Entity,
   ManyToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
 } from 'typeorm';
-import { MediaRequestStatus } from '../constants/media';
 import { MediaRequest } from './MediaRequest';
 
 @Entity()

server/entity/Session.ts

@@ -1,5 +1,5 @@
-import { ISession } from 'connect-typeorm';
-import { Index, Column, PrimaryColumn, Entity } from 'typeorm';
+import type { ISession } from 'connect-typeorm';
+import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
 
 @Entity()
 export class Session implements ISession {

server/entity/User.ts

@@ -1,3 +1,13 @@
+import { MediaRequestStatus, MediaType } from '@server/constants/media';
+import { UserType } from '@server/constants/user';
+import { getRepository } from '@server/datasource';
+import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
+import PreparedEmail from '@server/lib/email';
+import type { PermissionCheckOptions } from '@server/lib/permissions';
+import { hasPermission, Permission } from '@server/lib/permissions';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import { AfterDate } from '@server/utils/dateHelpers';
 import bcrypt from 'bcrypt';
 import { randomUUID } from 'crypto';
 import path from 'path';
@@ -7,8 +17,6 @@ import {
   Column,
   CreateDateColumn,
   Entity,
-  getRepository,
-  MoreThan,
   Not,
   OneToMany,
   OneToOne,
@@ -16,17 +24,6 @@ import {
   RelationCount,
   UpdateDateColumn,
 } from 'typeorm';
-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 Issue from './Issue';
 import { MediaRequest } from './MediaRequest';
 import SeasonRequest from './SeasonRequest';
@@ -255,13 +252,14 @@ export class User {
     if (movieQuotaDays) {
       movieDate.setDate(movieDate.getDate() - movieQuotaDays);
     }
-    const movieQuotaStartDate = movieDate.toJSON();
 
     const movieQuotaUsed = movieQuotaLimit
       ? await requestRepository.count({
           where: {
-            requestedBy: this,
-            createdAt: MoreThan(movieQuotaStartDate),
+            requestedBy: {
+              id: this.id,
+            },
+            createdAt: AfterDate(movieDate),
             type: MediaType.MOVIE,
             status: Not(MediaRequestStatus.DECLINED),
           },

server/entity/UserSettings.ts

@@ -1,3 +1,6 @@
+import type { NotificationAgentTypes } from '@server/interfaces/api/userSettingsInterfaces';
+import { hasNotificationType, Notification } from '@server/lib/notifications';
+import { NotificationAgentKey } from '@server/lib/settings';
 import {
   Column,
   Entity,
@@ -5,9 +8,6 @@ import {
   OneToOne,
   PrimaryGeneratedColumn,
 } from 'typeorm';
-import { NotificationAgentTypes } from '../interfaces/api/userSettingsInterfaces';
-import { hasNotificationType, Notification } from '../lib/notifications';
-import { NotificationAgentKey } from '../lib/settings';
 import { User } from './User';
 
 export const ALL_NOTIFICATIONS = Object.values(Notification)
@@ -57,6 +57,12 @@ export class UserSettings {
   @Column({ nullable: true })
   public telegramSendSilently?: boolean;
 
+  @Column({ nullable: true })
+  public watchlistSyncMovies?: boolean;
+
+  @Column({ nullable: true })
+  public watchlistSyncTv?: boolean;
+
   @Column({
     type: 'text',
     nullable: true,

server/index.ts

@@ -1,33 +1,37 @@
+import PlexAPI from '@server/api/plexapi';
+import dataSource, { getRepository } from '@server/datasource';
+import { Session } from '@server/entity/Session';
+import { User } from '@server/entity/User';
+import { startJobs } from '@server/job/schedule';
+import notificationManager from '@server/lib/notifications';
+import DiscordAgent from '@server/lib/notifications/agents/discord';
+import EmailAgent from '@server/lib/notifications/agents/email';
+import GotifyAgent from '@server/lib/notifications/agents/gotify';
+import LunaSeaAgent from '@server/lib/notifications/agents/lunasea';
+import PushbulletAgent from '@server/lib/notifications/agents/pushbullet';
+import PushoverAgent from '@server/lib/notifications/agents/pushover';
+import SlackAgent from '@server/lib/notifications/agents/slack';
+import TelegramAgent from '@server/lib/notifications/agents/telegram';
+import WebhookAgent from '@server/lib/notifications/agents/webhook';
+import WebPushAgent from '@server/lib/notifications/agents/webpush';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import routes from '@server/routes';
+import { getAppVersion } from '@server/utils/appVersion';
+import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
 import csurf from 'csurf';
-import express, { NextFunction, Request, Response } from 'express';
+import type { NextFunction, Request, Response } from 'express';
+import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
-import session, { Store } from 'express-session';
+import type { Store } from 'express-session';
+import session from 'express-session';
 import next from 'next';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
-import { createConnection, getRepository } from 'typeorm';
 import YAML from 'yamljs';
-import PlexAPI from './api/plexapi';
-import { Session } from './entity/Session';
-import { User } from './entity/User';
-import { startJobs } from './job/schedule';
-import notificationManager from './lib/notifications';
-import DiscordAgent from './lib/notifications/agents/discord';
-import EmailAgent from './lib/notifications/agents/email';
-import LunaSeaAgent from './lib/notifications/agents/lunasea';
-import PushbulletAgent from './lib/notifications/agents/pushbullet';
-import PushoverAgent from './lib/notifications/agents/pushover';
-import SlackAgent from './lib/notifications/agents/slack';
-import TelegramAgent from './lib/notifications/agents/telegram';
-import WebhookAgent from './lib/notifications/agents/webhook';
-import WebPushAgent from './lib/notifications/agents/webpush';
-import { getSettings } from './lib/settings';
-import logger from './logger';
-import routes from './routes';
-import { getAppVersion } from './utils/appVersion';
 
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
 
@@ -39,7 +43,7 @@ const handle = app.getRequestHandler();
 app
   .prepare()
   .then(async () => {
-    const dbConnection = await createConnection();
+    const dbConnection = await dataSource.initialize();
 
     // Run migrations in production
     if (process.env.NODE_ENV === 'production') {
@@ -50,6 +54,7 @@ app
 
     // Load Settings
     const settings = getSettings().load();
+    restartFlag.initializeSettings(settings.main);
 
     // Migrate library types
     if (
@@ -58,8 +63,8 @@ app
     ) {
       const userRepository = getRepository(User);
       const admin = await userRepository.findOne({
-        select: ['id', 'plexToken'],
-        order: { id: 'ASC' },
+        select: { id: true, plexToken: true },
+        where: { id: 1 },
       });
 
       if (admin) {
@@ -76,6 +81,7 @@ app
     notificationManager.registerAgents([
       new DiscordAgent(),
       new EmailAgent(),
+      new GotifyAgent(),
       new LunaSeaAgent(),
       new PushbulletAgent(),
       new PushoverAgent(),

server/interfaces/api/discoverInterfaces.ts

@@ -3,3 +3,17 @@ export interface GenreSliderItem {
   name: string;
   backdrops: string[];
 }
+
+export interface WatchlistItem {
+  ratingKey: string;
+  tmdbId: number;
+  mediaType: 'movie' | 'tv';
+  title: string;
+}
+
+export interface WatchlistResponse {
+  page: number;
+  totalPages: number;
+  totalResults: number;
+  results: WatchlistItem[];
+}

server/interfaces/api/issueInterfaces.ts

@@ -1,5 +1,5 @@
-import Issue from '../../entity/Issue';
-import { PaginatedResponse } from './common';
+import type Issue from '@server/entity/Issue';
+import type { PaginatedResponse } from './common';
 
 export interface IssueResultsResponse extends PaginatedResponse {
   results: Issue[];

server/interfaces/api/mediaInterfaces.ts

@@ -1,6 +1,22 @@
-import type Media from '../../entity/Media';
-import { PaginatedResponse } from './common';
+import type Media from '@server/entity/Media';
+import type { User } from '@server/entity/User';
+import type { PaginatedResponse } from './common';
 
 export interface MediaResultsResponse extends PaginatedResponse {
   results: Media[];
 }
+
+export interface MediaWatchDataResponse {
+  data?: {
+    users: User[];
+    playCount: number;
+    playCount7Days: number;
+    playCount30Days: number;
+  };
+  data4k?: {
+    users: User[];
+    playCount: number;
+    playCount7Days: number;
+    playCount30Days: number;
+  };
+}

server/interfaces/api/personInterfaces.ts

@@ -1,4 +1,4 @@
-import { PersonCreditCast, PersonCreditCrew } from '../../models/Person';
+import type { PersonCreditCast, PersonCreditCrew } from '@server/models/Person';
 
 export interface PersonCombinedCreditsResponse {
   id: number;

server/interfaces/api/plexInterfaces.ts

@@ -1,4 +1,4 @@
-import { PlexSettings } from '../../lib/settings';
+import type { PlexSettings } from '@server/lib/settings';
 
 export interface PlexStatus {
   settings: PlexSettings;

server/interfaces/api/requestInterfaces.ts

@@ -1,6 +1,21 @@
+import type { MediaType } from '@server/constants/media';
+import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { PaginatedResponse } from './common';
-import type { MediaRequest } from '../../entity/MediaRequest';
 
 export interface RequestResultsResponse extends PaginatedResponse {
   results: MediaRequest[];
 }
+
+export type MediaRequestBody = {
+  mediaType: MediaType;
+  mediaId: number;
+  tvdbId?: number;
+  seasons?: number[] | 'all';
+  is4k?: boolean;
+  serverId?: number;
+  profileId?: number;
+  rootFolder?: string;
+  languageProfileId?: number;
+  userId?: number;
+  tags?: number[];
+};

server/interfaces/api/serviceInterfaces.ts

@@ -1,5 +1,5 @@
-import { QualityProfile, RootFolder, Tag } from '../../api/servarr/base';
-import { LanguageProfile } from '../../api/servarr/sonarr';
+import type { QualityProfile, RootFolder, Tag } from '@server/api/servarr/base';
+import type { LanguageProfile } from '@server/api/servarr/sonarr';
 
 export interface ServiceCommonServer {
   id: number;

server/interfaces/api/settingsInterfaces.ts

@@ -17,6 +17,7 @@ export interface SettingsAboutResponse {
   totalRequests: number;
   totalMediaItems: number;
   tz?: string;
+  appDataPath: string;
 }
 
 export interface PublicSettingsResponse {
@@ -24,6 +25,7 @@ export interface PublicSettingsResponse {
   applicationTitle: string;
   applicationUrl: string;
   hideAvailable: boolean;
+  hideRequested: boolean;
   localLogin: boolean;
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
@@ -35,6 +37,7 @@ export interface PublicSettingsResponse {
   enablePushRegistration: boolean;
   locale: string;
   emailEnabled: boolean;
+  newPlexLogin: boolean;
 }
 
 export interface CacheItem {
@@ -54,4 +57,5 @@ export interface StatusResponse {
   commitTag: string;
   updateAvailable: boolean;
   commitsBehind: number;
+  restartRequired: boolean;
 }

server/interfaces/api/userInterfaces.ts

@@ -1,6 +1,7 @@
-import { MediaRequest } from '../../entity/MediaRequest';
-import type { User } from '../../entity/User';
-import { PaginatedResponse } from './common';
+import type Media from '@server/entity/Media';
+import type { MediaRequest } from '@server/entity/MediaRequest';
+import type { User } from '@server/entity/User';
+import type { PaginatedResponse } from './common';
 
 export interface UserResultsResponse extends PaginatedResponse {
   results: User[];
@@ -22,3 +23,8 @@ export interface QuotaResponse {
   movie: QuotaStatus;
   tv: QuotaStatus;
 }
+
+export interface UserWatchDataResponse {
+  recentlyWatched: Media[];
+  playCount: number;
+}

server/interfaces/api/userSettingsInterfaces.ts

@@ -1,7 +1,8 @@
-import { NotificationAgentKey } from '../../lib/settings';
+import type { NotificationAgentKey } from '@server/lib/settings';
 
 export interface UserSettingsGeneralResponse {
   username?: string;
+  discordId?: string;
   locale?: string;
   region?: string;
   originalLanguage?: string;
@@ -13,6 +14,8 @@ export interface UserSettingsGeneralResponse {
   globalMovieQuotaLimit?: number;
   globalTvQuotaLimit?: number;
   globalTvQuotaDays?: number;
+  watchlistSyncMovies?: boolean;
+  watchlistSyncTv?: boolean;
 }
 
 export type NotificationAgentTypes = Record<NotificationAgentKey, number>;

server/job/schedule.ts

@@ -1,10 +1,12 @@
+import downloadTracker from '@server/lib/downloadtracker';
+import { plexFullScanner, plexRecentScanner } from '@server/lib/scanners/plex';
+import { radarrScanner } from '@server/lib/scanners/radarr';
+import { sonarrScanner } from '@server/lib/scanners/sonarr';
+import type { JobId } from '@server/lib/settings';
+import { getSettings } from '@server/lib/settings';
+import watchlistSync from '@server/lib/watchlistsync';
+import logger from '@server/logger';
 import schedule from 'node-schedule';
-import downloadTracker from '../lib/downloadtracker';
-import { plexFullScanner, plexRecentScanner } from '../lib/scanners/plex';
-import { radarrScanner } from '../lib/scanners/radarr';
-import { sonarrScanner } from '../lib/scanners/sonarr';
-import { getSettings, JobId } from '../lib/settings';
-import logger from '../logger';
 
 interface ScheduledJob {
   id: JobId;
@@ -53,6 +55,20 @@ export const startJobs = (): void => {
     cancelFn: () => plexFullScanner.cancel(),
   });
 
+  // Run watchlist sync every 5 minutes
+  scheduledJobs.push({
+    id: 'plex-watchlist-sync',
+    name: 'Plex Watchlist Sync',
+    type: 'process',
+    interval: 'long',
+    job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
+      logger.info('Starting scheduled job: Plex Watchlist Sync', {
+        label: 'Jobs',
+      });
+      watchlistSync.syncWatchlist();
+    }),
+  });
+
   // Run full radarr scan every 24 hours
   scheduledJobs.push({
     id: 'radarr-scan',

server/lib/cache.ts

@@ -6,7 +6,8 @@ export type AvailableCacheIds =
   | 'sonarr'
   | 'rt'
   | 'github'
-  | 'plexguid';
+  | 'plexguid'
+  | 'plextv';
 
 const DEFAULT_TTL = 300;
 const DEFAULT_CHECK_PERIOD = 120;
@@ -58,6 +59,10 @@ class CacheManager {
       stdTtl: 86400 * 7, // 1 week cache
       checkPeriod: 60 * 30,
     }),
+    plextv: new Cache('plextv', 'Plex TV', {
+      stdTtl: 86400 * 7, // 1 week cache
+      checkPeriod: 60,
+    }),
   };
 
   public getCache(id: AvailableCacheIds): Cache {

server/lib/downloadtracker.ts

@@ -1,9 +1,9 @@
+import RadarrAPI from '@server/api/servarr/radarr';
+import SonarrAPI from '@server/api/servarr/sonarr';
+import { MediaType } from '@server/constants/media';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
 import { uniqWith } from 'lodash';
-import RadarrAPI from '../api/servarr/radarr';
-import SonarrAPI from '../api/servarr/sonarr';
-import { MediaType } from '../constants/media';
-import logger from '../logger';
-import { getSettings } from './settings';
 
 export interface DownloadingItem {
   mediaType: MediaType;

server/lib/email/index.ts

@@ -1,7 +1,8 @@
+import type { NotificationAgentEmail } from '@server/lib/settings';
+import { getSettings } from '@server/lib/settings';
 import Email from 'email-templates';
 import nodemailer from 'nodemailer';
 import { URL } from 'url';
-import { getSettings, NotificationAgentEmail } from '../settings';
 import { openpgpEncrypt } from './openpgpEncrypt';
 
 class PreparedEmail extends Email {

server/lib/email/openpgpEncrypt.ts

@@ -1,6 +1,8 @@
+import logger from '@server/logger';
 import { randomBytes } from 'crypto';
 import * as openpgp from 'openpgp';
-import { Transform, TransformCallback } from 'stream';
+import type { TransformCallback } from 'stream';
+import { Transform } from 'stream';
 
 interface EncryptorOptions {
   signingKey?: string;
@@ -25,7 +27,7 @@ class PGPEncryptor extends Transform {
 
   // just save the whole message
   _transform = (
-    chunk: any,
+    chunk: Uint8Array,
     _encoding: BufferEncoding,
     callback: TransformCallback
   ): void => {
@@ -36,137 +38,156 @@ class PGPEncryptor extends Transform {
 
   // 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.PrivateKey | undefined;
 
-    // Just return the message if there is no one to encrypt for
-    if (!validPublicKeys.length) {
-      this.push(message);
-      return callback();
-    }
+    try {
+      // Reconstruct message as buffer
+      const validPublicKeys = await Promise.all(
+        this._encryptionKeys.map((armoredKey) =>
+          openpgp.readKey({ armoredKey })
+        )
+      );
+      let privateKey: openpgp.PrivateKey | undefined;
 
-    // Only sign the message if private key and password exist
-    if (this._signingKey && this._password) {
-      privateKey = await openpgp.decryptKey({
-        privateKey: await openpgp.readPrivateKey({
-          armoredKey: this._signingKey,
+      // 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.decryptKey({
+          privateKey: await openpgp.readPrivateKey({
+            armoredKey: this._signingKey,
+          }),
+          passphrase: 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_' + 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: await openpgp.createMessage({
+          text:
+            contentHeadersRaw +
+            emailPartDelimiter +
+            messageParts.join(emailPartDelimiter),
         }),
-        passphrase: this._password,
+        encryptionKeys: validPublicKeys,
+        signingKeys: 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();
+    } catch (e) {
+      logger.error(
+        'Something went wrong while encrypting email message with OpenPGP. Sending email without encryption',
+        {
+          label: 'Notifications',
+          errorMessage: e.message,
+        }
+      );
+
+      this.push(message);
+      callback();
     }
-
-    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_' + 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: await openpgp.createMessage({
-        text:
-          contentHeadersRaw +
-          emailPartDelimiter +
-          messageParts.join(emailPartDelimiter),
-      }),
-      encryptionKeys: validPublicKeys,
-      signingKeys: 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) => {
+  // Disabling this line because I don't want to fix it but I am tired
+  // of seeing the lint warning
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return function (mail: any, callback: () => unknown): void {
     if (!options.encryptionKeys.length) {
       setImmediate(callback);

server/lib/notifications/agents/agent.ts

@@ -1,14 +1,15 @@
-import { Notification } from '..';
-import type Issue from '../../../entity/Issue';
-import IssueComment from '../../../entity/IssueComment';
-import Media from '../../../entity/Media';
-import { MediaRequest } from '../../../entity/MediaRequest';
-import { User } from '../../../entity/User';
-import { NotificationAgentConfig } from '../../settings';
+import type Issue from '@server/entity/Issue';
+import type IssueComment from '@server/entity/IssueComment';
+import type Media from '@server/entity/Media';
+import type { MediaRequest } from '@server/entity/MediaRequest';
+import type { User } from '@server/entity/User';
+import type { NotificationAgentConfig } from '@server/lib/settings';
+import type { Notification } from '..';
 
 export interface NotificationPayload {
   event?: string;
   subject: string;
+  notifySystem: boolean;
   notifyAdmin: boolean;
   notifyUser?: User;
   media?: Media;

server/lib/notifications/agents/discord.ts

@@ -1,19 +1,17 @@
+import { IssueStatus, IssueTypeName } from '@server/constants/issue';
+import { getRepository } from '@server/datasource';
+import { User } from '@server/entity/User';
+import type { NotificationAgentDiscord } from '@server/lib/settings';
+import { getSettings, NotificationAgentKey } from '@server/lib/settings';
+import logger from '@server/logger';
 import axios from 'axios';
-import { getRepository } from 'typeorm';
 import {
   hasNotificationType,
   Notification,
   shouldSendAdminNotification,
 } from '..';
-import { IssueStatus, IssueTypeName } from '../../../constants/issue';
-import { User } from '../../../entity/User';
-import logger from '../../../logger';
-import {
-  getSettings,
-  NotificationAgentDiscord,
-  NotificationAgentKey,
-} from '../../settings';
-import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import type { NotificationAgent, NotificationPayload } from './agent';
+import { BaseAgent } from './agent';
 
 enum EmbedColors {
   DEFAULT = 0,
@@ -245,7 +243,10 @@ class DiscordAgent
   ): Promise<boolean> {
     const settings = this.getSettings();
 
-    if (!hasNotificationType(type, settings.types ?? 0)) {
+    if (
+      !payload.notifySystem ||
+      !hasNotificationType(type, settings.types ?? 0)
+    ) {
       return true;
     }
 
@@ -258,35 +259,37 @@ class DiscordAgent
     const userMentions: string[] = [];
 
     try {
-      if (payload.notifyUser) {
-        if (
-          payload.notifyUser.settings?.hasNotificationType(
-            NotificationAgentKey.DISCORD,
-            type
-          ) &&
-          payload.notifyUser.settings.discordId
-        ) {
-          userMentions.push(`<@${payload.notifyUser.settings.discordId}>`);
+      if (settings.options.enableMentions) {
+        if (payload.notifyUser) {
+          if (
+            payload.notifyUser.settings?.hasNotificationType(
+              NotificationAgentKey.DISCORD,
+              type
+            ) &&
+            payload.notifyUser.settings.discordId
+          ) {
+            userMentions.push(`<@${payload.notifyUser.settings.discordId}>`);
+          }
         }
-      }
 
-      if (payload.notifyAdmin) {
-        const userRepository = getRepository(User);
-        const users = await userRepository.find();
+        if (payload.notifyAdmin) {
+          const userRepository = getRepository(User);
+          const users = await userRepository.find();
 
-        userMentions.push(
-          ...users
-            .filter(
-              (user) =>
-                user.settings?.hasNotificationType(
-                  NotificationAgentKey.DISCORD,
-                  type
-                ) &&
-                user.settings.discordId &&
-                shouldSendAdminNotification(type, user, payload)
-            )
-            .map((user) => `<@${user.settings?.discordId}>`)
-        );
+          userMentions.push(
+            ...users
+              .filter(
+                (user) =>
+                  user.settings?.hasNotificationType(
+                    NotificationAgentKey.DISCORD,
+                    type
+                  ) &&
+                  user.settings.discordId &&
+                  shouldSendAdminNotification(type, user, payload)
+              )
+              .map((user) => `<@${user.settings?.discordId}>`)
+          );
+        }
       }
 
       await axios.post(settings.options.webhookUrl, {

server/lib/notifications/agents/email.ts

@@ -1,18 +1,16 @@
-import { EmailOptions } from 'email-templates';
+import { IssueType, IssueTypeName } from '@server/constants/issue';
+import { MediaType } from '@server/constants/media';
+import { getRepository } from '@server/datasource';
+import { User } from '@server/entity/User';
+import PreparedEmail from '@server/lib/email';
+import type { NotificationAgentEmail } from '@server/lib/settings';
+import { getSettings, NotificationAgentKey } from '@server/lib/settings';
+import logger from '@server/logger';
+import type { EmailOptions } from 'email-templates';
 import path from 'path';
-import { getRepository } from 'typeorm';
 import { Notification, shouldSendAdminNotification } from '..';
-import { IssueType, IssueTypeName } from '../../../constants/issue';
-import { MediaType } from '../../../constants/media';
-import { User } from '../../../entity/User';
-import logger from '../../../logger';
-import PreparedEmail from '../../email';
-import {
-  getSettings,
-  NotificationAgentEmail,
-  NotificationAgentKey,
-} from '../../settings';
-import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import type { NotificationAgent, NotificationPayload } from './agent';
+import { BaseAgent } from './agent';
 
 class EmailAgent
   extends BaseAgent<NotificationAgentEmail>
@@ -83,6 +81,11 @@ class EmailAgent
             is4k ? 'in 4K ' : ''
           }is pending approval:`;
           break;
+        case Notification.MEDIA_AUTO_REQUESTED:
+          body = `A new request for the following ${mediaType} ${
+            is4k ? 'in 4K ' : ''
+          }was automatically submitted:`;
+          break;
         case Notification.MEDIA_APPROVED:
           body = `Your request for the following ${mediaType} ${
             is4k ? 'in 4K ' : ''

server/lib/notifications/agents/gotify.ts

@@ -0,0 +1,153 @@
+import { IssueStatus, IssueTypeName } from '@server/constants/issue';
+import type { NotificationAgentGotify } from '@server/lib/settings';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import axios from 'axios';
+import { hasNotificationType, Notification } from '..';
+import type { NotificationAgent, NotificationPayload } from './agent';
+import { BaseAgent } from './agent';
+
+interface GotifyPayload {
+  title: string;
+  message: string;
+  priority: number;
+  extras: Record<string, unknown>;
+}
+
+class GotifyAgent
+  extends BaseAgent<NotificationAgentGotify>
+  implements NotificationAgent
+{
+  protected getSettings(): NotificationAgentGotify {
+    if (this.settings) {
+      return this.settings;
+    }
+
+    const settings = getSettings();
+
+    return settings.notifications.agents.gotify;
+  }
+
+  public shouldSend(): boolean {
+    const settings = this.getSettings();
+
+    if (settings.enabled && settings.options.url && settings.options.token) {
+      return true;
+    }
+
+    return false;
+  }
+
+  private getNotificationPayload(
+    type: Notification,
+    payload: NotificationPayload
+  ): GotifyPayload {
+    const { applicationUrl, applicationTitle } = getSettings().main;
+    let priority = 0;
+
+    const title = payload.event
+      ? `${payload.event} - ${payload.subject}`
+      : payload.subject;
+    let message = payload.message ?? '';
+
+    if (payload.request) {
+      message += `\n\nRequested By: ${payload.request.requestedBy.displayName}`;
+
+      let status = '';
+      switch (type) {
+        case Notification.MEDIA_PENDING:
+          status = 'Pending Approval';
+          break;
+        case Notification.MEDIA_APPROVED:
+        case Notification.MEDIA_AUTO_APPROVED:
+          status = 'Processing';
+          break;
+        case Notification.MEDIA_AVAILABLE:
+          status = 'Available';
+          break;
+        case Notification.MEDIA_DECLINED:
+          status = 'Declined';
+          break;
+        case Notification.MEDIA_FAILED:
+          status = 'Failed';
+          break;
+      }
+
+      if (status) {
+        message += `\nRequest Status: ${status}`;
+      }
+    } else if (payload.comment) {
+      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}`;
+    } else if (payload.issue) {
+      message += `\n\nReported By: ${payload.issue.createdBy.displayName}`;
+      message += `\nIssue Type: ${IssueTypeName[payload.issue.issueType]}`;
+      message += `\nIssue Status: ${
+        payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved'
+      }`;
+
+      if (type == Notification.ISSUE_CREATED) {
+        priority = 1;
+      }
+    }
+
+    for (const extra of payload.extra ?? []) {
+      message += `\n\n**${extra.name}**\n${extra.value}`;
+    }
+
+    if (applicationUrl && payload.media) {
+      const actionUrl = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
+      message += `\n\nOpen in ${applicationTitle}(${actionUrl})`;
+    }
+
+    return {
+      extras: {
+        'client::display': {
+          contentType: 'text/markdown',
+        },
+      },
+      title,
+      message,
+      priority,
+    };
+  }
+
+  public async send(
+    type: Notification,
+    payload: NotificationPayload
+  ): Promise<boolean> {
+    const settings = this.getSettings();
+
+    if (
+      !payload.notifySystem ||
+      !hasNotificationType(type, settings.types ?? 0)
+    ) {
+      return true;
+    }
+
+    logger.debug('Sending Gotify notification', {
+      label: 'Notifications',
+      type: Notification[type],
+      subject: payload.subject,
+    });
+    try {
+      const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
+      const notificationPayload = this.getNotificationPayload(type, payload);
+
+      await axios.post(endpoint, notificationPayload);
+
+      return true;
+    } catch (e) {
+      logger.error('Error sending Gotify notification', {
+        label: 'Notifications',
+        type: Notification[type],
+        subject: payload.subject,
+        errorMessage: e.message,
+        response: e.response?.data,
+      });
+
+      return false;
+    }
+  }
+}
+
+export default GotifyAgent;

server/lib/notifications/agents/lunasea.ts

@@ -1,10 +1,12 @@
+import { IssueStatus, IssueType } from '@server/constants/issue';
+import { MediaStatus } from '@server/constants/media';
+import type { NotificationAgentLunaSea } from '@server/lib/settings';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
 import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
-import { IssueStatus, IssueType } from '../../../constants/issue';
-import { MediaStatus } from '../../../constants/media';
-import logger from '../../../logger';
-import { getSettings, NotificationAgentLunaSea } from '../../settings';
-import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import type { NotificationAgent, NotificationPayload } from './agent';
+import { BaseAgent } from './agent';
 
 class LunaSeaAgent
   extends BaseAgent<NotificationAgentLunaSea>
@@ -85,7 +87,10 @@ class LunaSeaAgent
   ): Promise<boolean> {
     const settings = this.getSettings();
 
-    if (!hasNotificationType(type, settings.types ?? 0)) {
+    if (
+      !payload.notifySystem ||
+      !hasNotificationType(type, settings.types ?? 0)
+    ) {
       return true;
     }
 

server/lib/notifications/agents/pushbullet.ts

@@ -1,24 +1,24 @@
+import { IssueStatus, IssueTypeName } from '@server/constants/issue';
+import { MediaStatus } from '@server/constants/media';
+import { getRepository } from '@server/datasource';
+import { User } from '@server/entity/User';
+import type { NotificationAgentPushbullet } from '@server/lib/settings';
+import { getSettings, NotificationAgentKey } from '@server/lib/settings';
+import logger from '@server/logger';
 import axios from 'axios';
-import { getRepository } from 'typeorm';
 import {
   hasNotificationType,
   Notification,
   shouldSendAdminNotification,
 } from '..';
-import { IssueStatus, IssueTypeName } from '../../../constants/issue';
-import { User } from '../../../entity/User';
-import logger from '../../../logger';
-import {
-  getSettings,
-  NotificationAgentKey,
-  NotificationAgentPushbullet,
-} from '../../settings';
-import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+import type { NotificationAgent, NotificationPayload } from './agent';
+import { BaseAgent } from './agent';
 
 interface PushbulletPayload {
   type: string;
   title: string;
   body: string;
+  channel_tag?: string;
 }
 
 class PushbulletAgent
@@ -53,6 +53,12 @@ class PushbulletAgent
 
       let status = '';
       switch (type) {
+        case Notification.MEDIA_AUTO_REQUESTED:
+          status =
+            payload.media?.status === MediaStatus.PENDING
+              ? 'Pending Approval'
+              : 'Processing';
+          break;
         case Notification.MEDIA_PENDING:
           status = 'Pending Approval';
           break;
@@ -105,6 +111,7 @@ class PushbulletAgent
 
     // Send system notification
     if (
+      payload.notifySystem &&
       hasNotificationType(type, settings.types ?? 0) &&
       settings.enabled &&
       settings.options.accessToken
@@ -116,11 +123,15 @@ class PushbulletAgent
       });
 
       try {
-        await axios.post(endpoint, notificationPayload, {
-          headers: {
-            'Access-Token': settings.options.accessToken,
-          },
-        });
+        await axios.post(
+          endpoint,
+          { ...notificationPayload, channel_tag: settings.options.channelTag },
+          {
+            headers: {
+              'Access-Token': settings.options.accessToken,
+            },
+          }
+        );
       } catch (e) {
         logger.error('Error sending Pushbullet notification', {
           label: 'Notifications',
@@ -188,8 +199,9 @@ class PushbulletAgent
           .map(async (user) => {
             if (
               user.settings?.pushbulletAccessToken &&
-              user.settings.pushbulletAccessToken !==
-                settings.options.accessToken
+              (settings.options.channelTag ||
+                user.settings.pushbulletAccessToken !==
+                  settings.options.accessToken)
             ) {
               logger.debug('Sending Pushbullet notification', {
                 label: 'Notifications',