Merge pull request #76 from Fallenbagel/updatePackagejson

Update package.json to reflect the jellyseerr version. This helps fix the version issue.

.all-contributorsrc

@@ -539,211 +539,24 @@
       "contributions": [
         "code"
       ]
-    },
+    }
     {
-      "login": "sootylunatic",
-      "name": "sootylunatic",
-      "avatar_url": "https://avatars.githubusercontent.com/u/36486087?v=4",
-      "profile": "https://github.com/sootylunatic",
+      "login": "Fallenbagel",
+      "name": "Mohamed Nuvaas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/98979876?s=96&v=4",
+      "profile": "https://github.com/nicospz",
       "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "JoKerIsCraZy",
-      "name": "JoKerIsCraZy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47474211?v=4",
-      "profile": "https://github.com/JoKerIsCraZy",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "GoByeBye",
-      "name": "Daddie0",
-      "avatar_url": "https://avatars.githubusercontent.com/u/33762262?v=4",
-      "profile": "https://daddie.dev",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "Simoneu01",
-      "name": "Simone",
-      "avatar_url": "https://avatars.githubusercontent.com/u/43807696?v=4",
-      "profile": "http://ungaro.me",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "adan89lion",
-      "name": "Seohyun Joo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/6585644?v=4",
-      "profile": "https://github.com/adan89lion",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "ty4ko",
-      "name": "Sergey",
-      "avatar_url": "https://avatars.githubusercontent.com/u/21213535?v=4",
-      "profile": "https://github.com/ty4ko",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "skafte1990",
-      "name": "Shaaft",
-      "avatar_url": "https://avatars.githubusercontent.com/u/31465453?v=4",
-      "profile": "https://github.com/skafte1990",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "sr093906",
-      "name": "sr093906",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8369201?v=4",
-      "profile": "https://github.com/sr093906",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "Nackophilz",
-      "name": "Nackophilz",
-      "avatar_url": "https://avatars.githubusercontent.com/u/61667226?v=4",
-      "profile": "https://github.com/Nackophilz",
-      "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"
+        "code",
+        "logo",
+        "design"
       ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
   "contributorsPerLine": 7,
-  "projectName": "overseerr",
-  "projectOwner": "sct",
+  "projectName": "jellyseerr",
+  "projectOwner": "Fallenbagel",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "skipCi": false
+  "skipCi": true
 }

.dockerignore

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

.eslintrc.js

@@ -7,8 +7,6 @@ module.exports = {
     'plugin:jsx-a11y/recommended',
     'plugin:react/recommended',
     'plugin:react-hooks/recommended',
-    'plugin:react/jsx-runtime',
-    'prettier',
   ],
   parserOptions: {
     ecmaVersion: 6,
@@ -30,18 +28,7 @@ module.exports = {
     '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: [
     {
@@ -51,7 +38,7 @@ module.exports = {
       },
     },
   ],
-  plugins: ['jsx-a11y', 'react-hooks', 'formatjs', 'no-relative-import-paths'],
+  plugins: ['jsx-a11y', 'react-hooks', 'formatjs'],
   settings: {
     react: {
       pragma: 'React',

.github/CODEOWNERS

@@ -0,0 +1,7 @@
+# Global code ownership
+
+-       @Fallenbagel
+
+# i18n locale files
+
+src/i18n/locale/ @Fallenbagel

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,91 +0,0 @@
-name: 🐛 Bug Report
-description: Report a problem
-labels: ['type:bug', 'awaiting-triage']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        Please note that we use GitHub issues exclusively for bug reports and feature requests. For support requests, please use our other support channels to get help.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Please provide a clear and concise description of the bug or issue.
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: What version of Overseerr are you running? (You can find this in Settings → About → Version.)
-    validations:
-      required: true
-  - type: textarea
-    id: repro-steps
-    attributes:
-      label: Steps to Reproduce
-      description: Please tell us how we can reproduce the undesired behavior.
-      placeholder: |
-        1. Go to [...]
-        2. Click on [...]
-        3. Scroll down to [...]
-        4. See error in [...]
-    validations:
-      required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: If applicable, please provide screenshots depicting the problem.
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: Please copy and paste any relevant log output. (This will be automatically formatted into code, so no need for backticks.)
-      render: shell
-  - type: dropdown
-    id: platform
-    attributes:
-      label: Platform
-      options:
-        - desktop
-        - smartphone
-        - tablet
-    validations:
-      required: true
-  - type: input
-    id: device
-    attributes:
-      label: Device
-      description: e.g., iPhone X, Surface Pro, Samsung Galaxy Tab
-    validations:
-      required: true
-  - type: input
-    id: os
-    attributes:
-      label: Operating System
-      description: e.g., iOS 8.1, Windows 10, Android 11
-    validations:
-      required: true
-  - type: input
-    id: browser
-    attributes:
-      label: Browser
-      description: e.g., Chrome, Safari, Edge, Firefox
-    validations:
-      required: true
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Please provide any additional information that may be relevant or helpful.
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/fallenbagel/jellyseerr/blob/develop/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow Overseerr's Code of Conduct
-          required: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Submit a report to help us improve
+title: ''
+labels: 'awaiting-triage, type:bug'
+assignees: ''
+---
+
+#### Description
+
+Please provide a clear and concise description of the bug or issue.
+
+#### Version
+
+What version of Overseerr are you running? (You can find this in Settings → About → Version.)
+
+#### Steps to Reproduce
+
+Please tell us how we can reproduce the undesired behavior.
+
+1. Go to [...]
+2. Click on [...]
+3. Scroll down to [...]
+4. See error in [...]
+
+#### Expected Behavior
+
+Please provide a clear and concise description of what you expected to happen.
+
+#### Screenshots
+
+If applicable, please provide screenshots depicting the problem.
+
+#### Device
+
+What device were you using when you encountered this issue? Please provide this information to help us reproduce and investigate the bug.
+
+- **Platform:** [e.g., desktop, smartphone, tablet]
+- **Device:** [e.g., iPhone X, Surface Pro, Samsung Galaxy Tab]
+- **OS:** [e.g., iOS 8.1, Windows 10, Android 11]
+- **Browser:** [e.g., Chrome, Safari, Edge, Firefox]
+
+#### Additional Context
+
+Please provide any additional information that may be relevant or helpful.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 💬 Support via Discord
-    url: https://discord.gg/ckbvBtDJgC
-    about: Chat with other users and the Overseerr dev team
-  - name: 💬 Support via GitHub Discussions
-    url: https://github.com/fallenbagel/jellyseerr/discussions
+  - name: Support via Discord
+    url: https://discord.gg/overseerr
+    about: Chat with users and devs on support and setup related topics.
+  - name: Support via GitHub Discussions
+    url: https://github.com/sct/overseerr/discussions
     about: Ask questions and discuss with other community members

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,37 +0,0 @@
-name: ✨ Feature Request
-description: Suggest an idea
-labels: ['type:enhancement', 'awaiting-triage']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request!
-
-        Please note that we use GitHub issues exclusively for bug reports and feature requests. For support requests, please use our other support channels to get help.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Is your feature request related to a problem? If so, please provide a clear and concise description of the problem; e.g., "I'm always frustrated when [...]."
-    validations:
-      required: true
-  - type: textarea
-    id: desired-behavior
-    attributes:
-      label: Desired Behavior
-      description: Provide a clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Provide any additional information or screenshots that may be relevant or helpful.
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/fallenbagel/jellyseerr/blob/develop/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow Overseerr's Code of Conduct
-          required: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'awaiting-triage, type:enhancement'
+assignees: ''
+---
+
+#### Description
+
+Is your feature request related to a problem? If so, please provide a clear and concise description of the problem. E.g., "I'm always frustrated when [...]."
+
+#### Desired Behavior
+
+Provide a clear and concise description of what you want to happen.
+
+#### Additional Context
+
+Provide any additional information or screenshots that may be relevant or helpful.

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,10 +4,4 @@
 
 #### To-Dos
 
-- [ ] Successful build `yarn build`
-- [ ] Translation keys `yarn i18n:extract`
-- [ ] Database migration (if required)
-
 #### Issues Fixed or Closed
-
-- Fixes #XXXX

.github/stale.yml

@@ -1,44 +1,18 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
+# Number of days of inactivity before an issue becomes stale
 daysUntilStale: 60
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+# Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+# Issues with these labels will never be considered stale
 exemptLabels:
   - pinned
   - security
   - dependencies
-  - never-stale
-  - priority:high
-  - priority:medium
-
-# Label to use when marking as stale
+# Label to use when marking an issue as stale
 staleLabel: stale
-
-# Comment to post when marking as stale. Set to `false` to disable
+# Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
-
-# Comment to post when removing the stale label.
-# unmarkComment: >
-#   Your comment here.
-
-# Comment to post when closing a stale Issue or Pull Request.
-# closeComment: >
-#   Your comment here.
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
-pulls:
-  markComment: >
-    This pull request has been automatically marked as stale because it has not had
-    recent activity. It will be closed if no further activity occurs. Thank you
-    for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Jellyseerr CI
+name: Overseerr CI
 
 on:
   pull_request:
@@ -11,54 +11,52 @@ on:
 jobs:
   test:
     name: Lint & Test Build
-    if: github.event_name == 'pull_request'
     runs-on: ubuntu-20.04
-    container: node:16.17-alpine
+    container: node:14.17-alpine
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.3.4
       - name: Install dependencies
         env:
-          HUSKY: 0
+          HUSKY_SKIP_INSTALL: 1
         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@v3
+        uses: actions/checkout@v2.3.4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1.3.0
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v2.1.6
         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@v2
+        uses: docker/login-action@v1.9.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1.9.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2.5.0
         with:
           context: .
           file: ./Dockerfile
@@ -67,7 +65,10 @@ jobs:
           build-args: |
             COMMIT_TAG=${{ github.sha }}
           tags: |
-            fallenbagel/jellyseerr:develop
+            sctx/overseerr:develop
+            sctx/overseerr:${{ github.sha }}
+            ghcr.io/sct/overseerr:develop
+            ghcr.io/sct/overseerr:${{ github.sha }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
       - # Temporary fix
@@ -85,7 +86,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v3
+        uses: technote-space/workflow-conclusion-action@v2.1.6
       - name: Combine Job Status
         id: status
         run: |

.github/workflows/cypress.yml

@@ -1,30 +0,0 @@
-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

@@ -0,0 +1,23 @@
+name: Deploy API Docs
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Generate Swagger UI
+        uses: Legion2/swagger-ui-action@v1.1.2
+        with:
+          output: swagger-ui
+          spec-file: overseerr-api.yml
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3.8.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: swagger-ui
+          cname: api-docs.overseerr.dev

.github/workflows/invalid_template.yml

@@ -0,0 +1,19 @@
+name: 'Invalid Template'
+
+on:
+  issues:
+    types: [labeled, unlabeled, reopened]
+
+jobs:
+  support:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: dessant/support-requests@v2.0.1
+        with:
+          github-token: ${{ github.token }}
+          support-label: 'invalid:template-incomplete'
+          issue-comment: >
+            :wave: @{issue-author}, please follow the template provided.
+          close-issue: true
+          lock-issue: true
+          issue-lock-reason: 'resolved'

.github/workflows/preview.yml

@@ -1,4 +1,4 @@
-name: Jellyseerr Preview
+name: Overseerr Preview
 
 on:
   push:
@@ -11,21 +11,27 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.3.4
       - 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@v2
+        uses: docker/setup-qemu-action@v1.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1.3.0
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1.9.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v1.9.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2.5.0
         with:
           context: .
           file: ./Dockerfile
@@ -34,4 +40,5 @@ jobs:
           build-args: |
             COMMIT_TAG=${{ github.sha }}
           tags: |
-            fallenbagel/jellyseerr:${{ steps.get_version.outputs.VERSION }}
+            sctx/overseerr:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/sct/overseerr:${{ steps.get_version.outputs.VERSION }}

.github/workflows/release.yml

@@ -1,36 +1,60 @@
-name: Jellyseer Release
+name: Overseerr Release
 
-on: workflow_dispatch
+on:
+  push:
+    branches:
+      - master
 
 jobs:
-  semantic-release:
-    name: Tag and release latest version
+  test:
+    name: Lint & Test Build
     runs-on: ubuntu-20.04
-    env:
-      HUSKY: 0
+    container: node:14.17-alpine
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        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
         with:
           fetch-depth: 0
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 14
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1.3.0
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1.9.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v1.9.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Install dependencies
         run: yarn
       - name: Release
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: npx semantic-release
@@ -48,7 +72,7 @@ jobs:
           - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
       - name: Switch to master branch
@@ -65,7 +89,7 @@ jobs:
             echo ::set-output name=RELEASE::edge
           fi
       - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v1.2.0
         with:
           image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
       - name: Build Snap Package
@@ -76,10 +100,10 @@ jobs:
       - name: Upload Snap Package
         uses: actions/upload-artifact@v2
         with:
-          name: jellyseerr-snap-package-${{ matrix.architecture }}
+          name: overseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}
       - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@v1
+        uses: diddlesnaps/snapcraft-review-tools-action@v1.3.0
         with:
           snap: ${{ steps.build.outputs.snap }}
       - name: Publish Snap Package
@@ -93,10 +117,10 @@ jobs:
     name: Send Discord Notification
     needs: semantic-release
     if: always()
-    runs-on: self-hosted
+    runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v3
+        uses: technote-space/workflow-conclusion-action@v2.1.6
       - name: Combine Job Status
         id: status
         run: |

.github/workflows/snap.yaml

@@ -12,13 +12,30 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.10.0
+        uses: styfle/cancel-workflow-action@0.9.0
         with:
           access_token: ${{ secrets.GITHUB_TOKEN }}
 
+  test:
+    name: Lint & Test Build
+    needs: jobs
+    runs-on: ubuntu-20.04
+    container: node:14.17-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: jobs
+    needs: test
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -29,7 +46,7 @@ jobs:
           - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.3.4
       - name: Prepare
         id: prepare
         run: |
@@ -40,19 +57,21 @@ jobs:
             echo ::set-output name=RELEASE::edge
           fi
       - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1.2.0
+        with:
+          image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
       - name: Build Snap Package
         uses: diddlesnaps/snapcraft-multiarch-action@v1
         id: build
         with:
           architecture: ${{ matrix.architecture }}
       - name: Upload Snap Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: jellyseerr-snap-package-${{ matrix.architecture }}
+          name: overseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}
       - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@v1
+        uses: diddlesnaps/snapcraft-review-tools-action@v1.3.0
         with:
           snap: ${{ steps.build.outputs.snap }}
       - name: Publish Snap Package
@@ -69,7 +88,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v3
+        uses: technote-space/workflow-conclusion-action@v2.1.6
       - 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
+      - uses: dessant/support-requests@v2.0.1
         with:
           github-token: ${{ github.token }}
           support-label: 'support'
@@ -16,10 +16,11 @@ jobs:
             :wave: @{issue-author}, we use the issue tracker exclusively
             for bug reports and feature requests. However, this issue appears
             to be a support request. Please use our support channels
-            to get help with Jellyseerr.
+            to get help with Overseerr.
 
-            - [Discord](https://discord.gg/ckbvBtDJgC)
+            - [Discord](https://discord.gg/overseerr)
 
+            - [GitHub Discussions](https://github.com/sct/overseerr/discussions)
           close-issue: true
           lock-issue: true
           issue-lock-reason: 'off-topic'

.gitignore

@@ -39,7 +39,6 @@ config/settings.json
 config/logs/*.log*
 config/logs/*.json
 config/logs/*.log.gz
-config/logs/*.json.gz
 config/logs/*-audit.json
 
 # anidb mapping file
@@ -53,17 +52,3 @@ 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
-
-# Webstorm
-.idea

.husky/commit-msg

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

.husky/pre-commit

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

.husky/prepare-commit-msg

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

.prettierrc.js

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

.vscode/extensions.json

@@ -11,11 +11,17 @@
     // 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"
+    "bradlc.vscode-tailwindcss",
+
+    // https://marketplace.visualstudio.com/items?itemName=heybourn.headwind
+    "heybourn.headwind"
   ]
 }

.vscode/settings.json

@@ -15,6 +15,9 @@
       "database": "./config/db/db.sqlite3"
     }
   ],
-  "editor.formatOnSave": true,
-  "typescript.preferences.importModuleSpecifier": "non-relative"
+  "i18n-ally.localesPaths": ["src/i18n", "src/i18n/locale"],
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true
+  },
+  "editor.formatOnSave": true
 }

CONTRIBUTING.md

@@ -24,7 +24,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 2. Add the remote `upstream`:
 
    ```bash
-   git remote add upstream https://github.com/fallenbagel/jellyseerr.git
+   git remote add upstream https://github.com/sct/overseerr.git
    ```
 
 3. Create a new branch:
@@ -66,17 +66,17 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 
 ### Contributing Code
 
-- If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/fallenbagel/jellyseerr/issues) to avoid multiple people working on the same thing.
+- If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/sct/overseerr/issues) to avoid multiple people working on the same thing.
 - All commits **must** follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+  - It is okay 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 prior to opening a pull request.
-  - Do not squash commits once people have begun reviewing your changes.
+- Please make meaningful commits, or squash them.
 - Always rebase your commit to the latest `develop` branch. Do **not** merge `develop` into your branch.
 - It is your responsibility to keep your branch up-to-date. Your work will **not** be merged unless it is rebased off the latest `develop` branch.
 - You can create a "draft" pull request early to get feedback on your work.
 - Your code **must** be formatted correctly, or the tests will fail.
   - We use Prettier to format our code base. It should automatically run with a Git hook, but it is recommended to have the Prettier extension installed in your editor and format on save.
-- If you have questions or need help, you can reach out via [Discussions](https://github.com/fallenbagel/jellyseerr/discussions) or our [Discord server](https://discord.gg/ckbvBtDJgC).
+- If you have questions or need help, you can reach out via [Discussions](https://github.com/sct/overseerr/discussions) or our [Discord server](https://discord.gg/overseerr).
 - Only open pull requests to `develop`, never `master`! Any pull requests opened to `master` will be closed.
 
 ### UI Text Style
@@ -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., IMDb has a lowercase 'b', whereas TMDB and TheTVDB have 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., TMDb and IMDb have a lowercase 'b', whereas TheTVDB has 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.
@@ -97,7 +97,7 @@ When adding new UI text, please try to adhere to the following guidelines:
 
 ## Translation
 
-We use [Weblate](https://hosted.weblate.org/engage/overseerr/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).
+We use [Weblate](https://hosted.weblate.org/engage/overseerr/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/sct/overseerr/issues/new/choose).
 
 <a href="https://hosted.weblate.org/engage/overseerr/"><img src="https://hosted.weblate.org/widgets/overseerr/-/overseerr-frontend/multi-auto.svg" alt="Translation status" /></a>
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.17-alpine AS BUILD_IMAGE
+FROM node:14.17-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -7,14 +7,12 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 
 RUN \
   case "${TARGETPLATFORM}" in \
-    'linux/arm64' | 'linux/arm/v7') \
-      apk add --no-cache python3 make g++ && \
-      ln -s /usr/bin/python3 /usr/bin/python \
-      ;; \
+    'linux/arm64') apk add --no-cache python make g++ ;; \
+    'linux/arm/v7') apk add --no-cache python make g++ ;; \
   esac
 
 COPY package.json yarn.lock ./
-RUN CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
+RUN yarn install --frozen-lockfile --network-timeout 1000000
 
 COPY . ./
 
@@ -26,18 +24,18 @@ RUN yarn build
 # remove development dependencies
 RUN yarn install --production --ignore-scripts --prefer-offline
 
-RUN rm -rf src server .next/cache
+RUN rm -rf src server
 
 RUN touch config/DOCKER
 
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:16.17-alpine
+FROM node:14.17-alpine
 
 WORKDIR /app
 
-RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
+RUN apk add --no-cache tzdata tini
 
 # copy from build image
 COPY --from=BUILD_IMAGE /app ./

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:16.17-alpine
+FROM node:14.17-alpine
 
 COPY . /app
 WORKDIR /app

README.md

@@ -1,144 +1,51 @@
 <p align="center">
-<img src="./public/logo_full.svg" alt="Jellyseerr" style="margin: 20px 0;">
+<img src="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/stable/public/logo.png" alt="Overseerr" style="margin: 20px 0;">
 </p>
 <p align="center">
 <a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/badge/Discord-Chat-lightgrey" alt="Discord"></a>
-<a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
-<a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 </p>
 
-**Jellyseerr** is a free and open source software application for managing requests for your media library. It is a a fork of Overseerr built to bring support for Jellyfin & Emby media servers!
-
-_The original Overseerr team have been busy and Jellyfin/Emby support aren't on their roadmap, so we started this project as we wanted to bring the Overseerr experience to the Jellyfin/Emby Community!_
+**Jellyseerr** is a free and open source fork of Overseerr for managing requests for your media library. It integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**, and **[Jellyfin](https://jellyfin.org/)**!
 
 ## Current Features
 
-- Jellyfin Support
-- Emby Support
-
-  (Upcoming Features include: Multiple Server Instances, Music Support, Ability to change email address and much more!)
-
-Along with all the existing Overseerr features:
-
-- Full Plex integration. Authenticate and manage user access with Plex!
-- Easy integration with your existing services. Currently, Jellyseerr supports Sonarr and Radarr. More to come!
-- Plex library scan, to keep track of the titles which are already available.
+- Jellyfin support
+- Easy integration with your existing services. Currently, Jellyseerr supports Sonarr and Radarr.
+- Jellyfin library scan, to keep track of the titles which are already available.
 - Customizable request system, which allows users to request individual seasons or movies in a friendly, easy-to-use interface.
 - Incredibly simple request management UI. Don't dig through the app to simply approve recent requests!
 - Granular permission system.
 - Support for various notification agents.
 - Mobile-friendly design, for when you need to approve requests on the go!
 
-With more features on the way! Check out our [issue tracker](https://github.com/fallenbagel/jellyseerr/issues) to see the features which have already been requested.
+Check out our [issue tracker](https://github.com/Fallenbagel/jellyseerr/issues).
+
+## Supported Architectures
+
+Jellyseerr image support multiple architectures such as x86-64, arm64 and armv7.
+**NOTE: `:arm` and `:armv7` tag has been deprecated and replaced with `:latest`.**
+
+| **Architecture** | **Tag** |
+| ---------------- | ------- |
+| x86-64           | latest  |
+| ARM64            | latest  |
+| ARMv7            | latest   |
 
 ## Getting Started
 
-_*Jellyseerr currently does not support any library types other than *`Shows`* and *`Movies`*.
-In addition, you will need to turn off in jellyfin `settings > Home > Automatically group content from the following folders into views such as 'Movies', 'Music' and 'TV':`.*_
-
-### Launching Jellyseerr using Docker
-
 Check out our dockerhub for instructions on how to install and run Jellyseerr:
 https://hub.docker.com/r/fallenbagel/jellyseerr
 
-### Launching Jellyseerr manually:
-
-#### Windows
-
-Pre-requisites:
-
-- Nodejs (atleast LTS version)
-- Yarn
-- Download the source code from the github (Either develop branch or main for stable)
-
-```bash
-npm i -g win-node-env
-yarn install
-yarn run build
-yarn start
-```
-
-#### Linux
-
-Pre-requisites:
-
-- Nodejs (atleast LTS version)
-- Yarn
-- Git
-
-```bash
-git clone https://github.com/Fallenbagel/jellyseerr.git && cd jellyseerr
-git checkout main #if you want to run stable instead of develop
-yarn install
-yarn run build
-yarn start
-```
-
-_Systemd-service:_
-
-- assuming jellyseerr was cloned to `/opt/`
-  and the environmentfile is located at `/etc/jellyseerr`
-
-service:
-
-```
-[Unit]
-Description=Jellyseerr Service
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-EnvironmentFile=/etc/jellyseerr/jellyseerr.conf
-Environment=NODE_ENV=production
-Type=exec
-Restart=on-failure
-WorkingDirectory=/opt/jellyseerr
-ExecStart=/root/.nvm/versions/node/v18.7.0/bin/node dist/index.js
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Environmentfile:
-
-```
-# Jellyseerr's default port is 5055, if you want to use both, change this.
-# specify on which port to listen
-PORT=5055
-
-# specify on which interface to listen, by default jellyseerr listens on all interfaces
-#HOST=127.0.0.1
-
-# Uncomment if your media server is emby instead of jellyfin.
-# JELLYFIN_TYPE=emby
-```
-
-### Packages:
-
-Archlinux: [AUR](https://aur.archlinux.org/packages/jellyseerr)
-
-## Preview
-
-<img src="./public/preview.jpg">
-
 ## Support
 
 - You can get support on [Discord](https://discord.gg/ckbvBtDJgC).
-- You can ask questions in the Help category of our [GitHub Discussions](https://github.com/fallenbagel/jellyseerr/discussions).
-- Bug reports and feature requests can be submitted via [GitHub Issues](https://github.com/fallenbagel/jellyseerr/issues).
+- Bug reports and feature requests can be submitted via [GitHub Issues](https://github.com/sct/overseerr/issues).
 
-## API Documentation
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
 
-You can access the API documentation from your local Jellyseerr install at http://localhost:5055/api-docs
+## Buy me a Coffee!
 
-## Community
+If you like jellyseerr and want to help maintain it, please buy me a coffee as it would help me out a lot!
 
-You can ask questions, share ideas, and more in [GitHub Discussions](https://github.com/fallenbagel/jellyseerr/discussions).
-
-If you would like to chat with other members of our growing community, [join the Jellyseerr Discord server](https://discord.gg/ckbvBtDJgC)!
-
-Our [Code of Conduct](https://github.com/fallenbagel/jellyseerr/blob/develop/CODE_OF_CONDUCT.md) applies to all Jellyseerr community channels.
-
-## Contributing
-
-You can help improve Jellyseerr too! Check out our [Contribution Guide](https://github.com/fallenbagel/jellyseerr/blob/develop/CONTRIBUTING.md) to get started.
+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/fallen.bagel)

cypress.config.ts

@@ -1,19 +0,0 @@
-import { defineConfig } from 'cypress';
-
-export default defineConfig({
-  projectId: 'xkm1b4',
-  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

@@ -1,149 +0,0 @@
-{
-  "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

@@ -1,210 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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/pull-to-refresh.cy.ts

@@ -1,25 +0,0 @@
-describe('Pull To Refresh', () => {
-  beforeEach(() => {
-    cy.login(Cypress.env('ADMIN_EMAIL'), Cypress.env('ADMIN_PASSWORD'));
-    cy.viewport(390, 844);
-    cy.visitMobile('/');
-  });
-
-  it('reloads the current page', () => {
-    cy.wait(500);
-
-    cy.intercept({
-      method: 'GET',
-      url: '/api/v1/*',
-    }).as('apiCall');
-
-    cy.get('.searchbar').swipe('bottom', [190, 400]);
-
-    cy.wait('@apiCall').then((interception) => {
-      assert.isNotNull(
-        interception.response.body,
-        'API was called and received data'
-      );
-    });
-  });
-});

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

@@ -1,32 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

@@ -1,74 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,70 +0,0 @@
-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

@@ -1,25 +0,0 @@
-{
-  "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

@@ -1,35 +0,0 @@
-/// <reference types="cypress" />
-import 'cy-mobile-commands';
-
-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

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

cypress/support/index.ts

@@ -1,14 +0,0 @@
-/* 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

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

docs/README.md

@@ -21,4 +21,4 @@ The primary motivation for starting this project was to have an incredibly perfo
 
 Overseerr is an ambitious project. We have already poured a lot of work into this, and have a lot more to do. We need your valuable feedback and help to find and fix bugs. Also, with Overseerr being an open-source project, anyone is welcome to contribute. Contribution includes building new features, patching bugs, translating the application, or even just writing documentation.
 
-If you would like to contribute, please be sure to review our [contribution guidelines](https://github.com/fallenbagel/jellyseerr/blob/develop/CONTRIBUTING.md).
+If you would like to contribute, please be sure to review our [contribution guidelines](https://github.com/sct/overseerr/blob/develop/CONTRIBUTING.md).

docs/SUMMARY.md

@@ -14,7 +14,6 @@
   - [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 = .*\[warn\]\[API\]\: Failed sign-in attempt.*"ip":"<HOST>"
+failregex = .*\[info\]\[Auth\]\: 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/reverse-proxy.md

@@ -138,7 +138,6 @@ location ^~ /overseerr {
     sub_filter 'href="/"' 'href="/$app"';
     sub_filter 'href="/login"' 'href="/$app/login"';
     sub_filter 'href:"/"' 'href:"/$app"';
-    sub_filter '\/_next' '\/$app\/_next';
     sub_filter '/_next' '/$app/_next';
     sub_filter '/api/v1' '/$app/api/v1';
     sub_filter '/login/plex/loading' '/$app/login/plex/loading';
@@ -146,7 +145,8 @@ location ^~ /overseerr {
     sub_filter '/android-' '/$app/android-';
     sub_filter '/apple-' '/$app/apple-';
     sub_filter '/favicon' '/$app/favicon';
-    sub_filter '/logo_' '/$app/logo_';
+    sub_filter '/logo_full.svg' '/$app/logo_full.svg';
+    sub_filter '/logo_stacked.svg' '/$app/logo_stacked.svg';
     sub_filter '/site.webmanifest' '/$app/site.webmanifest';
 }
 ```

docs/extending-overseerr/third-party.md

@@ -1,15 +1,13 @@
 # Third-Party Integrations
 
 {% hint style="warning" %}
-**We do not officially support these third-party integrations.** If you run into any issues, please seek help on the appropriate support channels for the integration itself!
+We do not officially support these third-party integrations. If you run into any issues, please seek help on the appropriate support channels for the integration itself!
 {% endhint %}
 
 - [Organizr](https://organizr.app/), a HTPC/homelab services organizer
 - [Heimdall](https://github.com/linuxserver/Heimdall), an application dashboard and launcher
 - [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
 - [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

@@ -1,7 +1,7 @@
 # Installation
 
 {% hint style="danger" %}
-**Overseerr is currently in BETA.** If you would like to help test the bleeding edge, please use the image **`fallenbagel/jellyseerr:develop`**!
+**Overseerr is currently in BETA.** If you would like to help test the bleeding edge, please use the image **`sctx/overseerr:develop`**!
 {% endhint %}
 
 {% hint style="info" %}
@@ -10,18 +10,8 @@ After running Overseerr for the first time, configure it by visiting the web UI
 
 ## Docker
 
-{% hint style="warning" %}
-Be sure to replace `/path/to/appdata/config` in the below examples with a valid host directory path. If this volume mount is not configured correctly, your Overseerr settings/data will not be persisted when the container is recreated (e.g., when updating the image or rebooting your machine).
-
-The `TZ` environment variable value should also be set to the [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) of your time zone!
-{% endhint %}
-
 {% tabs %}
-{% tab title="Docker CLI" %}
-
-For details on the Docker CLI, please [review the official `docker run` documentation](https://docs.docker.com/engine/reference/run/).
-
-**Installation:**
+{% tab title="Basic" %}
 
 ```bash
 docker run -d \
@@ -31,44 +21,14 @@ docker run -d \
   -p 5055:5055 \
   -v /path/to/appdata/config:/app/config \
   --restart unless-stopped \
-  fallenbagel/jellyseerr
+  sctx/overseerr
 ```
 
-To run the container as a specific user/group, you may optionally add `--user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]` to the above command.
-
-**Updating:**
-
-Stop and remove the existing container:
-
-```bash
-docker stop overseerr && docker rm overseerr
-```
-
-Pull the latest image:
-
-```bash
-docker pull fallenbagel/jellyseerr
-```
-
-Finally, run the container with the same parameters originally used to create the container:
-
-```bash
-docker run -d ...
-```
-
-{% hint style="info" %}
-You may alternatively use a third-party updating mechanism, such as [Watchtower](https://github.com/containrrr/watchtower) or [Ouroboros](https://github.com/pyouroboros/ouroboros), to keep Overseerr up-to-date automatically.
-{% endhint %}
-
 {% endtab %}
 
-{% tab title="Docker Compose" %}
+{% tab title="Compose" %}
 
-For details on how to use Docker Compose, please [review the official Compose documentation](https://docs.docker.com/compose/reference/).
-
-**Installation:**
-
-Define the `overseerr` service in your `docker-compose.yml` as follows:
+**docker-compose.yml:**
 
 ```yaml
 ---
@@ -76,7 +36,7 @@ version: '3'
 
 services:
   overseerr:
-    image: fallenbagel/jellyseerr:latest
+    image: sctx/overseerr:latest
     container_name: overseerr
     environment:
       - LOG_LEVEL=debug
@@ -88,29 +48,47 @@ services:
     restart: unless-stopped
 ```
 
-Then, start all services defined in the your Compose file:
+{% endtab %}
 
-```bash
-docker-compose up -d
+{% tab title="UID/GID" %}
+
+```text
+docker run -d \
+  --name overseerr \
+  --user=[ user | user:group | uid | uid:gid | user:gid | uid:group ] \
+  -e LOG_LEVEL=debug \
+  -e TZ=Asia/Tokyo \
+  -p 5055:5055 \
+  -v /path/to/appdata/config:/app/config \
+  --restart unless-stopped \
+   sctx/overseerr
 ```
 
-**Updating:**
+{% endtab %}
 
-Pull the latest image:
+{% tab title="Manual Update" %}
 
 ```bash
-docker-compose pull overseerr
-```
+# Stop the Overseerr container
+docker stop overseerr
 
-Then, restart all services defined in the Compose file:
+# Remove the Overseerr container
+docker rm overseerr
 
-```bash
-docker-compose up -d
+# Pull the latest update
+docker pull sctx/overseerr
+
+# Run the Overseerr container with the same parameters as before
+docker run -d ...
 ```
 
 {% endtab %}
 {% endtabs %}
 
+{% hint style="info" %}
+Use a 3rd party updating mechanism such as [Watchtower](https://github.com/containrrr/watchtower) or [Ouroboros](https://github.com/pyouroboros/ouroboros) to keep Overseerr up-to-date automatically.
+{% endhint %}
+
 ## Unraid
 
 1. Ensure you have the **Community Applications** plugin installed.
@@ -143,7 +121,7 @@ or the Docker Desktop app:
 Then, create and start the Overseerr container:
 
 ```bash
-docker run -d --name overseerr -e LOG_LEVEL=debug -e TZ=Asia/Tokyo -p 5055:5055 -v "overseerr-data:/app/config" --restart unless-stopped fallenbagel/jellyseerr:latest
+docker run -d -e LOG_LEVEL=debug -e TZ=Asia/Tokyo -p 5055:5055 -v "overseerr-data:/app/config" --restart unless-stopped sctx/overseerr
 ```
 
 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.
@@ -166,24 +144,29 @@ The [Overseerr snap](https://snapcraft.io/overseerr) is the only officially supp
 Currently, the listening port cannot be changed, so port `5055` will need to be available on your host. To install `snapd`, please refer to the [Snapcraft documentation](https://snapcraft.io/docs/installing-snapd).
 {% endhint %}
 
-**Installation:**
+**To install:**
 
 ```
 sudo snap install overseerr
 ```
 
-{% hint style="danger" %}
-To install the development build, add the `--edge` argument to the above command (i.e., `sudo snap install overseerr --edge`). However, note that this version can break any moment. Be prepared to troubleshoot any issues that arise!
-{% endhint %}
-
 **Updating:**
-
 Snap will keep Overseerr up-to-date automatically. You can force a refresh by using the following command.
 
-```bash
+```
 sudo snap refresh
 ```
 
+**To install the development build:**
+
+```
+sudo snap install overseerr --edge
+```
+
+{% hint style="danger" %}
+This version can break any moment. Be prepared to troubleshoot any issues that arise!
+{% endhint %}
+
 ## Third-Party
 
 {% tabs %}

docs/support/faq.md

@@ -1,7 +1,7 @@
 # Frequently Asked Questions (FAQ)
 
 {% hint style="info" %}
-If you can't find the solution to your problem here, please read [Need Help?](./need-help.md) and reach out to us on [Discord](https://discord.gg/ckbvBtDJgC).
+If you can't find the solution to your problem here, please read [Need Help?](./need-help.md) and reach out to us on [Discord](https://discord.gg/overseerr).
 
 _Please do not post questions or support requests on the GitHub issue tracker!_
 {% endhint %}
@@ -20,12 +20,6 @@ A more advanced, user-friendly, and secure (if using SSL) method is to set up a
 
 The most secure method (but also the most inconvenient method) is to set up a VPN tunnel to your home server. You would then be able to access Overseerr as if you were on your local network, via `http://LOCAL-IP-ADDRESS:5055`.
 
-### Are there mobile apps for Overseerr?
-
-Since Overseerr has an almost native app experience when installed as a Progressive Web App (PWA), there are no plans to develop mobile apps for Overseerr.
-
-Out of the box, Overseerr already fulfills most of the [PWA install criteria](https://web.dev/install-criteria/). You simply need to make sure that your Overseerr instance is being served over HTTPS (e.g., via a [reverse proxy](../extending-overseerr/reverse-proxy.md)).
-
 ### Overseerr is amazing! But it is not translated in my language yet! Can I help with translations?
 
 You sure can! We are using [Weblate](https://hosted.weblate.org/engage/overseerr/) for translations. If your language is not listed, please [open a feature request on GitHub](https://github.com/sct/overseerr/issues/new/choose).
@@ -34,7 +28,7 @@ You sure can! We are using [Weblate](https://hosted.weblate.org/engage/overseerr
 
 You can find the changelog for your version (stable/`latest`,s or `develop`) in the **Settings → About** page in your Overseerr instance.
 
-You can alternatively review the [stable release history](https://github.com/fallenbagel/jellyseerr/releases) and [`develop` branch commit history](https://github.com/fallenbagel/jellyseerr/commits/develop) on GitHub.
+You can alternatively review the [stable release history](https://github.com/sct/overseerr/releases) and [`develop` branch commit history](https://github.com/sct/overseerr/commits/develop) on GitHub.
 
 ### Some media is missing from Overseerr that I know is in Plex!
 
@@ -45,7 +39,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 +61,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"`
@@ -88,7 +82,7 @@ Yes! Please see the [documentation for creating local users](../using-overseerr/
 
 ### Is is possible to set user roles in Overseerr?
 
-Permissions can be configured for each user via the **User List** or their **User Settings** page. The list of assignable permissions is still growing, so if you have any suggestions, [submit a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose)!
+Permissions can be configured for each user via the **User List** or their **User Settings** page. The list of assignable permissions is still growing, so if you have any suggestions, [submit a feature request](https://github.com/sct/overseerr/issues/new/choose)!
 
 ## Requests
 
@@ -118,16 +112,10 @@ If you configured a URL base in Sonarr, make sure you have also configured the [
 
 Also, check that you are using Sonarr v3 and that you have configured a default language profile in Overseerr.
 
-Language profile support for Sonarr was added in [v1.20.0](https://github.com/fallenbagel/jellyseerr/releases/tag/v1.20.0) along with a new, _required_ **Language Profile** setting. If series requests are failing, make sure that you have a default language profile configured for each of your Sonarr servers in **Settings &rarr; Services**.
+Language profile support for Sonarr was added in [v1.20.0](https://github.com/sct/overseerr/releases/tag/v1.20.0) along with a new, _required_ **Language Profile** setting. If series requests are failing, make sure that you have a default language profile configured for each of your Sonarr servers in **Settings &rarr; Services**.
 
 ## Notifications
 
 ### I am getting "Username and Password not accepted" when attempting to send email notifications via Gmail!
 
 If you have 2-Step Verification enabled on your account, you will need to create an [app password](https://support.google.com/mail/answer/185833).
-
-### The logo image in email notifications is broken!
-
-This may be an issue with how you are proxying your Overseerr instance. A good first troubleshooting step is to verify that the [`Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) being set by your proxy (if any) is configured appropriately to allow external embedding of the image.
-
-For Gmail users, another possible issue is that Google's image URL proxy is being blocked from fetching the image. If using Cloudflare, overzealous firewall rules could be the culprit.

docs/support/need-help.md

@@ -9,7 +9,7 @@ Before seeking assistance, please make sure you have first tried these following
 - **Analyzing** your logs, you just might find the solution yourself!
 - **Searching** the [documentation](../README.md), [installation guide](../getting-started/installation.md), and [FAQs](./faq.md).
 
-If you still have questions after troubleshooting on your own, feel free to ask on [Discord](https://discord.gg/ckbvBtDJgC)! (Please review our [Code of Conduct](https://github.com/fallenbagel/jellyseerr/blob/develop/CODE_OF_CONDUCT.md) before posting.)
+If you still have questions after troubleshooting on your own, feel free to ask on [Discord](https://discord.gg/overseerr)! (Please review our [Code of Conduct](https://github.com/sct/overseerr/blob/develop/CODE_OF_CONDUCT.md) before posting.)
 
 Be sure to also include a link to your logs. (Please see [How can I share my logs?](#how-can-i-share-my-logs) below.)
 
@@ -19,11 +19,6 @@ 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?
@@ -42,4 +37,4 @@ Try to answer the following questions:
 
 1. Locate the current log file at `<your Overseerr config directory>/logs/overseerr.log`.
 2. Open the log file and **copy its contents** into a [**secret gist** on GitHub](https://gist.github.com/). If you upload your logs elsewhere, we may ask you to share them again via GitHub Gist.
-3. **Share the link/URL to your secret gist** in the [`#support` channel in our Discord server](https://discord.gg/ckbvBtDJgC).
+3. **Share the link/URL to your secret gist** in the [`#support` channel in our Discord server](https://discord.gg/overseerr).

docs/using-overseerr/notifications/README.md

@@ -7,7 +7,6 @@ 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

@@ -1,15 +0,0 @@
-# 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

@@ -1,17 +1,7 @@
 # Pushbullet
 
-{% hint style="info" %}
-Users can optionally configure personal notifications in their user settings.
-
-User notifications are separate from system notifications, and the available notification types are dependent on user permissions.
-{% endhint %}
-
 ## Configuration
 
 ### 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/pushover.md

@@ -1,16 +1,10 @@
 # Pushover
 
-{% hint style="info" %}
-Users can optionally configure personal notifications in their user settings.
-
-User notifications are separate from system notifications, and the available notification types are dependent on user permissions.
-{% endhint %}
-
 ## Configuration
 
 ### Application/API Token
 
-[Register an application](https://pushover.net/apps/build) and enter the API token in this field. (You can use one of the [official icons in our GitHub repository](https://github.com/fallenbagel/jellyseerr/tree/develop/public) when configuring the application.)
+[Register an application](https://pushover.net/apps/build) and enter the API token in this field. (You can use one of the [official icons in our GitHub repository](https://github.com/sct/overseerr/tree/develop/public) when configuring the application.)
 
 For more details on registering applications or the API token, please see the [Pushover API documentation](https://pushover.net/api#registration).
 

docs/using-overseerr/notifications/telegram.md

@@ -1,9 +1,7 @@
 # Telegram
 
 {% hint style="info" %}
-Users can optionally configure personal notifications in their user settings.
-
-User notifications are separate from system notifications, and the available notification types are dependent on user permissions.
+Users can optionally configure their own notifications in their user settings.
 {% endhint %}
 
 ## Configuration

docs/using-overseerr/notifications/webhooks.md

@@ -24,38 +24,33 @@ Customize the JSON payload to suit your needs. Overseerr provides several [templ
 
 ### General
 
-| Variable                | Value                                                                                                                               |
-| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `{{notification_type}}` | The type of notification (e.g. `MEDIA_PENDING` or `ISSUE_COMMENT`)                                                                  |
-| `{{event}}`             | A friendly description of the notification event                                                                                    |
-| `{{subject}}`           | The notification subject (typically the media title)                                                                                |
-| `{{message}}`           | The notification message body (the media overview/synopsis for request notifications; the issue description for issue notificatons) |
-| `{{image}}`             | The notification image (typically the media poster)                                                                                 |
+- `{{notification_type}}` The type of notification. (Ex. `MEDIA_PENDING` or `MEDIA_APPROVED`)
+- `{{subject}}` The notification subject message. (For request notifications, this is the media title)
+- `{{message}}` Notification message body. (For request notifications, this is the media's overview/synopsis)
+- `{{image}}` Associated image with the request. (For request notifications, this is the media's poster)
 
-### Notify User
+### User
 
 These variables are for the target recipient of the notification.
 
-| Variable                                 | Value                                                         |
-| ---------------------------------------- | ------------------------------------------------------------- |
-| `{{notifyuser_username}}`                | The target notification recipient's username                  |
-| `{{notifyuser_email}}`                   | The target notification recipient's email address             |
-| `{{notifyuser_avatar}}`                  | The target notification recipient's avatar URL                |
-| `{{notifyuser_settings_discordId}}`      | The target notification recipient's Discord ID (if set)       |
-| `{{notifyuser_settings_telegramChatId}}` | The target notification recipient's Telegram Chat ID (if set) |
+- `{{notifyuser_username}}` Target user's username.
+- `{{notifyuser_email}}` Target user's email address.
+- `{{notifyuser_avatar}}` Target user's avatar URL.
+- `{{notifyuser_settings_discordId}}` Target user's Discord ID (if one is set).
+- `{{notifyuser_settings_telegramChatId}}` Target user's Telegram Chat ID (if one is set).
 
 {% 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:
+The `notifyuser` variables are not set for the following notification types, as they are intended for application administrators rather than end users:
 
-- Request Pending Approval
-- Request Automatically Approved
-- Request Processing Failed
+- Media Requested
+- Media Automatically Approved
+- Media Failed
 
 On the other hand, the `notifyuser` variables _will_ be replaced with the requesting user's information for the below notification types:
 
-- Request Approved
-- Request Declined
-- Request Available
+- Media Approved
+- Media Declined
+- Media 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 %}
@@ -64,69 +59,28 @@ If you would like to use the requesting user's information in your webhook, plea
 
 The following variables must be used as a key in the JSON payload (e.g., `"{{extra}}": []`).
 
-| Variable      | Value                                                                                                                          |
-| ------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| `{{media}}`   | The relevant media object                                                                                                      |
-| `{{request}}` | The relevant request object                                                                                                    |
-| `{{issue}}`   | The relevant issue object                                                                                                      |
-| `{{comment}}` | The relevant issue comment object                                                                                              |
-| `{{extra}}`   | The "extra" array of additional data for certain notifications (e.g., season/episode numbers for series-related notifications) |
+- `{{request}}` This object will be `null` if there is no relevant request object for the notification.
+- `{{media}}` This object will be `null` if there is no relevant media object for the notification.
+- `{{extra}}` This object will contain the "extra" array of additional data for certain notifications.
 
 #### Media
 
-The `{{media}}` will be `null` if there is no relevant media object for the notification.
+These `{{media}}` special variables are only included in media-related notifications, such as requests.
 
-These following special variables are only included in media-related notifications, such as requests.
-
-| Variable             | Value                                                                                                          |
-| -------------------- | -------------------------------------------------------------------------------------------------------------- |
-| `{{media_type}}`     | The media type (`movie` or `tv`)                                                                               |
-| `{{media_tmdbid}}`   | The media's TMDB ID                                                                                            |
-| `{{media_tvdbid}}`   | The media's TheTVDB ID                                                                                         |
-| `{{media_status}}`   | The media's availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`)    |
-| `{{media_status4k}}` | The media's 4K availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`) |
+- `{{media_type}}` Media type (`movie` or `tv`).
+- `{{media_tmdbid}}` Media's TMDb ID.
+- `{{media_imdbid}}` Media's IMDb ID.
+- `{{media_tvdbid}}` Media's TVDB ID.
+- `{{media_status}}` Media's availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`).
+- `{{media_status4k}}` Media's 4K availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`)
 
 #### Request
 
-The `{{request}}` will be `null` if there is no relevant media object for the notification.
+The `{{request}}` special variables are only included in request-related notifications.
 
-The following special variables are only included in request-related notifications.
-
-| Variable                                  | Value                                           |
-| ----------------------------------------- | ----------------------------------------------- |
-| `{{request_id}}`                          | The request ID                                  |
-| `{{requestedBy_username}}`                | The requesting user's username                  |
-| `{{requestedBy_email}}`                   | The requesting user's email address             |
-| `{{requestedBy_avatar}}`                  | The requesting user's avatar URL                |
-| `{{requestedBy_settings_discordId}}`      | The requesting user's Discord ID (if set)       |
-| `{{requestedBy_settings_telegramChatId}}` | The requesting user's Telegram Chat ID (if set) |
-
-#### Issue
-
-The `{{issue}}` will be `null` if there is no relevant media object for the notification.
-
-The following special variables are only included in issue-related notifications.
-
-| Variable                                 | Value                                           |
-| ---------------------------------------- | ----------------------------------------------- |
-| `{{issue_id}}`                           | The issue ID                                    |
-| `{{reportedBy_username}}`                | The requesting user's username                  |
-| `{{reportedBy_email}}`                   | The requesting user's email address             |
-| `{{reportedBy_avatar}}`                  | The requesting user's avatar URL                |
-| `{{reportedBy_settings_discordId}}`      | The requesting user's Discord ID (if set)       |
-| `{{reportedBy_settings_telegramChatId}}` | The requesting user's Telegram Chat ID (if set) |
-
-#### Comment
-
-The `{{comment}}` will be `null` if there is no relevant media object for the notification.
-
-The following special variables are only included in issue comment-related notifications.
-
-| Variable                                  | Value                                           |
-| ----------------------------------------- | ----------------------------------------------- |
-| `{{comment_message}}`                     | The comment message                             |
-| `{{commentedBy_username}}`                | The commenting user's username                  |
-| `{{commentedBy_email}}`                   | The commenting user's email address             |
-| `{{commentedBy_avatar}}`                  | The commenting user's avatar URL                |
-| `{{commentedBy_settings_discordId}}`      | The commenting user's Discord ID (if set)       |
-| `{{commentedBy_settings_telegramChatId}}` | The commenting user's Telegram Chat ID (if set) |
+- `{{request_id}}` Request ID.
+- `{{requestedBy_username}}` Requesting user's username.
+- `{{requestedBy_email}}` Requesting user's email address.
+- `{{requestedBy_avatar}}` Requesting user's avatar URL.
+- `{{requestedBy_settings_discordId}}` Requesting user's Discord ID (if set).
+- `{{requestedBy_settings_telegramChatId}}` Requesting user's Telegram Chat ID (if set).

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 Plex Users
+### Importing Users from Plex
 
-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.
+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.
 
 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

@@ -1,21 +0,0 @@
-/* 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,4 +1,5 @@
 /// <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,14 +1,7 @@
-/**
- * @type {import('next').NextConfig}
- */
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
   },
-  publicRuntimeConfig: {
-    // Will be available on both server and client
-    JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
-  },
   images: {
     domains: ['image.tmdb.org'],
   },
@@ -21,7 +14,4 @@ module.exports = {
 
     return config;
   },
-  experimental: {
-    scrollRestoration: true,
-  },
 };

ormconfig.js

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

package.json

@@ -1,185 +1,164 @@
 {
   "name": "jellyseerr",
-  "version": "0.1.0",
+  "version": "1.0.1",
   "private": true,
   "scripts": {
-    "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",
+    "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",
     "build:next": "next build",
     "build": "yarn build:next && yarn build:server",
-    "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache",
+    "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\"",
     "start": "NODE_ENV=production node dist/index.js",
     "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
-    "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",
-    "url": "https://github.com/fallenbagel/jellyseerr.git"
+    "migration:generate": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:generate",
+    "migration:create": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:create",
+    "migration:run": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:run",
+    "format": "prettier --write ."
   },
   "license": "MIT",
   "dependencies": {
-    "@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",
-    "cronstrue": "2.11.0",
-    "csurf": "1.11.0",
-    "date-fns": "2.29.1",
-    "email-templates": "9.0.0",
-    "email-validator": "2.0.4",
-    "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",
+    "@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",
     "gravatar-url": "3.1.0",
-    "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",
-    "pulltorefreshjs": "0.1.22",
-    "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"
+    "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",
+    "uuid": "^8.3.2",
+    "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"
   },
   "devDependencies": {
-    "@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/pulltorefreshjs": "0.1.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",
-    "cy-mobile-commands": "0.3.0",
-    "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"
+    "@babel/cli": "^7.15.7",
+    "@commitlint/cli": "^13.1.0",
+    "@commitlint/config-conventional": "^13.1.0",
+    "@fullhuman/postcss-purgecss": "3.0.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/uuid": "^8.3.1",
+    "@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"
   },
   "resolutions": {
-    "sqlite3/node-gyp": "8.4.1",
-    "@types/react": "18.0.17",
-    "@types/react-dom": "18.0.6"
+    "sqlite3/node-gyp": "^5.1.0"
   },
   "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,css}": [
+    "**/*.{json,md}": [
       "prettier --write"
     ]
   },
@@ -188,6 +167,10 @@
       "@commitlint/config-conventional"
     ]
   },
+  "prettier": {
+    "singleQuote": true,
+    "trailingComma": "es5"
+  },
   "release": {
     "plugins": [
       "@semantic-release/commit-analyzer",
@@ -218,7 +201,7 @@
       ]
     ],
     "branches": [
-      "main"
+      "master"
     ],
     "npmPublish": false,
     "publish": [
@@ -228,7 +211,8 @@
           "COMMIT_TAG": "$GITHUB_SHA"
         },
         "imageNames": [
-          "fallenbagel/jellyseerr"
+          "sctx/overseerr",
+          "ghcr.io/sct/overseerr"
         ],
         "platforms": [
           "linux/amd64",

public/offline.html

@@ -4,7 +4,6 @@
     <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>
 

public/preview.jpg:Zone.Identifier

@@ -0,0 +1,3 @@
+[ZoneTransfer]
+LastWriterPackageFamilyName=Microsoft.ScreenSketch_8wekyb3d8bbwe
+ZoneId=3

public/sw.js

@@ -90,8 +90,8 @@ self.addEventListener('push', (event) => {
   if (payload.actionUrl){
     options.actions.push(
       {
-        action: 'view',
-        title: payload.actionUrlTitle ?? 'View',
+        action: 'viewmedia',
+        title: 'View Media',
       }
     );
   }
@@ -119,17 +119,21 @@ self.addEventListener('notificationclick', (event) => {
 
   event.notification.close();
 
-  if (event.action === 'approve') {
+  if (event.action === 'viewmedia') {
+    clients.openWindow(notificationData.actionUrl);
+  } else if (event.action === 'approve') {
     fetch(`/api/v1/request/${notificationData.requestId}/approve`, {
       method: 'POST',
     });
+
+    clients.openWindow(notificationData.actionUrl);
   } else if (event.action === 'decline') {
     fetch(`/api/v1/request/${notificationData.requestId}/decline`, {
       method: 'POST',
     });
-  }
-  
-  if (notificationData.actionUrl) {
+
+    clients.openWindow(notificationData.actionUrl);
+  } else if (notificationData.actionUrl) {
     clients.openWindow(notificationData.actionUrl);
   }
 }, false);

renovate.json

@@ -1,21 +0,0 @@
-{
-  "$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 xml2js from 'xml2js';
+import logger from '../logger';
 
 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,7 +1,5 @@
-import type { AxiosInstance, AxiosRequestConfig } from 'axios';
-import axios from 'axios';
-import rateLimit from 'axios-rate-limit';
-import type NodeCache from 'node-cache';
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import NodeCache from 'node-cache';
 
 // 5 minute default TTL (in seconds)
 const DEFAULT_TTL = 300;
@@ -12,10 +10,6 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
   nodeCache?: NodeCache;
   headers?: Record<string, unknown>;
-  rateLimit?: {
-    maxRPS: number;
-    maxRequests: number;
-  };
 }
 
 class ExternalAPI {
@@ -37,14 +31,6 @@ 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 '@server/lib/cache';
-import logger from '@server/logger';
+import cacheManager from '../lib/cache';
+import logger from '../logger';
 import ExternalAPI from './externalapi';
 
 interface GitHubRelease {
@@ -83,7 +83,7 @@ class GithubAPI extends ExternalAPI {
   } = {}): Promise<GitHubRelease[]> {
     try {
       const data = await this.get<GitHubRelease[]>(
-        '/repos/fallenbagel/jellyseerr/releases',
+        '/repos/Fallenbagel/jellyseerr/releases',
         {
           params: {
             per_page: take,
@@ -110,7 +110,7 @@ class GithubAPI extends ExternalAPI {
   } = {}): Promise<GithubCommit[]> {
     try {
       const data = await this.get<GithubCommit[]>(
-        '/repos/fallenbagel/jellyseerr/commits',
+        '/repos/Fallenbagel/jellyseerr/commits',
         {
           params: {
             per_page: take,
@@ -122,7 +122,7 @@ class GithubAPI extends ExternalAPI {
       return data;
     } catch (e) {
       logger.warn(
-        "Failed to retrieve GitHub commits. This may be an issue on GitHub's end. Overseerr can't check if it's on the latest version.",
+        "Failed to retrieve GitHub commits. This may be an issue on GitHub's end. Jellyseerr can't check if it's on the latest version.",
         { label: 'GitHub API', errorMessage: e.message }
       );
       return [];

server/api/jellyfin.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import logger from '@server/logger';
-import type { AxiosInstance } from 'axios';
-import axios from 'axios';
+import axios, { AxiosInstance } from 'axios';
+import logger from '../logger';
 
 export interface JellyfinUserResponse {
   Name: string;
@@ -16,10 +15,6 @@ export interface JellyfinLoginResponse {
   AccessToken: string;
 }
 
-export interface JellyfinUserListResponse {
-  users: JellyfinUserResponse[];
-}
-
 export interface JellyfinLibrary {
   type: 'show' | 'movie';
   key: string;
@@ -32,13 +27,11 @@ export interface JellyfinLibraryItem {
   Id: string;
   HasSubtitles: boolean;
   Type: 'Movie' | 'Episode' | 'Season' | 'Series';
-  LocationType: 'FileSystem' | 'Offline' | 'Remote' | 'Virtual';
   SeriesName?: string;
   SeriesId?: string;
   SeasonId?: string;
   SeasonName?: string;
   IndexNumber?: number;
-  IndexNumberEnd?: number;
   ParentIndexNumber?: number;
   MediaType: string;
 }
@@ -88,9 +81,9 @@ class JellyfinAPI {
 
     let authHeaderVal = '';
     if (this.authToken) {
-      authHeaderVal = `MediaBrowser Client="Overseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0", Token="${authToken}"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0", Token="${authToken}"`;
     } else {
-      authHeaderVal = `MediaBrowser Client="Overseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0"`;
     }
 
     this.axios = axios.create({
@@ -129,7 +122,7 @@ class JellyfinAPI {
   public async getServerName(): Promise<string> {
     try {
       const account = await this.axios.get<JellyfinUserResponse>(
-        "/System/Info/Public'}"
+        `/System/Info/Public'}`
       );
       return account.data.ServerName;
     } catch (e) {
@@ -141,19 +134,6 @@ class JellyfinAPI {
     }
   }
 
-  public async getUsers(): Promise<JellyfinUserListResponse> {
-    try {
-      const account = await this.axios.get(`/Users`);
-      return { users: account.data };
-    } catch (e) {
-      logger.error(
-        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
-      );
-      throw new Error('Invalid auth token');
-    }
-  }
-
   public async getUser(): Promise<JellyfinUserResponse> {
     try {
       const account = await this.axios.get<JellyfinUserResponse>(
@@ -208,9 +188,7 @@ class JellyfinAPI {
         `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie&Recursive=true&StartIndex=0&ParentId=${id}`
       );
 
-      return contents.data.Items.filter(
-        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
-      );
+      return contents.data.Items;
     } catch (e) {
       logger.error(
         `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
@@ -256,9 +234,7 @@ class JellyfinAPI {
     try {
       const contents = await this.axios.get<any>(`/Shows/${seriesID}/Seasons`);
 
-      return contents.data.Items.filter(
-        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
-      );
+      return contents.data.Items;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
@@ -277,9 +253,7 @@ class JellyfinAPI {
         `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
       );
 
-      return contents.data.Items.filter(
-        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
-      );
+      return contents.data.Items;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,

server/api/plexapi.ts

@@ -1,7 +1,5 @@
-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';
 
 export interface PlexLibraryItem {
   ratingKey: string;
@@ -124,13 +122,14 @@ class PlexAPI {
       // },
       options: {
         identifier: settings.clientId,
-        product: 'Overseerr',
-        deviceName: 'Overseerr',
-        platform: 'Overseerr',
+        product: 'Jellyseerr',
+        deviceName: 'Jellyseerr',
+        platform: 'Jellyseerr',
       },
     });
   }
 
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   public async getStatus() {
     return await this.plexClient.query('/');
   }
@@ -146,40 +145,28 @@ class PlexAPI {
   public async syncLibraries(): Promise<void> {
     const settings = getSettings();
 
-    try {
-      const libraries = await this.getLibraries();
+    const libraries = await this.getLibraries();
 
-      const newLibraries: Library[] = libraries
-        // Remove libraries that are not movie or show
-        .filter(
-          (library) => library.type === 'movie' || library.type === 'show'
-        )
-        // Remove libraries that do not have a metadata agent set (usually personal video libraries)
-        .filter((library) => library.agent !== 'com.plexapp.agents.none')
-        .map((library) => {
-          const existing = settings.plex.libraries.find(
-            (l) => l.id === library.key && l.name === library.title
-          );
+    const newLibraries: Library[] = libraries
+      // Remove libraries that are not movie or show
+      .filter((library) => library.type === 'movie' || library.type === 'show')
+      // Remove libraries that do not have a metadata agent set (usually personal video libraries)
+      .filter((library) => library.agent !== 'com.plexapp.agents.none')
+      .map((library) => {
+        const existing = settings.plex.libraries.find(
+          (l) => l.id === library.key && l.name === library.title
+        );
 
-          return {
-            id: library.key,
-            name: library.title,
-            enabled: existing?.enabled ?? false,
-            type: library.type,
-            lastScan: existing?.lastScan,
-          };
-        });
-
-      settings.plex.libraries = newLibraries;
-    } catch (e) {
-      logger.error('Failed to fetch Plex libraries', {
-        label: 'Plex API',
-        message: e.message,
+        return {
+          id: library.key,
+          name: library.title,
+          enabled: existing?.enabled ?? false,
+          type: library.type,
+          lastScan: existing?.lastScan,
+        };
       });
 
-      settings.plex.libraries = [];
-    }
-
+    settings.plex.libraries = newLibraries;
     settings.save();
   }
 
@@ -232,10 +219,6 @@ class PlexAPI {
       uri: `/library/sections/${id}/all?sort=addedAt%3Adesc&addedAt>>=${Math.floor(
         options.addedAt / 1000
       )}`,
-      extraHeaders: {
-        'X-Plex-Container-Start': `0`,
-        'X-Plex-Container-Size': `500`,
-      },
     });
 
     return response.MediaContainer.Metadata;

server/api/plextv.ts

@@ -1,9 +1,8 @@
-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 axios, { AxiosInstance } from 'axios';
 import xml2js from 'xml2js';
-import ExternalAPI from './externalapi';
+import { PlexDevice } from '../interfaces/api/plexInterfaces';
+import { getSettings } from '../lib/settings';
+import logger from '../logger';
 
 interface PlexAccountResponse {
   user: PlexUser;
@@ -112,54 +111,20 @@ interface UsersResponse {
   };
 }
 
-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 {
+class PlexTvAPI {
   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[]> {
@@ -259,7 +224,7 @@ class PlexTvAPI extends ExternalAPI {
 
       const users = friends.MediaContainer.User;
 
-      const user = users.find((u) => parseInt(u.$.id) === userId);
+      const user = users.find((u) => Number(u.$.id) === userId);
 
       if (!user) {
         throw new Error(
@@ -287,83 +252,6 @@ class PlexTvAPI extends ExternalAPI {
     )) 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 '@server/lib/cache';
+import cacheManager from '../lib/cache';
 import ExternalAPI from './externalapi';
 
 interface RTSearchResult {

server/api/servarr/base.ts

@@ -1,36 +1,6 @@
-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;
-  buildTime: Date;
-  isDebug: boolean;
-  isProduction: boolean;
-  isAdmin: boolean;
-  isUserInteractive: boolean;
-  startupPath: string;
-  appData: string;
-  osName: string;
-  osVersion: string;
-  isNetCore: boolean;
-  isMono: boolean;
-  isLinux: boolean;
-  isOsx: boolean;
-  isWindows: boolean;
-  isDocker: boolean;
-  mode: string;
-  branch: string;
-  authentication: string;
-  sqliteVersion: string;
-  migrationVersion: number;
-  urlBase: string;
-  runtimeVersion: string;
-  runtimeName: string;
-  startTime: Date;
-  packageUpdateMechanism: string;
-}
+import cacheManager, { AvailableCacheIds } from '../../lib/cache';
+import { DVRSettings } from '../../lib/settings';
+import ExternalAPI from '../externalapi';
 
 export interface RootFolder {
   id: number;
@@ -111,18 +81,6 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
     this.apiName = apiName;
   }
 
-  public getSystemStatus = async (): Promise<SystemStatus> => {
-    try {
-      const response = await this.axios.get<SystemStatus>('/system/status');
-
-      return response.data;
-    } catch (e) {
-      throw new Error(
-        `[${this.apiName}] Failed to retrieve system status: ${e.message}`
-      );
-    }
-  };
-
   public getProfiles = async (): Promise<QualityProfile[]> => {
     try {
       const data = await this.getRolling<QualityProfile[]>(

server/api/servarr/radarr.ts

@@ -1,7 +1,7 @@
-import logger from '@server/logger';
+import logger from '../../logger';
 import ServarrBase from './base';
 
-export interface RadarrMovieOptions {
+interface RadarrMovieOptions {
   title: string;
   qualityProfileId: number;
   minimumAvailability: string;
@@ -27,6 +27,7 @@ export interface RadarrMovie {
   profileId: number;
   qualityProfileId: number;
   added: string;
+  downloaded: boolean;
   hasFile: boolean;
 }
 
@@ -69,7 +70,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,
@@ -84,7 +85,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
     try {
       const movie = await this.getMovieByTmdbId(options.tmdbId);
 
-      if (movie.hasFile) {
+      if (movie.downloaded) {
         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 '@server/logger';
+import logger from '../../logger';
 import ServarrBase from './base';
 
 interface SonarrSeason {
@@ -63,7 +63,7 @@ export interface SonarrSeries {
   };
 }
 
-export interface AddSeriesOptions {
+interface AddSeriesOptions {
   tvdbid: number;
   title: string;
   profileId: number;
@@ -149,7 +149,6 @@ 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

@@ -1,294 +0,0 @@
-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 type {
+import cacheManager from '../../lib/cache';
+import ExternalAPI from '../externalapi';
+import {
   TmdbCollection,
   TmdbExternalIdResponse,
   TmdbGenre,
@@ -10,7 +10,7 @@ import type {
   TmdbMovieDetails,
   TmdbNetwork,
   TmdbPersonCombinedCredits,
-  TmdbPersonDetails,
+  TmdbPersonDetail,
   TmdbProductionCompany,
   TmdbRegion,
   TmdbSearchMovieResponse,
@@ -28,10 +28,6 @@ interface SearchOptions {
   language?: string;
 }
 
-interface SingleSearchOptions extends SearchOptions {
-  year?: number;
-}
-
 interface DiscoverMovieOptions {
   page?: number;
   includeAdult?: boolean;
@@ -92,10 +88,6 @@ class TheMovieDb extends ExternalAPI {
       },
       {
         nodeCache: cacheManager.getCache('tmdb').data,
-        rateLimit: {
-          maxRequests: 20,
-          maxRPS: 50,
-        },
       }
     );
     this.region = region;
@@ -124,79 +116,21 @@ 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<TmdbPersonDetails> => {
+  }): Promise<TmdbPersonDetail> => {
     try {
-      const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
+      const data = await this.get<TmdbPersonDetail>(`/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}`);
     }
   };
 
@@ -218,7 +152,7 @@ class TheMovieDb extends ExternalAPI {
       return data;
     } catch (e) {
       throw new Error(
-        `[TMDB] Failed to fetch person combined credits: ${e.message}`
+        `[TMDb] Failed to fetch person combined credits: ${e.message}`
       );
     }
   };
@@ -245,7 +179,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}`);
     }
   };
 
@@ -271,7 +205,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}`);
     }
   };
 
@@ -297,7 +231,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}`);
     }
   };
 
@@ -323,7 +257,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}`);
     }
   }
 
@@ -349,7 +283,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}`);
     }
   }
 
@@ -375,7 +309,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}`);
     }
   }
 
@@ -402,7 +336,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}`
       );
     }
   }
@@ -426,7 +360,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}`);
     }
   }
 
@@ -459,7 +393,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}`);
     }
   };
 
@@ -492,7 +426,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}`);
     }
   };
 
@@ -518,7 +452,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}`);
     }
   };
 
@@ -545,7 +479,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}`);
     }
   };
 
@@ -568,7 +502,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}`);
     }
   };
 
@@ -591,7 +525,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}`);
     }
   };
 
@@ -623,17 +557,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 getMediaByImdbId({
+  public async getMovieByImdbId({
     imdbId,
     language = 'en',
   }: {
     imdbId: string;
     language?: string;
-  }): Promise<TmdbMovieDetails | TmdbTvDetails> {
+  }): Promise<TmdbMovieDetails> {
     try {
       const extResponse = await this.getByExternalId({
         externalId: imdbId,
@@ -649,19 +583,12 @@ class TheMovieDb extends ExternalAPI {
         return movie;
       }
 
-      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}`);
+      throw new Error(
+        '[TMDb] Failed to find a title with the provided IMDB id'
+      );
     } catch (e) {
       throw new Error(
-        `[TMDB] Failed to find media using external IMDb ID: ${e.message}`
+        `[TMDb] Failed to get movie by external imdb ID: ${e.message}`
       );
     }
   }
@@ -691,7 +618,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}`
       );
     }
   }
@@ -715,7 +642,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}`);
     }
   }
 
@@ -731,7 +658,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}`);
     }
   }
 
@@ -747,7 +674,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}`);
     }
   }
 
@@ -759,7 +686,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}`);
     }
   }
 
@@ -769,7 +696,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}`);
     }
   }
 
@@ -820,7 +747,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}`);
     }
   }
 
@@ -871,7 +798,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,7 +67,6 @@ export interface TmdbUpcomingMoviesResponse extends TmdbPaginatedResponse {
 export interface TmdbExternalIdResponse {
   movie_results: TmdbMovieResult[];
   tv_results: TmdbTvResult[];
-  person_results: TmdbPersonResult[];
 }
 
 export interface TmdbCreditCast {
@@ -191,7 +190,7 @@ export interface TmdbVideo {
 
 export interface TmdbTvEpisodeResult {
   id: number;
-  air_date: string | null;
+  air_date: string;
   episode_number: number;
   name: string;
   overview: string;
@@ -252,10 +251,6 @@ export interface TmdbTvDetails {
     name: string;
     origin_country: string;
   }[];
-  production_countries: {
-    iso_3166_1: string;
-    name: string;
-  }[];
   spoken_languages: {
     english_name: string;
     iso_639_1: string;
@@ -316,7 +311,7 @@ export interface TmdbKeyword {
   name: string;
 }
 
-export interface TmdbPersonDetails {
+export interface TmdbPersonDetail {
   id: number;
   name: string;
   birthday: string;
@@ -325,7 +320,7 @@ export interface TmdbPersonDetails {
   also_known_as?: string[];
   gender: number;
   biography: string;
-  popularity: number;
+  popularity: string;
   place_of_birth?: string;
   profile_path?: string;
   adult: boolean;
@@ -372,8 +367,7 @@ export interface TmdbPersonCombinedCredits {
   crew: TmdbPersonCreditCrew[];
 }
 
-export interface TmdbSeasonWithEpisodes
-  extends Omit<TmdbTvSeasonResult, 'episode_count'> {
+export interface TmdbSeasonWithEpisodes extends TmdbTvSeasonResult {
   episodes: TmdbTvEpisodeResult[];
   external_ids: TmdbExternalIds;
 }

server/constants/issue.ts

@@ -1,18 +0,0 @@
-export enum IssueType {
-  VIDEO = 1,
-  AUDIO = 2,
-  SUBTITLES = 3,
-  OTHER = 4,
-}
-
-export enum IssueStatus {
-  OPEN = 1,
-  RESOLVED = 2,
-}
-
-export const IssueTypeName = {
-  [IssueType.AUDIO]: 'Audio',
-  [IssueType.VIDEO]: 'Video',
-  [IssueType.SUBTITLES]: 'Subtitle',
-  [IssueType.OTHER]: 'Other',
-};

server/constants/media.ts

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

server/entity/Issue.ts

@@ -1,69 +0,0 @@
-import type { IssueType } from '@server/constants/issue';
-import { IssueStatus } from '@server/constants/issue';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-import IssueComment from './IssueComment';
-import Media from './Media';
-import { User } from './User';
-
-@Entity()
-class Issue {
-  @PrimaryGeneratedColumn()
-  public id: number;
-
-  @Column({ type: 'int' })
-  public issueType: IssueType;
-
-  @Column({ type: 'int', default: IssueStatus.OPEN })
-  public status: IssueStatus;
-
-  @Column({ type: 'int', default: 0 })
-  public problemSeason: number;
-
-  @Column({ type: 'int', default: 0 })
-  public problemEpisode: number;
-
-  @ManyToOne(() => Media, (media) => media.issues, {
-    eager: true,
-    onDelete: 'CASCADE',
-  })
-  public media: Media;
-
-  @ManyToOne(() => User, (user) => user.createdIssues, {
-    eager: true,
-    onDelete: 'CASCADE',
-  })
-  public createdBy: User;
-
-  @ManyToOne(() => User, {
-    eager: true,
-    onDelete: 'CASCADE',
-    nullable: true,
-  })
-  public modifiedBy?: User;
-
-  @OneToMany(() => IssueComment, (comment) => comment.issue, {
-    cascade: true,
-    eager: true,
-  })
-  public comments: IssueComment[];
-
-  @CreateDateColumn()
-  public createdAt: Date;
-
-  @UpdateDateColumn()
-  public updatedAt: Date;
-
-  constructor(init?: Partial<Issue>) {
-    Object.assign(this, init);
-  }
-}
-
-export default Issue;

server/entity/IssueComment.ts

@@ -1,42 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-import Issue from './Issue';
-import { User } from './User';
-
-@Entity()
-class IssueComment {
-  @PrimaryGeneratedColumn()
-  public id: number;
-
-  @ManyToOne(() => User, {
-    eager: true,
-    onDelete: 'CASCADE',
-  })
-  public user: User;
-
-  @ManyToOne(() => Issue, (issue) => issue.comments, {
-    onDelete: 'CASCADE',
-  })
-  public issue: Issue;
-
-  @Column({ type: 'text' })
-  public message: string;
-
-  @CreateDateColumn()
-  public createdAt: Date;
-
-  @UpdateDateColumn()
-  public updatedAt: Date;
-
-  constructor(init?: Partial<IssueComment>) {
-    Object.assign(this, init);
-  }
-}
-
-export default IssueComment;

server/entity/Media.ts

@@ -1,24 +1,22 @@
-import RadarrAPI from '@server/api/servarr/radarr';
-import SonarrAPI from '@server/api/servarr/sonarr';
-import { MediaStatus, MediaType } from '@server/constants/media';
-import { MediaServerType } from '@server/constants/server';
-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 Issue from './Issue';
+import RadarrAPI from '../api/servarr/radarr';
+import SonarrAPI from '../api/servarr/sonarr';
+import { MediaStatus, MediaType } from '../constants/media';
+import { MediaServerType } from '../constants/server';
+import downloadTracker, { DownloadingItem } from '../lib/downloadtracker';
+import { getSettings } from '../lib/settings';
+import logger from '../logger';
 import { MediaRequest } from './MediaRequest';
 import Season from './Season';
 
@@ -38,7 +36,7 @@ class Media {
       }
 
       const media = await mediaRepository.find({
-        where: { tmdbId: In(finalIds) },
+        tmdbId: In(finalIds),
       });
 
       return media;
@@ -57,10 +55,10 @@ class Media {
     try {
       const media = await mediaRepository.findOne({
         where: { tmdbId: id, mediaType },
-        relations: { requests: true, issues: true },
+        relations: ['requests'],
       });
 
-      return media ?? undefined;
+      return media;
     } catch (e) {
       logger.error(e.message);
       return undefined;
@@ -100,9 +98,6 @@ class Media {
   })
   public seasons: Season[];
 
-  @OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
-  public issues: Issue[];
-
   @CreateDateColumn()
   public createdAt: Date;
 
@@ -153,67 +148,27 @@ class Media {
   public mediaUrl?: string;
   public mediaUrl4k?: string;
 
-  public iOSPlexUrl?: string;
-  public iOSPlexUrl4k?: string;
-
-  public tautulliUrl?: string;
-  public tautulliUrl4k?: string;
-
   constructor(init?: Partial<Media>) {
     Object.assign(this, init);
   }
 
   @AfterLoad()
-  public setPlexUrls(): void {
-    const { machineId, webAppUrl } = getSettings().plex;
-    const { externalUrl: tautulliUrl } = getSettings().tautulli;
-
-    if (getSettings().main.mediaServerType == MediaServerType.PLEX) {
+  public setMediaUrls(): void {
+    const settings = getSettings();
+    if (settings.main.mediaServerType == MediaServerType.PLEX) {
       if (this.ratingKey) {
-        this.mediaUrl = `${
-          webAppUrl ? webAppUrl : 'https://app.plex.tv/desktop'
-        }#!/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) {
-          this.mediaUrl4k = `${
-            webAppUrl ? webAppUrl : 'https://app.plex.tv/desktop'
-          }#!/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}`;
-          }
-        }
+        this.mediaUrl = `https://app.plex.tv/desktop#!/server/${settings.plex.machineId}/details?key=%2Flibrary%2Fmetadata%2F${this.ratingKey}`;
+      }
+      if (this.ratingKey4k) {
+        this.mediaUrl4k = `https://app.plex.tv/desktop#!/server/${settings.plex.machineId}/details?key=%2Flibrary%2Fmetadata%2F${this.ratingKey4k}`;
       }
     } else {
-      const pageName =
-        process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
-      const { serverId, hostname, externalHostname } = getSettings().jellyfin;
-      let jellyfinHost =
-        externalHostname && externalHostname.length > 0
-          ? externalHostname
-          : hostname;
-
-      jellyfinHost = jellyfinHost!.endsWith('/')
-        ? jellyfinHost!.slice(0, -1)
-        : jellyfinHost;
-
+      const pageName = process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
       if (this.jellyfinMediaId) {
-        this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
+        this.mediaUrl = `${settings.jellyfin.hostname}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${settings.jellyfin.serverId}`;
       }
       if (this.jellyfinMediaId4k) {
-        this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
+        this.mediaUrl4k = `${settings.jellyfin.hostname}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId4k}&context=home&serverId=${settings.jellyfin.serverId}`;
       }
     }
   }

server/entity/Season.ts

@@ -1,12 +1,12 @@
-import { MediaStatus } from '@server/constants/media';
 import {
-  Column,
-  CreateDateColumn,
   Entity,
-  ManyToOne,
   PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  CreateDateColumn,
   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,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
   UpdateDateColumn,
+  ManyToOne,
 } from 'typeorm';
+import { MediaRequestStatus } from '../constants/media';
 import { MediaRequest } from './MediaRequest';
 
 @Entity()

server/entity/Session.ts

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