chore(release): 1.17.0

Merge branch 'develop'
feat(lang): add support for Chinese (Traditional) language
2021-01-19 07:58:37 +00:00 · 2021-01-19 07:52:47 +00:00 · 2021-01-19 02:17:14 +00:00 · 2021-01-19 11:12:05 +09:00 · 2021-01-19 02:04:19 +00:00 · 2021-01-18 20:17:24 -05:00
164 changed files with 11137 additions and 2548 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -196,7 +196,8 @@
      "avatar_url": "https://avatars2.githubusercontent.com/u/20923978?v=4",
      "profile": "https://github.com/danshilm",
      "contributions": [
-        "code"
+        "code",
+        "doc"
      ]
    },
    {
@@ -235,6 +236,34 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "flying-sausages",
+      "name": "flying-sausages",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/23618693?v=4",
+      "profile": "https://github.com/flying-sausages",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "hirenshah",
+      "name": "hirenshah",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/418112?v=4",
+      "profile": "https://github.com/hirenshah",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "TheCatLady",
+      "name": "TheCatLady",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/52870424?v=4",
+      "profile": "https://github.com/TheCatLady",
+      "contributions": [
+        "code",
+        "translation"
+      ]
    }
  ],
  "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
--- a/.gitbook.yaml
+++ b/.gitbook.yaml
@@ -0,0 +1,5 @@
+root: ./docs
+
+structure:
+    readme: README.md
+    summary: SUMMARY.md
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,8 @@ on:

 jobs:
  test:
-    runs-on: ubuntu-18.04
+    name: Lint & Test Build
+    runs-on: ubuntu-20.04
    container: node:12.18-alpine
    steps:
      - name: checkout
@@ -24,10 +25,10 @@ jobs:
      - name: build
        run: yarn build
  build_and_push:
-    name: Build and push Docker image to Docker Hub
+    name: Build & Publish to Docker Hub
    needs: test
-    if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, 'skip ci')
-    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -59,3 +60,28 @@ jobs:
            sctx/overseerr:${{ github.sha }}
            ghcr.io/sct/overseerr:develop
            ghcr.io/sct/overseerr:${{ github.sha }}
+  discord:
+    name: Send Discord Notification
+    needs: build_and_push
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Get Build Job Status
+        uses: technote-space/workflow-conclusion-action@v1
+
+      - name: Combine Job Status
+        id: status
+        run: |
+          failures=(neutral, skipped, timed_out, action_required)
+          if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
+            echo ::set-output name=status::failure
+          else
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
+          fi
+
+      - name: Post Status to Discord
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          status: ${{ steps.status.outputs.status }}
+          title: ${{ github.workflow }}
+          nofail: true
--- a/.github/workflows/invalid_template.yml
+++ b/.github/workflows/invalid_template.yml
@@ -6,7 +6,7 @@ on:

 jobs:
  support:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: dessant/support-requests@v2
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:

 jobs:
  test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    container: node:12.18-alpine
    steps:
      - name: checkout
@@ -23,7 +23,7 @@ jobs:
  semantic-release:
    name: Tag and release latest version
    needs: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -41,3 +41,27 @@ jobs:
          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
        run: npx semantic-release
+  discord:
+    name: Send Discord Notification
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Get Build Job Status
+        uses: technote-space/workflow-conclusion-action@v1
+
+      - name: Combine Job Status
+        id: status
+        run: |
+          failures=(neutral, skipped, timed_out, action_required)
+          if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
+            echo ::set-output name=status::failure
+          else
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
+          fi
+
+      - name: Post Status to Discord
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          status: ${{ steps.status.outputs.status }}
+          title: ${{ github.workflow }}
+          nofail: true
--- a/.github/workflows/snap.yaml
+++ b/.github/workflows/snap.yaml
@@ -0,0 +1,102 @@
+name: Publish Snap
+
+on:
+  push:
+    branches: [develop]
+    tags: [v*]
+    pull_request: ~
+
+jobs:
+  test:
+    name: Lint & Test Build
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    container: node:12.18-alpine
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: install dependencies
+        env:
+          HUSKY_SKIP_INSTALL: 1
+        run: yarn
+      - name: lint
+        run: yarn lint
+      - name: build
+        run: yarn build
+  build-snap:
+    name: Build Snap Package (${{ matrix.architecture }})
+    needs: test
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture:
+          - amd64
+          - arm64
+          - armhf
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prepare
+        run: |
+          git fetch --prune --unshallow --tags
+          if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
+            echo ::set-output name=RELEASE::stable
+          else
+            echo ::set-output name=RELEASE::edge
+          fi
+
+      - name: Set Up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Build Snap Package
+        uses: diddlesnaps/snapcraft-multiarch-action@v1
+        id: build
+        with:
+          architecture: ${{ matrix.architecture }}
+
+      - name: Upload Snap Package
+        uses: actions/upload-artifact@v2
+        with:
+          name: overseerr-snap-package-${{ matrix.architecture }}
+          path: ${{ steps.build.outputs.snap }}
+
+      - name: Review Snap Package
+        uses: diddlesnaps/snapcraft-review-tools-action@v1
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+
+      - name: Publish Snap Package
+        uses: snapcore/action-publish@v1
+        with:
+          store_login: ${{ secrets.SNAP_LOGIN }}
+          snap: ${{ steps.build.outputs.snap }}
+          release: ${{ steps.prepare.outputs.RELEASE }}
+
+  discord:
+    name: Send Discord Notification
+    needs: build-snap
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Get Build Job Status
+        uses: technote-space/workflow-conclusion-action@v1
+
+      - name: Combine Job Status
+        id: status
+        run: |
+          failures=(neutral, skipped, timed_out, action_required)
+          if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
+            echo ::set-output name=status::failure
+          else
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
+          fi
+
+      - name: Post Status to Discord
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          status: ${{ steps.status.outputs.status }}
+          title: ${{ github.workflow }}
+          nofail: true
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@@ -6,7 +6,7 @@ on:

 jobs:
  support:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: dessant/support-requests@v2
        with:
--- a/.gitignore
+++ b/.gitignore
@@ -32,13 +32,16 @@ yarn-error.log*
 .vercel

 # database
-config/db/db.sqlite3
+config/db/*.sqlite3
 config/settings.json

 # logs
 config/logs/*.log*
 config/logs/*.json

+# anidb mapping file
+config/anime-list.xml
+
 # dist files
 dist

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,104 @@
+# [1.17.0](https://github.com/sct/overseerr/compare/v1.16.0...v1.17.0) (2021-01-19)
+
+
+### Bug Fixes
+
+* **api:** improve rottentomatoes rating matching for movies ([7db62ab](https://github.com/sct/overseerr/commit/7db62ab824eefc42e6db16e42d52f4266b136f82)), closes [#494](https://github.com/sct/overseerr/issues/494)
+* **build:** remove cross import from client to server for UserType ([23624bd](https://github.com/sct/overseerr/commit/23624bd144af5df4c31995b68ce48105b95b20f6))
+* **frontend:** clarify which fields are required in radarr/sonarr modals ([860d71e](https://github.com/sct/overseerr/commit/860d71ed69a69a1a3f74b79290ef471e04f57a6b)), closes [#575](https://github.com/sct/overseerr/issues/575)
+* **frontend:** do not show failed media status on request list for declined requests ([00944b1](https://github.com/sct/overseerr/commit/00944b1ec2db8ddc5742448f6448f7364c473a98)), closes [#664](https://github.com/sct/overseerr/issues/664)
+* **frontend:** fix button styling on details page on small screen sizes ([d9e0c90](https://github.com/sct/overseerr/commit/d9e0c90e76d80aef0c67318e00e997804805f46e))
+* **frontend:** fix request button height ([a262727](https://github.com/sct/overseerr/commit/a2627270784bdef8644875fa5c5a7349a0b7fd81))
+* **frontend:** request dropdown menu now properly shows up over collection button ([b491be1](https://github.com/sct/overseerr/commit/b491be1b1e7f6aa588274230e695e4c5302b961e))
+* **frontend:** show correct request status on request cards for 4k requests ([1aa0005](https://github.com/sct/overseerr/commit/1aa0005b4298fc1af9c1d0bf1f357738c0fa2673))
+* **lang:** add missing see more i18n string for SeeMoreCard ([d9919ab](https://github.com/sct/overseerr/commit/d9919abb8998d28558ddec35b8e60ab2af75d5b7))
+* **lang:** change email auth user/pass strings to SMTP Username/Password ([a77a2aa](https://github.com/sct/overseerr/commit/a77a2aa3ebb1be353d534db5b07647ac26c60e15))
+* **notifications:** correctly compare seasons before sending series notifications ([f17fa2a](https://github.com/sct/overseerr/commit/f17fa2a2db8144bac89936f588627e8dd37bf54a))
+* **notifications:** only send one available notification for standard media ([fc6f7cc](https://github.com/sct/overseerr/commit/fc6f7ccea586165a30022b6d5554911c66ece6df))
+* **notifications:** send media declined email ([eb6fc8a](https://github.com/sct/overseerr/commit/eb6fc8a19099469794d471db0b48a258c2866633)), closes [#679](https://github.com/sct/overseerr/issues/679)
+* **plex-sync:** improve plex sync error handling. add session id to fix stuck runs ([a740b07](https://github.com/sct/overseerr/commit/a740b07f06f892b72a651b928af28ce71cb495ee))
+* **plex-sync:** store plex added date and sort recently added by it ([d688a96](https://github.com/sct/overseerr/commit/d688a967596afcba9799b8133089bebb5add27cf))
+* **requests:** select the correct radarr/sonarr server when sending request to service ([e0d9f89](https://github.com/sct/overseerr/commit/e0d9f891e797c3839f976b75a871903b6f2e55f1))
+* **server:** support absolute paths for CONFIG_DIRECTORY ([51d8fba](https://github.com/sct/overseerr/commit/51d8fba9162b9e148a35ced69e7e035438c8b0f1))
+* **user edit:** fix user edit not being able to be saved ([#651](https://github.com/sct/overseerr/issues/651)) ([b04d00e](https://github.com/sct/overseerr/commit/b04d00ef509d6f13c1f9677b3f318331782c0086))
+
+
+### Features
+
+* **api:** /request/count endpoint ([#682](https://github.com/sct/overseerr/issues/682)) ([192cfd8](https://github.com/sct/overseerr/commit/192cfd8a8ea9ab942d5bb265d42050917a2f5a04))
+* **frontend:** add see more card to media sliders ([587e8db](https://github.com/sct/overseerr/commit/587e8db15e9c19b4c58406e3e4215d8bf87d8762))
+* **frontend:** add template variable help button to custom webhook settings page ([29c5bc4](https://github.com/sct/overseerr/commit/29c5bc40975e7ab0a2e08bb77294f164f0c60769))
+* **lang:** add support for Chinese (Traditional) language ([686c4f7](https://github.com/sct/overseerr/commit/686c4f71bf930625af082ac5e14dc5f79f5c42eb))
+* **lang:** Translations update from Weblate ([#604](https://github.com/sct/overseerr/issues/604)) ([801e765](https://github.com/sct/overseerr/commit/801e76524d6ea0887249f1630402e9c3a3430b44))
+* **login:** add local users functionality ([#591](https://github.com/sct/overseerr/issues/591)) ([492e19d](https://github.com/sct/overseerr/commit/492e19df4014e67dc6a2de5903a33c25e13fcf45))
+* **notifications:** add notification for declined requests ([2f97f61](https://github.com/sct/overseerr/commit/2f97f61a6e8846975774aa16950a39ada2b1a016)), closes [#663](https://github.com/sct/overseerr/issues/663)
+* **notifications:** Webhook Notifications ([#632](https://github.com/sct/overseerr/issues/632)) ([a7cc7c5](https://github.com/sct/overseerr/commit/a7cc7c59753dd9649b2ec37eb9d46fe4fa8e1e1c))
+* **requests:** Request Overrides & Request Editing ([#653](https://github.com/sct/overseerr/issues/653)) ([bdb3372](https://github.com/sct/overseerr/commit/bdb33722e6df09dd6d8caa36b104b61c6b8dc00d))
+* **server:** add CONFIG_DIRECTORY env var to control config directory location ([fa8f112](https://github.com/sct/overseerr/commit/fa8f112c31ccb5ee6244f776bc97e76d81958539))
+* 4K Requests ([#559](https://github.com/sct/overseerr/issues/559)) ([6b2df24](https://github.com/sct/overseerr/commit/6b2df24a2e8f96dd2277a814d7e02015d1f80cdc))
+* map AniDB IDs from Hama agent to tvdb/tmdb/imdb IDs ([#538](https://github.com/sct/overseerr/issues/538)) ([0600ac7](https://github.com/sct/overseerr/commit/0600ac7c3a1bc0cdd906634d5f77ea3e99b10e94)), closes [#453](https://github.com/sct/overseerr/issues/453)
+
+
+### Reverts
+
+* **deps:** revert back to next@10.0.3 until sharp optional dependency bug is fixed ([7962964](https://github.com/sct/overseerr/commit/79629645aacc1a042919834da79bff0c1f69c9d6))
+
+# [1.16.0](https://github.com/sct/overseerr/compare/v1.15.0...v1.16.0) (2021-01-07)
+
+
+### Bug Fixes
+
+* **frontend:** adjust titlecard badge styling ([effc809](https://github.com/sct/overseerr/commit/effc80977a4ed732092254248f82363e52233171))
+* **frontend:** apply same titlecard hover effect to personcard ([67f2b57](https://github.com/sct/overseerr/commit/67f2b57f00216ded3b34965629d6fdd2f16bc25f))
+* **frontend:** only animate titlecard when showDetail is true ([0ab4c3c](https://github.com/sct/overseerr/commit/0ab4c3c36fe2c1ded142b6931111516f7f990a41))
+* **frontend:** use hardware acceleration for titlecard scale ([88810bf](https://github.com/sct/overseerr/commit/88810bf0a4ef74299f6541b60fa91cea3610f99c))
+* **plex-sync:** do not run plex sync if no admin exists ([493d82b](https://github.com/sct/overseerr/commit/493d82b6b066d77609cf66e005fd1f1472b8e011))
+
+
+### Features
+
+* **lang:** translations update from Weblate ([#495](https://github.com/sct/overseerr/issues/495)) ([b04eda6](https://github.com/sct/overseerr/commit/b04eda6c8a3bfcaa2a14b8a29612fdf690c9fba0))
+* **lang:** Translations update from Weblate ([#580](https://github.com/sct/overseerr/issues/580)) ([2bfe0f2](https://github.com/sct/overseerr/commit/2bfe0f2bf66956763ab26d5c54f26e6c456f59f7))
+* **notifications:** add pushover integration ([#574](https://github.com/sct/overseerr/issues/574)) ([ee5d018](https://github.com/sct/overseerr/commit/ee5d0181fc9a673b27aefd1d09b0a78c3d2e4f55))
+
+# [1.15.0](https://github.com/sct/overseerr/compare/v1.14.1...v1.15.0) (2021-01-04)
+
+
+### Bug Fixes
+
+* **api:** return 202 when same seasons are requested again ([5c84702](https://github.com/sct/overseerr/commit/5c847026aad79fcac4d020786ded9f867696c226))
+* **build:** fixes build to include commit tag for app build step ([289864a](https://github.com/sct/overseerr/commit/289864af1a995ce04834bf8a220cc238e1954d19))
+* **docs:** fix typo in build instructions ([#503](https://github.com/sct/overseerr/issues/503)) ([2b27a71](https://github.com/sct/overseerr/commit/2b27a715b07c27200ba1e5e9623629a34389276d))
+* **frontend:** add i18n for request text on titlecard ([a524b9c](https://github.com/sct/overseerr/commit/a524b9c4c8968f6823d33eb270dc26069fe4a725))
+* **frontend:** add localized strings for status checker ([2dcda39](https://github.com/sct/overseerr/commit/2dcda39d40d820419e098bd6f1101eb820e5b42d))
+* **frontend:** center text in movie auto-approve modal on small screens ([#510](https://github.com/sct/overseerr/issues/510)) ([1438b08](https://github.com/sct/overseerr/commit/1438b08cf0b358d79c6688c64be99f1718ec2d23)), closes [#507](https://github.com/sct/overseerr/issues/507)
+* **frontend:** change titlecard to only have a request button ([b5a3a7a](https://github.com/sct/overseerr/commit/b5a3a7a89fcaf86dd794dc419711677b53646577))
+* **frontend:** combine duplicate credits on a persons detail page ([d188f6f](https://github.com/sct/overseerr/commit/d188f6ffadff1564c47d5f33138e35498bed29fd)), closes [#504](https://github.com/sct/overseerr/issues/504)
+* **frontend:** disable pointer-events on titlecard badges ([ce06879](https://github.com/sct/overseerr/commit/ce0687922a94588b3492e8ddf2e84f54dd1a0d4e))
+* **frontend:** fix count of requests in request list ([f124d73](https://github.com/sct/overseerr/commit/f124d732a2911abdccb5abc11471efe61cc20f7a))
+* **frontend:** fix sliders overflowing on firefox ([67ac9e0](https://github.com/sct/overseerr/commit/67ac9e075f0ca1cfe7e4766d9168815d7ab600fa)), closes [#566](https://github.com/sct/overseerr/issues/566)
+* **frontend:** full season request modal fits on a smaller mobile UI ([#535](https://github.com/sct/overseerr/issues/535)) ([12db7a0](https://github.com/sct/overseerr/commit/12db7a065ad566b47d46de4b949343290894f153))
+* **frontend:** handle currentLibrary possibly being null on first manual sync ([93b57a7](https://github.com/sct/overseerr/commit/93b57a76f10a823615ca11ff59f523b67aa30fad))
+* **frontend:** increase titlecard status badge size on larger screens ([ba106c4](https://github.com/sct/overseerr/commit/ba106c447d76db2f9ac70a60c5b38cc60ab554fe))
+* **frontend:** search clear button now correctly triggers routing ([343f466](https://github.com/sct/overseerr/commit/343f466788abc308b91a414ef61bba816ac8875c))
+* **frontend:** set locale cookie expiration to be much longer ([fae4818](https://github.com/sct/overseerr/commit/fae481895736eab81d52eb93788beb00669fb355))
+* **frontend:** show movie/series badges always ([8cbf39a](https://github.com/sct/overseerr/commit/8cbf39a9d12eaee7720fa4721c350c1ef9dee856))
+* **frontend:** update login/setup images ([058fb65](https://github.com/sct/overseerr/commit/058fb65495baa08a0bd4c9e0aef320c6fc7d017b))
+* **holiday:** remove special holiday slider ([8c09033](https://github.com/sct/overseerr/commit/8c0903393cf2cb2a929ba70a8ab6ddcc4cba0574))
+* correctly deal with tmdb id duplicates between movies/series ([721ed9a](https://github.com/sct/overseerr/commit/721ed9a93087a57ae749388bddcacf26022e3df6)), closes [#526](https://github.com/sct/overseerr/issues/526)
+* use new commit tag file for app version as well ([d00e470](https://github.com/sct/overseerr/commit/d00e470b55327489b49d770144b7cfdb24045be6))
+
+
+### Features
+
+* **email:** add sendername to email notification ([#506](https://github.com/sct/overseerr/issues/506)) ([0185bb1](https://github.com/sct/overseerr/commit/0185bb1a7084c1faeb61fb1c63e34e26732711c8))
+* **frontend:** add clear-field-icon to search field ([#498](https://github.com/sct/overseerr/issues/498)) ([7434a26](https://github.com/sct/overseerr/commit/7434a26f76b5e9f74918f3e1a34443d20ecfcbe4))
+* **frontend:** add documentation link to about page ([c034496](https://github.com/sct/overseerr/commit/c034496f557a031aed35cd28dc7221d8cdf36643))
+* **frontend:** add telegram integration ([#491](https://github.com/sct/overseerr/issues/491)) ([c8d4d67](https://github.com/sct/overseerr/commit/c8d4d674f412082ad9e9da09abd79660365cf728))
+* **frontend:** filter/sorting for request list ([5add44c](https://github.com/sct/overseerr/commit/5add44cfb0379aa6fed7c3b867230292feacc684)), closes [#431](https://github.com/sct/overseerr/issues/431)
+* **notifications:** control notifcation types per agent ([8af6a1f](https://github.com/sct/overseerr/commit/8af6a1f566769c583af7dd9e18d162717835b7cc)), closes [#513](https://github.com/sct/overseerr/issues/513)
+* status checker to prompt users to reload their frontend when app version changes ([75a4264](https://github.com/sct/overseerr/commit/75a426437a4182e21da13684066966dd5bf8fc5e))
+
 ## [1.14.1](https://github.com/sct/overseerr/compare/v1.14.0...v1.14.1) (2021-01-02)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ All help is welcome and greatly appreciated. If you would like to contribute to

   ```
   yarn
-   yarn install
+   yarn dev
   ```

   - Alternatively you can run using [Docker](https://www.docker.com/) with `docker-compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
--- a/5
+++ b/5
@@ -1,5 +1,8 @@
 FROM node:12.18-alpine AS BUILD_IMAGE

+ARG COMMIT_TAG
+ENV COMMIT_TAG=${COMMIT_TAG}
+
 COPY . /app
 WORKDIR /app

@@ -25,6 +28,8 @@ COPY --from=BUILD_IMAGE /app/dist ./dist
 COPY --from=BUILD_IMAGE /app/.next ./.next
 COPY --from=BUILD_IMAGE /app/node_modules ./node_modules

+RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
+
 CMD yarn start

 EXPOSE 5055
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 <a href="https://lgtm.com/projects/g/sct/overseerr/context:javascript"><img alt="Language grade: JavaScript" src="https://img.shields.io/lgtm/grade/javascript/g/sct/overseerr.svg?logo=lgtm&logoWidth=18"/></a>
 <img alt="GitHub" src="https://img.shields.io/github/license/sct/overseerr">
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-25-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-28-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>

@@ -36,15 +36,19 @@

 - User profiles.
 - User settings page (to give users the ability to modify their Overseerr experience to their liking).
- Version update notifications in-app.
- 4K requests (Includes multi-radarr/sonarr management for media)
+- Local user system (for those who don't use Plex).

 ## Planned Features

- More notification types (Slack/Telegram/etc.).
+- More notification types.
 - Issues system. This will allow users to report issues with content on your media server.
- Local user system (for those who don't use Plex).
- Compatibility APIs (to work with existing tools in your system).
+- And a ton more! Check out our [issue tracker](https://github.com/sct/overseerr/issues) to see what features people have already requested.
+
+## Getting Started
+
+Check out our documenation for steps on how to install and run Overseerr:
+
+https://docs.overseerr.dev/getting-started/installation

 ## Running Overseerr

@@ -66,10 +70,11 @@ After running Overseerr for the first time, configure it by visiting the web UI

 ## Preview

-<img src="https://i.imgur.com/Mjbyruv.png">
+<img src="./public/preview.jpg">

 ## Support

+- Check out the [Overseerr Documentation](https://docs.overseerr.dev/) before asking for help. Your question might already be in the [FAQ](https://docs.overseerr.dev/support/faq).
 - You can get support on [Discord](https://discord.gg/PkCWJSeCk7).
 - You can ask questions in the Help category of our [GitHub Discussions](https://github.com/sct/overseerr/discussions).
 - Bugs/Feature Requests can be opened via a [GitHub issue](https://github.com/sct/overseerr/issues).
@@ -99,40 +104,44 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="https://sct.dev"><img src="https://avatars1.githubusercontent.com/u/234213?v=4" width="100px;" alt=""/><br /><sub><b>sct</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=sct" title="Code">💻</a> <a href="#design-sct" title="Design">🎨</a> <a href="#ideas-sct" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/azoitos"><img src="https://avatars2.githubusercontent.com/u/26529049?v=4" width="100px;" alt=""/><br /><sub><b>Alex Zoitos</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=azoitos" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/OwsleyJr"><img src="https://avatars3.githubusercontent.com/u/8635678?v=4" width="100px;" alt=""/><br /><sub><b>Brandon Cohen</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=OwsleyJr" title="Code">💻</a> <a href="https://github.com/sct/overseerr/commits?author=OwsleyJr" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/Ahreluth"><img src="https://avatars2.githubusercontent.com/u/75682440?v=4" width="100px;" alt=""/><br /><sub><b>Ahreluth</b></sub></a><br /><a href="#translation-Ahreluth" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/KovalevArtem"><img src="https://avatars0.githubusercontent.com/u/36500228?v=4" width="100px;" alt=""/><br /><sub><b>KovalevArtem</b></sub></a><br /><a href="#translation-KovalevArtem" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/GiyomuWeb"><img src="https://avatars0.githubusercontent.com/u/62489209?v=4" width="100px;" alt=""/><br /><sub><b>GiyomuWeb</b></sub></a><br /><a href="#translation-GiyomuWeb" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/angrycuban13"><img src="https://avatars3.githubusercontent.com/u/39564898?v=4" width="100px;" alt=""/><br /><sub><b>Angry Cuban</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=angrycuban13" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://sct.dev"><img src="https://avatars1.githubusercontent.com/u/234213?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sct</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=sct" title="Code">💻</a> <a href="#design-sct" title="Design">🎨</a> <a href="#ideas-sct" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/azoitos"><img src="https://avatars2.githubusercontent.com/u/26529049?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex Zoitos</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=azoitos" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/OwsleyJr"><img src="https://avatars3.githubusercontent.com/u/8635678?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brandon Cohen</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=OwsleyJr" title="Code">💻</a> <a href="https://github.com/sct/overseerr/commits?author=OwsleyJr" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Ahreluth"><img src="https://avatars2.githubusercontent.com/u/75682440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ahreluth</b></sub></a><br /><a href="#translation-Ahreluth" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/KovalevArtem"><img src="https://avatars0.githubusercontent.com/u/36500228?v=4?s=100" width="100px;" alt=""/><br /><sub><b>KovalevArtem</b></sub></a><br /><a href="#translation-KovalevArtem" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/GiyomuWeb"><img src="https://avatars0.githubusercontent.com/u/62489209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>GiyomuWeb</b></sub></a><br /><a href="#translation-GiyomuWeb" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/angrycuban13"><img src="https://avatars3.githubusercontent.com/u/39564898?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Angry Cuban</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=angrycuban13" title="Documentation">📖</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/jvennik"><img src="https://avatars3.githubusercontent.com/u/6672637?v=4" width="100px;" alt=""/><br /><sub><b>jvennik</b></sub></a><br /><a href="#translation-jvennik" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/darknessgp"><img src="https://avatars0.githubusercontent.com/u/1521243?v=4" width="100px;" alt=""/><br /><sub><b>darknessgp</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=darknessgp" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/saltydk"><img src="https://avatars1.githubusercontent.com/u/6587950?v=4" width="100px;" alt=""/><br /><sub><b>salty</b></sub></a><br /><a href="#infra-saltydk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    <td align="center"><a href="https://github.com/Shutruk"><img src="https://avatars2.githubusercontent.com/u/9198633?v=4" width="100px;" alt=""/><br /><sub><b>Shutruk</b></sub></a><br /><a href="#translation-Shutruk" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/krystiancharubin"><img src="https://avatars2.githubusercontent.com/u/17775600?v=4" width="100px;" alt=""/><br /><sub><b>Krystian Charubin</b></sub></a><br /><a href="#design-krystiancharubin" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/kieron"><img src="https://avatars2.githubusercontent.com/u/8655212?v=4" width="100px;" alt=""/><br /><sub><b>Kieron Boswell</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=kieron" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/samwiseg0"><img src="https://avatars1.githubusercontent.com/u/2241731?v=4" width="100px;" alt=""/><br /><sub><b>samwiseg0</b></sub></a><br /><a href="#question-samwiseg0" title="Answering Questions">💬</a> <a href="#infra-samwiseg0" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/jvennik"><img src="https://avatars3.githubusercontent.com/u/6672637?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jvennik</b></sub></a><br /><a href="#translation-jvennik" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/darknessgp"><img src="https://avatars0.githubusercontent.com/u/1521243?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darknessgp</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=darknessgp" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/saltydk"><img src="https://avatars1.githubusercontent.com/u/6587950?v=4?s=100" width="100px;" alt=""/><br /><sub><b>salty</b></sub></a><br /><a href="#infra-saltydk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/Shutruk"><img src="https://avatars2.githubusercontent.com/u/9198633?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shutruk</b></sub></a><br /><a href="#translation-Shutruk" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/krystiancharubin"><img src="https://avatars2.githubusercontent.com/u/17775600?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Krystian Charubin</b></sub></a><br /><a href="#design-krystiancharubin" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/kieron"><img src="https://avatars2.githubusercontent.com/u/8655212?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kieron Boswell</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=kieron" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/samwiseg0"><img src="https://avatars1.githubusercontent.com/u/2241731?v=4?s=100" width="100px;" alt=""/><br /><sub><b>samwiseg0</b></sub></a><br /><a href="#question-samwiseg0" title="Answering Questions">💬</a> <a href="#infra-samwiseg0" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/ecelebi29"><img src="https://avatars2.githubusercontent.com/u/8337120?v=4" width="100px;" alt=""/><br /><sub><b>ecelebi29</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ecelebi29" title="Code">💻</a> <a href="https://github.com/sct/overseerr/commits?author=ecelebi29" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/mmozeiko"><img src="https://avatars3.githubusercontent.com/u/1665010?v=4" width="100px;" alt=""/><br /><sub><b>Mārtiņš Možeiko</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=mmozeiko" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mazzetta86"><img src="https://avatars2.githubusercontent.com/u/45591560?v=4" width="100px;" alt=""/><br /><sub><b>mazzetta86</b></sub></a><br /><a href="#translation-mazzetta86" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/Panzer1119"><img src="https://avatars1.githubusercontent.com/u/23016343?v=4" width="100px;" alt=""/><br /><sub><b>Paul Hagedorn</b></sub></a><br /><a href="#translation-Panzer1119" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/Shagon94"><img src="https://avatars3.githubusercontent.com/u/9140783?v=4" width="100px;" alt=""/><br /><sub><b>Shagon94</b></sub></a><br /><a href="#translation-Shagon94" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/sebstrgg"><img src="https://avatars3.githubusercontent.com/u/27026694?v=4" width="100px;" alt=""/><br /><sub><b>sebstrgg</b></sub></a><br /><a href="#translation-sebstrgg" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/danshilm"><img src="https://avatars2.githubusercontent.com/u/20923978?v=4" width="100px;" alt=""/><br /><sub><b>Danshil Mungur</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=danshilm" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ecelebi29"><img src="https://avatars2.githubusercontent.com/u/8337120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ecelebi29</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ecelebi29" title="Code">💻</a> <a href="https://github.com/sct/overseerr/commits?author=ecelebi29" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/mmozeiko"><img src="https://avatars3.githubusercontent.com/u/1665010?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mārtiņš Možeiko</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=mmozeiko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mazzetta86"><img src="https://avatars2.githubusercontent.com/u/45591560?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mazzetta86</b></sub></a><br /><a href="#translation-mazzetta86" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Panzer1119"><img src="https://avatars1.githubusercontent.com/u/23016343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Hagedorn</b></sub></a><br /><a href="#translation-Panzer1119" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Shagon94"><img src="https://avatars3.githubusercontent.com/u/9140783?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shagon94</b></sub></a><br /><a href="#translation-Shagon94" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/sebstrgg"><img src="https://avatars3.githubusercontent.com/u/27026694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebstrgg</b></sub></a><br /><a href="#translation-sebstrgg" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/danshilm"><img src="https://avatars2.githubusercontent.com/u/20923978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Danshil Mungur</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=danshilm" title="Code">💻</a> <a href="https://github.com/sct/overseerr/commits?author=danshilm" title="Documentation">📖</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/doob187"><img src="https://avatars1.githubusercontent.com/u/60312740?v=4" width="100px;" alt=""/><br /><sub><b>doob187</b></sub></a><br /><a href="#infra-doob187" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    <td align="center"><a href="https://github.com/johnpyp"><img src="https://avatars2.githubusercontent.com/u/20625636?v=4" width="100px;" alt=""/><br /><sub><b>johnpyp</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=johnpyp" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/ankarhem"><img src="https://avatars1.githubusercontent.com/u/14110063?v=4" width="100px;" alt=""/><br /><sub><b>Jakob Ankarhem</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ankarhem" title="Documentation">📖</a> <a href="https://github.com/sct/overseerr/commits?author=ankarhem" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jayesh100"><img src="https://avatars1.githubusercontent.com/u/8022175?v=4" width="100px;" alt=""/><br /><sub><b>Jayesh</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=jayesh100" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/doob187"><img src="https://avatars1.githubusercontent.com/u/60312740?v=4?s=100" width="100px;" alt=""/><br /><sub><b>doob187</b></sub></a><br /><a href="#infra-doob187" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/johnpyp"><img src="https://avatars2.githubusercontent.com/u/20625636?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnpyp</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=johnpyp" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ankarhem"><img src="https://avatars1.githubusercontent.com/u/14110063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakob Ankarhem</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ankarhem" title="Documentation">📖</a> <a href="https://github.com/sct/overseerr/commits?author=ankarhem" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jayesh100"><img src="https://avatars1.githubusercontent.com/u/8022175?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jayesh</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=jayesh100" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/flying-sausages"><img src="https://avatars1.githubusercontent.com/u/23618693?v=4?s=100" width="100px;" alt=""/><br /><sub><b>flying-sausages</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=flying-sausages" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/hirenshah"><img src="https://avatars2.githubusercontent.com/u/418112?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hirenshah</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=hirenshah" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/TheCatLady"><img src="https://avatars0.githubusercontent.com/u/52870424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TheCatLady</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=TheCatLady" title="Code">💻</a> <a href="#translation-TheCatLady" title="Translation">🌍</a></td>
  </tr>
 </table>

-<!-- markdownlint-enable -->
+<!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
--- a/docs/README.md
+++ b/docs/README.md
@@ -0,0 +1,22 @@
+# Introduction
+
+Welcome to the Overseerr Documentation.
+
+## Features
+
+- **Full Plex integration**. Login and manage user access with Plex.
+- **Syncs to your Plex library** to show what titles you already have.
+- **Integrates with Sonarr and Radarr**. With more services to come in the future.
+- **Easy to use request system** allowing users to request individual seasons or movies in a friendly, clean UI.
+- **Simple request management UI**. Don't dig through the app to approve recent requests.
+- **Mobile-friendly design**, for when you need to approve requests on the go.
+- Granular permission system.
+- Localization into other languages.
+
+## Motivation
+
+The primary motivation for starting this project was to have an incredibly performant and easy to use application. There is a heavy focus on the user experience for both the server owner and the users. We feel requesting should be **effortless for the user**. Find the media you want, click request, and branch off efficiently into other titles that interest you, all in one seamless flow. For the server owner, Overseerr takes all the hassle out of approving your users' requests.
+
+## We need your help!
+
+Overseerr is an ambitious project. We have already poured a lot of work into this, with more coming. We need your valuable feedback and help with finding bugs. Also, being that this is an open-source project, anyone is welcome to contribute. Contribution includes building features, patching bugs, or even translating the application. You can find the contribution guide on our GitHub.
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -0,0 +1,21 @@
+# Table of contents
+
+- [Introduction](README.md)
+
+## Getting Started
+
+- [Installation](getting-started/installation.md)
+
+## Using Overseerr
+
+- [Notifications](using-overseerr/notifications/README.md)
+  - [Custom Webhooks](using-overseerr/notifications/webhooks.md)
+
+## Support
+
+- [Frequently Asked Questions](support/faq.md)
+- [Asking for Support](support/asking-for-support.md)
+
+## Extending Overseerr
+
+- [Reverse Proxy Examples](extending-overseerr/reverse-proxy-examples.md)
--- a/docs/extending-overseerr/reverse-proxy-examples.md
+++ b/docs/extending-overseerr/reverse-proxy-examples.md
@@ -0,0 +1,134 @@
+# Reverse Proxy Examples
+
+{% hint style="warning" %}
+Base URLs cannot be configured in Overseerr. With this limitation, only subdomain configurations are supported.
+{% endhint %}
+
+## LE/SWAG
+
+### Subdomain
+
+A sample is bundled in SWAG. This page is still the only source of truth, so the sample is not guaranteed to be up to date. If you catch an inconsistency, report it to the linuxserver team, or do a pull-request against the proxy-confs repository to update the sample.
+
+Rename the sample file `overseerr.subdomain.conf.sample` to `overseerr.subdomain.conf` in the `proxy-confs`folder, or create `overseerr.subdomain.conf` in the same folder with the example below. 
+
+Example Configuration:
+
+```nginx
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name overseerr.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app overseerr;
+        set $upstream_port 5055;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+
+}
+```
+
+## Traefik \(v2\)
+
+Add the labels to the Overseerr service in your `docker-compose` file. A basic example for a `docker-compose` file using Traefik can be found [here](https://doc.traefik.io/traefik/user-guides/docker-compose/basic-example/).
+
+### Subdomain
+
+Example Configuration:
+
+```text
+labels:
+  - "traefik.enable=true"
+  ## HTTP Routers
+  - "traefik.http.routers.overseerr-rtr.entrypoints=https"
+  - "traefik.http.routers.overseerr-rtr.rule=Host(`overseerr.domain.com`)"
+  - "traefik.http.routers.overseerr-rtr.tls=true"
+  ## HTTP Services
+  - "traefik.http.routers.overseerr-rtr.service=overseerr-svc"
+  - "traefik.http.services.overseerr-svc.loadbalancer.server.port=5055"
+```
+
+## LE/NGINX
+
+### Subdomain
+
+Take the configuration below and place it in `/etc/nginx/sites-available/overseerr.example.com.conf`.
+
+Create a symlink to `/etc/nginx/sites-enabled`:
+
+```text
+sudo ln -s /etc/nginx/sites-available/overseerr.example.com.conf /etc/nginx/sites-enabled/overseerr.example.com.conf
+```
+
+Test the configuration:
+
+```text
+sudo nginx -t
+```
+
+Reload your configuration for NGINX:
+
+```text
+sudo systemctl reload nginx
+```
+
+Example Configuration:
+
+```text
+server {
+    listen 80;
+    server_name overseerr.example.com;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name overseerr.example.com;
+
+    ssl_certificate /etc/letsencrypt/live/overseerr.example.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/overseerr.example.com/privkey.pem;
+
+    proxy_set_header Referer $http_referer;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Real-Port $remote_port;
+    proxy_set_header X-Forwarded-Host $host:$remote_port;
+    proxy_set_header X-Forwarded-Server $host;
+    proxy_set_header X-Forwarded-Port $remote_port;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Ssl on;
+    real_ip_header CF-Connecting-IP;
+    # Control the behavior of the Referer header (Referrer-Policy)
+    add_header Referrer-Policy "no-referrer";
+    # HTTP Strict Transport Security
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
+    # Reduce XSS risks (Content-Security-Policy) - uncomment to use and add URLs whenever necessary
+    # add_header Content-Security-Policy "default-src 'self'; connect-src 'self' https://plex.tv; style-src 'self' 'unsafe-inline' https://rsms.me/inter/inter.css; script-src 'self'; img-src 'self' data: https://plex.tv https://assets.plex.tv https://gravatar.com https://i2.wp.com https://image.tmdb.org; font-src 'self' https://rsms.me/inter/font-files/" always;
+    # Prevent some categories of XSS attacks (X-XSS-Protection)
+    add_header X-XSS-Protection "1; mode=block" always;
+    # Provide clickjacking protection (X-Frame-Options)
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    # Prevent Sniff Mimetype (X-Content-Type-Options)
+    add_header X-Content-Type-Options "nosniff" always;
+
+    access_log /var/log/nginx/overseerr.example.com-access.log;
+    error_log /var/log/nginx/overseerr.example.com-error.log;
+
+    location / {
+        proxy_pass http://127.0.0.1:5055;
+    }
+}
+```
+
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -0,0 +1,160 @@
+# Installation
+
+{% hint style="danger" %}
+Overseerr is currently under very heavy, rapid development and things are likely to break often. We need all the help we can get to find bugs and get them fixed to hit a more stable release. If you would like to help test the bleeding edge, please use the image **`sctx/overseerr:develop`** instead!
+{% endhint %}
+
+{% hint style="info" %}
+After running Overseerr for the first time, configure it by visiting the web UI at `http://[address]:5055` and completing the setup steps.
+{% endhint %}
+
+## Docker
+
+{% tabs %}
+{% tab title="Basic" %}
+
+```bash
+docker run -d \
+  -e LOG_LEVEL=info \
+  -e TZ=Asia/Tokyo \
+  -p 5055:5055 \
+  -v /path/to/appdata/config:/app/config \
+  --restart unless-stopped \
+  sctx/overseerr
+```
+
+{% endtab %}
+
+{% tab title="UID/GID" %}
+
+```text
+docker run -d \
+  --user=[ user | user:group | uid | uid:gid | user:gid | uid:group ] \
+  -e LOG_LEVEL=info \
+  -e TZ=Asia/Tokyo \
+  -p 5055:5055 \
+  -v /path/to/appdata/config:/app/config \
+  --restart unless-stopped \
+   sctx/overseerr
+```
+
+{% endtab %}
+
+{% tab title="Manual Update" %}
+
+```text
+# Stop the Overseerr container
+docker stop overseerr
+
+# Remove the Overseerr container
+docker rm overseerr
+
+# 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.
+2. Inside the **Communtiy Applications** app store, search for **Overseerr**.
+3. Click the **Install Button**.
+4. On the following **Add Container** screen, make changes to the **Host Port** and **Host Path 1**\(Appdata\) as needed.
+5. Click apply and access "Overseerr" at your `<ServerIP:HostPort>` in a web browser.
+
+## Windows
+
+Please refer to the [docker for windows documentation](https://docs.docker.com/docker-for-windows/) for installation.
+
+{% hint style="danger" %}
+**WSL2 will need to be installed to prevent DB corruption! Please see** [**Docker Desktop WSL 2 backend**](https://docs.docker.com/docker-for-windows/wsl/) **on how to enable WSL2. The command below will only work with WSL2 installed!**
+{% endhint %}
+
+```bash
+docker run -d -e LOG_LEVEL=info -e TZ=Asia/Tokyo -p 5055:5055 -v "/your/path/here:/app/config" --restart unless-stopped sctx/overseerr
+```
+
+{% hint style="info" %}
+Docker on Windows works differently than it does on Linux; it uses a VM to run a stripped-down Linux and then runs docker within that. The volume mounts are exposed to the docker in this VM via SMB mounts. While this is fine for media, it is unacceptable for the `/app/config` directory because SMB does not support file locking. This will eventually corrupt your database which can lead to slow behavior and crashes. If you must run in docker on Windows, you should put the `/app/config` directory mount inside the VM and not on the Windows host. It's worth noting that this warning also extends to other containers which use SQLite databases.
+{% endhint %}
+
+## Linux
+
+{% hint style="info" %}
+The [Overseerr snap](https://snapcraft.io/overseerr) is the only supported linux install method. Currently, the listening port cannot be changed. Port `5055` will need to be available on your host. To install snapd please refer to [Installing snapd](https://snapcraft.io/docs/installing-snapd).
+{% endhint %}
+
+**To install:**
+
+```
+sudo snap install overseerr
+```
+
+**Updating:**
+Snap will keep Overseerr up-to-date automatically. You can force a refresh by using the following command.
+
+```
+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 %}
+
+{% tab title="Gentoo" %}
+Portage overlay [GitHub Repository](https://github.com/chriscpritchard/overseerr-overlay)
+
+Efforts will be made to keep up to date with the latest releases, however, this cannot be guaranteed.
+
+To enable using eselect repository, run:
+
+```bash
+eselect repository add overseerr-overlay git https://github.com/chriscpritchard/overseerr-overlay.git
+```
+
+Once complete, you can just run:
+
+```bash
+emerge www-apps/overseerr
+```
+
+{% endtab %}
+
+{% tab title="Swizzin" %}
+The installation is not implemented via docker, but barebones. The latest released version of overseerr will be used.
+Please see the [swizzin documentation](https://swizzin.ltd/applications/overseerr) for more information.
+
+To install, run the following:
+
+```bash
+box install overseerr
+```
+
+To upgrade, run the following:
+
+```bash
+box upgrade overseerr
+```
+
+{% endtab %}
+
+{% endtabs %}
--- a/docs/support/asking-for-support.md
+++ b/docs/support/asking-for-support.md
@@ -0,0 +1,34 @@
+# Asking for Support
+
+## Before asking for support, make sure you try these things first
+
+* Make sure you have **updated** to the latest version.
+* ["Have you tried turning it off and on again?"](https://www.youtube.com/watch?v=nn2FB1P_Mn8)
+* **Analyzing** your logs, you just might find the solution yourself!
+* **Search** the [Wiki](../), [Installation Guides](../getting-started/installation.md), and [FAQs](faq.md).
+* If you have questions, feel free to ask them on [Discord](https://discord.gg/PkCWJSeCk7) \(Please review our [Code of Conduct](https://github.com/sct/overseerr/blob/develop/CODE_OF_CONDUCT.md)\). Please include a link to your logs. See [How can I share my logs?](asking-for-support.md#how-can-i-share-my-logs) for more details.
+
+## What should I include when asking for support?
+
+When you contact support saying something like "it doesn't work" leaves little to go on to figure out what is wrong for you. When contacting support try to include information such as the following:
+
+* What did you try to do? When you describe what you did to reach the state you are in we may notice something you did different from the instructions, or something that your unique setup requires in addition. Some examples of what to provide here:
+  * What command did you enter?
+  * What did you click on?
+  * What settings did you change?
+  * Provide a step-by-step list of what you tried.
+* What do you see? We cannot see your screen so some of the following is necessary for us to know what is going on:
+  * Did something happen?
+  * Did something not happen?
+  * Are there any error messages showing?
+  * Screenshots can help us see what you are seeing
+  * The Overseerr logs show exactly what happened and are often critical for identifying issues \(see [How can I share my logs?](asking-for-support.md#how-can-i-share-my-logs) below\).
+
+## How can I share my logs?
+
+First you will need to gather your logs from the install directory.
+
+1. Collect the log file from `<Overseeerr-install-directory>/logs/overseerr.log`
+2. Open the log file and **upload the text** by going to [gist.github.com](https://gist.github.com/) and creating a new secret Gist of the contents.
+3. **Share the link** with support in [Discord](https://discord.gg/PkCWJSeCk7) by copying the URL of the page.
+
--- a/docs/support/faq.md
+++ b/docs/support/faq.md
@@ -0,0 +1,95 @@
+# Frequently Asked Questions
+
+{% hint style="info" %}
+If you can't find a solution here, please ask on [Discord](https://discord.gg/PkCWJSeCk7). Please do not post questions on the GitHub issues tracker.
+{% endhint %}
+
+## General
+
+### I receive 409 or 400 errors when requesting a movie or tv show!
+
+**A:** Verify your are running radarr and sonarr v3. Overseerr was developed for v3 and is not currently backward compatible.
+
+### How do I keep Overseerr up-to-date?
+
+**A:** 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.
+
+### How can I access Overseerr outside my home network?
+
+**A:** The easy and least secure method is to forward an external port \(`5055`\) on your router to the internal port used by Overseerr \(default is TCP `5055`\). Visit [Port Forward](http://portforward.com/) for instructions for your particular router. You will then be able to access Overseerr via `http://EXTERNAL-IP-ADDRESS:5055`.
+
+The more advanced and most preferred method \(and more secure if you use SSL\) is to set up a web server with NGINX/Apache, and use a reverse proxy to access Overseerr. You can lookup many guides on the internet to find out how to do this. There are several reverse proxy config examples located [here](../extending-overseerr/reverse-proxy-examples.md).
+
+The most secure method, but also the most inconvenient, is to set up a VPN tunnel to your home server, then you can access Overseerr as if it is on a local network via `http://LOCAL-IP-ADDRESS:5055`.
+
+### Overseerr is amazing! But it is not translated in my language yet! Can I help with translations?
+
+**A:** You sure can! We are using Weblate for translations! Check it out [here](https://hosted.weblate.org/engage/overseerr/). If your language is not listed please open an [enhancement request in issues](https://github.com/sct/overseerr/issues/new/choose).
+
+### Where can I find the changelog?
+
+**A:** You can find the changelog in the **Settings -&gt; About** page in your instance. You can also find it on github [here](https://github.com/sct/overseerr/releases).
+
+### Can I make 4K requests?
+
+**A:** 4K requests are not supported just yet but they will be supported in the future!
+
+### Some media is missing from Overseerr that I know is in Plex!
+
+**A:** Overseerr supports the new Plex Movie, Legacy Plex Movie, TheTVDB agent, and the TMDb agent. Please verify that your library is using one of the agents previously listed. If you are changing agents, a full metadata refresh will need to be performed. Caution, this can take a long time depending on how many items you have in your movie library.
+
+**Troubleshooting Steps:**
+
+Check the Overseerr logs for media items that are missing. The logs will contain an error as to why that item could not be matched. One example might be `errorMessage":"SQLITE_CONSTRAINT: NOT NULL`. This means that the TMDb ID is missing from the Plex XML for that item.
+
+1. Verify that you are using one of the agents mentioned above.
+2. Refresh the metadata for just that item.
+3. Run a full scan in Overseerr to see if that item is now matched properly.
+4. If the item is now seen by Overseerr then repeat step 2 for each missing item. If you have a large amount of items missing then a full metadata refresh is recommended for that library.
+5. Run a full scan on Overseerr after refreshing all unmatched items.
+
+Perform these steps to verify the media item has a guid Overseerr can match.
+
+1. Go to the media item in Plex and **"Get info"** and click on **"View XML"**.
+2. Verify that the media item has the same format of one of the examples below.
+
+**Examples:**
+
+1. TMDB agent `guid="com.plexapp.agents.themoviedb://1705"`
+2. The 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"`
+
+### Where can I find the logs?
+
+**A:** The logs are located at `<Overseeerr-install-directory>/logs/overseerr.log`
+
+## User Management
+
+### Why can't I see all my Plex users?
+
+**A:** Navigate to your **User List** in Overseerr and click **Import Users From Plex** button. Don't forget to check the default user permissions in the **Settings -&gt; General Settings** page beforehand.
+
+### Can I create local users in Overseerr?
+
+**A:** Not at this time. But it is a planned feature!
+
+### Is is possible to set user roles in Overseerr?
+
+**A:** Unfortunately, this is not possible yet. It is planned!
+
+## Requests
+
+### I approved a requested movie and radarr didn't search for it!
+
+**A:** Check your minimum availability in radarr. If an added item does not meet the minimum availability, no search will be performed. Also verify that radarr did not search for it by checking the radarr logs. Lastly, verify the item was not already being monitored by radarr. Currently there is no state sync with radarr.
+
+### Help! My request still shows "requested" even though it's in Plex!?!
+
+**A:** See "[Some media is missing from Overseerr that I know is in Plex!](./faq.md#some-media-is-missing-from-overseerr-that-i-know-is-in-plex)" for troubleshooting steps.
+
+## Notifications
+
+### I am getting "Username and Password not accepted" when sending email notifications to gmail!
+
+**A:** If you have 2-Step Verification enabled on your account you will need to create an app password. More details can be found [here](https://support.google.com/mail/answer/185833).
--- a/docs/using-overseerr/notifications/README.md
+++ b/docs/using-overseerr/notifications/README.md
@@ -0,0 +1,28 @@
+# Notifications
+
+Overseerr already supports a good number of notification agents, such as **Discord**, **Slack** and **Pushover**. New agents are always considered for development, if there is enough demand for it.
+
+## Currently Supported Notification Agents
+
+- Email
+- Discord
+- Slack
+- Telegram
+- Pushover
+- [Webhooks](./webhooks.md)
+
+## Setting up Notifications
+
+Configuring your notifications is _very simple_. First, you will need to visit the **Settings** page and click **Notifications** in the menu. This will present you with all of the currently available notification agents. Click on each one individually to configure them.
+
+You must configure which type of notifications you want to send _per agent_. If no types are selected, you will not receive any notifications!
+
+Some agents may have specific configuration gotchas that will be covered in each notification agents documentation page.
+
+{% hint style="danger" %}
+Currently, you will **not receive notifications** for any auto-approved requests. However, you will still receive a notification when the media becomes available.
+{% endhint %}
+
+## Requesting new agents
+
+If we do not currently support a notification agent you would like, feel free to request it on our [GitHub Issues](https://github.com/sct/overseerr/issues). Make sure to search first to see if someone else already requested it!
--- a/docs/using-overseerr/notifications/webhooks.md
+++ b/docs/using-overseerr/notifications/webhooks.md
@@ -0,0 +1,56 @@
+# Webhooks
+
+Webhooks let you post a custom JSON payload to any endpoint you like. You can also set an authorization header for security purposes.
+
+## Configuration
+
+The following configuration options are available:
+
+### Webhook URL (Required)
+
+The URL you would like to post notifications to. Your JSON will be sent as the body of the request.
+
+### Authorization Header
+
+Custom authorization header. Anything entered for this will be sent as an `Authorization` header.
+
+### Custom JSON Payload (Required)
+
+Design your JSON payload as you see fit. JSON is validated before you can save or test. Overseerr provides several [template variables](./webhooks.md#template-variables) for use in the payload which will be replaced with actual values when the notifications are sent.
+
+You can always reset back to the default custom payload setting by clicking the `Reset to Default JSON Payload` button under the editor.
+
+## Template Variables
+
+### Main
+
+- `{{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
+
+These variables are usually the target user of the notification.
+
+- `{{notifyuser_username}}` Target user's username.
+- `{{notifyuser_email}}` Target user's email.
+- `{{notifyuser_avatar}}` Target user's avatar.
+
+### Media
+
+These variables are only included in media related notifications, such as requests.
+
+- `{{media_type}}` Media type. Either `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. (Ex. `AVAILABLE` or `PENDING`)
+- `{{media_status4k}}` Media's 4K availability status. (Ex. `AVAILABLE` or `PENDING`)
+
+### Special Key Variables
+
+These variables must be used as a key in the JSON Payload. (Ex, `"{{extra}}": []`).
+
+- `{{extra}}` This will override the value of the property to be the pre-formatted "extra" array that can come along with certain notifications. Using this variable is _not required_.
+- `{{media}}` This will override the value of the property to `null` if there is no media object passed along with the notification.
--- a/next.config.js
+++ b/next.config.js
@@ -1,4 +1,7 @@
 module.exports = {
+  env: {
+    commitTag: process.env.COMMIT_TAG || 'local',
+  },
  webpack(config) {
    config.module.rules.push({
      test: /\.svg$/,
--- a/ormconfig.js
+++ b/ormconfig.js
@@ -1,6 +1,8 @@
 const devConfig = {
  type: 'sqlite',
-  database: 'config/db/db.sqlite3',
+  database: process.env.CONFIG_DIRECTORY
+    ? `${process.env.CONFIG_DIRECTORY}/db/db.sqlite3`
+    : 'config/db/db.sqlite3',
  synchronize: true,
  migrationsRun: false,
  logging: false,
@@ -15,7 +17,9 @@ const devConfig = {

 const prodConfig = {
  type: 'sqlite',
-  database: 'config/db/db.sqlite3',
+  database: process.env.CONFIG_DIRECTORY
+    ? `${process.env.CONFIG_DIRECTORY}/db/db.sqlite3`
+    : 'config/db/db.sqlite3',
  synchronize: false,
  logging: false,
  entities: ['dist/entity/**/*.js'],
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -20,11 +20,16 @@ components:
        plexToken:
          type: string
          readOnly: true
+        userType:
+          type: integer
+          example: 1
+          readOnly: true
        permissions:
          type: number
          example: 0
        avatar:
          type: string
+          readOnly: true
        createdAt:
          type: string
          example: '2020-09-02T05:02:23.000Z'
@@ -45,7 +50,6 @@ components:
      required:
        - id
        - email
-        - permissions
        - createdAt
        - updatedAt
    MainSettings:
@@ -701,6 +705,15 @@ components:
            - $ref: '#/components/schemas/User'
            - type: string
              nullable: true
+        is4k:
+          type: boolean
+          example: false
+        serverId:
+          type: number
+        profileId:
+          type: number
+        rootFolder:
+          type: string
      required:
        - id
        - status
@@ -855,6 +868,58 @@ components:
          properties:
            webhookUrl:
              type: string
+    WebhookSettings:
+      type: object
+      properties:
+        enabled:
+          type: boolean
+          example: false
+        types:
+          type: number
+          example: 2
+        options:
+          type: object
+          properties:
+            webhookUrl:
+              type: string
+            jsonPayload:
+              type: string
+    TelegramSettings:
+      type: object
+      properties:
+        enabled:
+          type: boolean
+          example: false
+        types:
+          type: number
+          example: 2
+        options:
+          type: object
+          properties:
+            botAPI:
+              type: string
+            chatId:
+              type: string
+    PushoverSettings:
+      type: object
+      properties:
+        enabled:
+          type: boolean
+          example: false
+        types:
+          type: number
+          example: 2
+        options:
+          type: object
+          properties:
+            accessToken:
+              type: string
+            userToken:
+              type: string
+            priority:
+              type: number
+            sound:
+              type: string
    NotificationEmailSettings:
      type: object
      properties:
@@ -870,6 +935,9 @@ components:
            emailFrom:
              type: string
              example: no-reply@example.com
+            senderName:
+              type: string
+              example: Overseerr
            smtpHost:
              type: string
              example: 127.0.0.1
@@ -1083,6 +1151,26 @@ components:
      name: X-Api-Key

 paths:
+  /status:
+    get:
+      summary: Return Overseerr version
+      description: Returns the current Overseerr version in JSON format
+      security: []
+      tags:
+        - public
+      responses:
+        '200':
+          description: Returned version
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  version:
+                    type: string
+                    example: 1.0.0
+                  commitTag:
+                    type: string
  /settings/main:
    get:
      summary: Returns main settings
@@ -1635,6 +1723,98 @@ paths:
      responses:
        '204':
          description: Test notification attempted
+  /settings/notifications/telegram:
+    get:
+      summary: Return current telegram notification settings
+      description: Returns current telegram notification settings in JSON format
+      tags:
+        - settings
+      responses:
+        '200':
+          description: Returned telegram settings
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TelegramSettings'
+    post:
+      summary: Update telegram notification settings
+      description: Update current telegram notification settings with provided values
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/TelegramSettings'
+      responses:
+        '200':
+          description: 'Values were sucessfully updated'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TelegramSettings'
+  /settings/notifications/telegram/test:
+    post:
+      summary: Test the provided telegram settings
+      description: Sends a test notification to the telegram agent
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/TelegramSettings'
+      responses:
+        '204':
+          description: Test notification attempted
+  /settings/notifications/pushover:
+    get:
+      summary: Return current pushover notification settings
+      description: Returns current pushover notification settings in JSON format
+      tags:
+        - settings
+      responses:
+        '200':
+          description: Returned pushover settings
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PushoverSettings'
+    post:
+      summary: Update pushover notification settings
+      description: Update current pushover notification settings with provided values
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PushoverSettings'
+      responses:
+        '200':
+          description: 'Values were sucessfully updated'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PushoverSettings'
+  /settings/notifications/pushover/test:
+    post:
+      summary: Test the provided pushover settings
+      description: Sends a test notification to the pushover agent
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PushoverSettings'
+      responses:
+        '204':
+          description: Test notification attempted
  /settings/notifications/slack:
    get:
      summary: Return current slack notification settings
@@ -1681,6 +1861,52 @@ paths:
      responses:
        '204':
          description: Test notification attempted
+  /settings/notifications/webhook:
+    get:
+      summary: Return current webhook notification settings
+      description: Returns current webhook notification settings in JSON format
+      tags:
+        - settings
+      responses:
+        '200':
+          description: Returned webhook settings
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/WebhookSettings'
+    post:
+      summary: Update webhook notification settings
+      description: Update current webhook notification settings with provided values
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/WebhookSettings'
+      responses:
+        '200':
+          description: 'Values were sucessfully updated'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/WebhookSettings'
+  /settings/notifications/webhook/test:
+    post:
+      summary: Test the provided slack settings
+      description: Sends a test notification to the slack agent
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SlackSettings'
+      responses:
+        '204':
+          description: Test notification attempted
  /settings/about:
    get:
      summary: Return current about stats
@@ -1747,6 +1973,34 @@ paths:
                  type: string
              required:
                - authToken
+  /auth/local:
+    post:
+      summary: Login using a local account
+      description: Takes an `email` and a `password` to log the user in. Generates a session cookie for use in further requests.
+      security: []
+      tags:
+        - auth
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                email:
+                  type: string
+                password:
+                  type: string
+              required:
+                - email
+                - password
  /auth/logout:
    get:
      summary: Logout and clear session cookie
@@ -2213,6 +2467,15 @@ paths:
                  type: array
                  items:
                    type: number
+                is4k:
+                  type: boolean
+                  example: false
+                serverId:
+                  type: number
+                profileId:
+                  type: number
+                rootFolder:
+                  type: string
              required:
                - mediaType
                - mediaId
@@ -2223,6 +2486,30 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/MediaRequest'
+  /request/count:
+    get:
+      summary: Returns request counts
+      description: |
+        Returns the number of pending and approved requests.
+      tags:
+        - request
+      responses:
+        '200':
+          description: Request counts returned
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  pending:
+                    type: number
+                    example: 0
+                  approved:
+                    type: number
+                    example: 10
+                required:
+                  - pending
+                  - approved
  /request/{requestId}:
    get:
      summary: Requests a specific MediaRequest
@@ -2244,6 +2531,26 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/MediaRequest'
+    put:
+      summary: Update a specific MediaRequest
+      description: Updats a specific media request and returns the request in JSON format. Requires the `MANAGE_REQUESTS` permission.
+      tags:
+        - request
+      parameters:
+        - in: path
+          name: requestId
+          description: Request ID
+          required: true
+          example: 1
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Succesfully updated request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MediaRequest'
    delete:
      summary: Delete a request
      description: Removes a request. If the user has the `MANAGE_REQUESTS` permission, then any request can be removed. Otherwise, only pending requests can be removed.
@@ -2745,7 +3052,7 @@ paths:
          name: sort
          schema:
            type: string
-            enum: [added, modified]
+            enum: [added, modified, mediaAdded]
            default: added
      responses:
        '200':
@@ -2803,6 +3110,86 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/Collection'
+  /service/radarr:
+    get:
+      summary: Returns non-sensitive radarr server list
+      description: Returns a list of radarr servers, both ID and name in JSON format
+      tags:
+        - service
+      responses:
+        '200':
+          description: Request successful
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/RadarrSettings'
+  /service/radarr/{radarrId}:
+    get:
+      summary: Returns radarr server quality profiles and root folders
+      description: Returns a radarr server quality profile and root folder details in JSON format
+      tags:
+        - service
+      parameters:
+        - in: path
+          name: radarrId
+          required: true
+          schema:
+            type: number
+            example: 0
+      responses:
+        '200':
+          description: Request successful
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  server:
+                    $ref: '#/components/schemas/RadarrSettings'
+                  profiles:
+                    $ref: '#/components/schemas/ServiceProfile'
+  /service/sonarr:
+    get:
+      summary: Returns non-sensitive sonarr server list
+      description: Returns a list of sonarr servers, both ID and name in JSON format
+      tags:
+        - service
+      responses:
+        '200':
+          description: Request successful
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/SonarrSettings'
+  /service/sonarr/{sonarrId}:
+    get:
+      summary: Returns sonarr server quality profiles and root folders
+      description: Returns a sonarr server quality profile and root folder details in JSON format
+      tags:
+        - service
+      parameters:
+        - in: path
+          name: sonarrId
+          required: true
+          schema:
+            type: number
+            example: 0
+      responses:
+        '200':
+          description: Request successful
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  server:
+                    $ref: '#/components/schemas/SonarrSettings'
+                  profiles:
+                    $ref: '#/components/schemas/ServiceProfile'

 security:
  - cookieAuth: []
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "overseerr",
-  "version": "1.14.1",
+  "version": "1.17.0",
  "private": true,
  "scripts": {
    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node --files --project server/tsconfig.json server/index.ts",
@@ -18,39 +18,44 @@
  "license": "MIT",
  "dependencies": {
    "@svgr/webpack": "^5.5.0",
-    "axios": "^0.21.0",
+    "ace-builds": "^1.4.12",
+    "axios": "^0.21.1",
+    "bcrypt": "^5.0.0",
    "body-parser": "^1.19.0",
    "bowser": "^2.11.0",
    "connect-typeorm": "^1.1.4",
    "cookie-parser": "^1.4.5",
-    "email-templates": "^8.0.2",
+    "email-templates": "^8.0.3",
    "express": "^4.17.1",
-    "express-openapi-validator": "^4.9.4",
+    "express-openapi-validator": "^4.10.8",
    "express-session": "^1.17.1",
    "formik": "^2.2.6",
+    "gravatar-url": "^3.1.0",
    "intl": "^1.2.5",
    "lodash": "^4.17.20",
-    "next": "^10.0.3",
+    "next": "10.0.3",
    "node-schedule": "^1.3.2",
    "nodemailer": "^6.4.17",
-    "nookies": "^2.5.0",
+    "nookies": "^2.5.1",
    "plex-api": "^5.3.1",
    "pug": "^3.0.0",
    "react": "17.0.1",
+    "react-ace": "^9.2.1",
    "react-dom": "17.0.1",
    "react-intersection-observer": "^8.31.0",
-    "react-intl": "^5.10.9",
+    "react-intl": "^5.10.16",
    "react-markdown": "^5.0.3",
    "react-spring": "^8.0.27",
    "react-toast-notifications": "^2.4.0",
    "react-transition-group": "^4.4.1",
-    "react-truncate-markup": "^5.0.1",
-    "react-use-clipboard": "1.0.2",
+    "react-truncate-markup": "^5.1.0",
+    "react-use-clipboard": "1.0.7",
    "reflect-metadata": "^0.1.13",
+    "secure-random-password": "^0.2.2",
    "sqlite3": "^5.0.0",
-    "swagger-ui-express": "^4.1.5",
-    "swr": "^0.3.11",
-    "typeorm": "^0.2.29",
+    "swagger-ui-express": "^4.1.6",
+    "swr": "^0.4.0",
+    "typeorm": "^0.2.30",
    "uuid": "^8.3.2",
    "winston": "^3.3.3",
    "winston-daily-rotate-file": "^4.5.0",
@@ -68,48 +73,50 @@
    "@semantic-release/git": "^9.0.0",
    "@tailwindcss/aspect-ratio": "^0.2.0",
    "@tailwindcss/forms": "^0.2.1",
-    "@tailwindcss/typography": "^0.3.1",
+    "@tailwindcss/typography": "^0.4.0",
+    "@types/bcrypt": "^3.0.0",
    "@types/body-parser": "^1.19.0",
    "@types/cookie-parser": "^1.4.2",
-    "@types/email-templates": "^7.1.0",
-    "@types/express": "^4.17.9",
+    "@types/email-templates": "^8.0.0",
+    "@types/express": "^4.17.11",
    "@types/express-session": "^1.17.0",
-    "@types/lodash": "^4.14.165",
-    "@types/node": "^14.14.14",
+    "@types/lodash": "^4.14.167",
+    "@types/node": "^14.14.21",
    "@types/node-schedule": "^1.3.1",
    "@types/nodemailer": "^6.4.0",
    "@types/react": "^17.0.0",
    "@types/react-dom": "^17.0.0",
    "@types/react-toast-notifications": "^2.4.0",
    "@types/react-transition-group": "^4.4.0",
+    "@types/secure-random-password": "^0.2.0",
    "@types/swagger-ui-express": "^4.1.2",
    "@types/uuid": "^8.3.0",
    "@types/xml2js": "^0.4.7",
    "@types/yamljs": "^0.2.31",
    "@types/yup": "^0.29.11",
-    "@typescript-eslint/eslint-plugin": "^4.10.0",
-    "@typescript-eslint/parser": "^4.10.0",
+    "@typescript-eslint/eslint-plugin": "^4.13.0",
+    "@typescript-eslint/parser": "^4.13.0",
    "autoprefixer": "^9",
-    "babel-plugin-react-intl": "^8.2.22",
+    "babel-plugin-react-intl": "^8.2.25",
    "babel-plugin-react-intl-auto": "^3.3.0",
-    "commitizen": "^4.2.2",
+    "commitizen": "^4.2.3",
    "copyfiles": "^2.4.1",
    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^7.16.0",
+    "eslint": "^7.18.0",
    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-formatjs": "^2.9.11",
+    "eslint-plugin-formatjs": "^2.10.3",
    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.22.0",
    "eslint-plugin-react-hooks": "^4.2.0",
    "extract-react-intl-messages": "^4.1.1",
-    "husky": "^4.3.6",
+    "husky": "^4.3.8",
    "lint-staged": "^10.5.3",
-    "nodemon": "^2.0.6",
+    "nodemon": "^2.0.7",
    "postcss": "^7",
    "postcss-preset-env": "^6.7.0",
    "prettier": "^2.2.1",
-    "semantic-release": "^17.3.0",
+    "semantic-release": "^17.3.3",
    "semantic-release-docker": "^2.2.0",
    "tailwindcss": "npm:@tailwindcss/postcss7-compat",
    "ts-node": "^9.1.1",
@@ -171,7 +178,7 @@
      [
        "@semantic-release/exec",
        {
-          "prepareCmd": "docker build -t sctx/overseerr ."
+          "prepareCmd": "docker build --build-arg COMMIT_TAG=$GITHUB_SHA -t sctx/overseerr ."
        }
      ],
      "semantic-release-docker",
--- a/public/images/rotate1.jpg
+++ b/public/images/rotate1.jpg
--- a/public/images/rotate2.jpg
+++ b/public/images/rotate2.jpg
--- a/public/images/rotate3.jpg
+++ b/public/images/rotate3.jpg
--- a/public/images/rotate4.jpg
+++ b/public/images/rotate4.jpg
--- a/public/images/rotate5.jpg
+++ b/public/images/rotate5.jpg
--- a/public/images/rotate6.jpg
+++ b/public/images/rotate6.jpg
--- a/public/preview.jpg
+++ b/public/preview.jpg
--- a/public/preview.png
+++ b/public/preview.png
--- a/server/api/animelist.ts
+++ b/server/api/animelist.ts
@@ -0,0 +1,223 @@
+import axios from 'axios';
+import xml2js from 'xml2js';
+import fs, { promises as fsp } from 'fs';
+import path from 'path';
+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
+const MAPPING_URL =
+  'https://raw.githubusercontent.com/Anime-Lists/anime-lists/master/anime-list.xml';
+const LOCAL_PATH = path.join(__dirname, '../../config/anime-list.xml');
+
+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
+// https://github.com/Anime-Lists/anime-lists/
+
+interface AnimeMapping {
+  $: {
+    anidbseason: string;
+    tvdbseason: string;
+  };
+  _: string;
+}
+
+interface Anime {
+  $: {
+    anidbid: number;
+    tvdbid?: string;
+    defaulttvdbseason?: string;
+    tmdbid?: number;
+    imdbid?: string;
+  };
+  'mapping-list'?: {
+    mapping: AnimeMapping[];
+  }[];
+}
+
+interface AnimeList {
+  'anime-list': {
+    anime: Anime[];
+  };
+}
+
+export interface AnidbItem {
+  tvdbId?: number;
+  tmdbId?: number;
+  imdbId?: string;
+}
+
+class AnimeListMapping {
+  private syncing = false;
+
+  private mapping: { [anidbId: number]: AnidbItem } = {};
+
+  // mapping file modification date when it was loaded
+  private mappingModified: Date | null = null;
+
+  // each episode in season 0 from TVDB can map to movie
+  private specials: { [tvdbId: number]: { [episode: number]: AnidbItem } } = {};
+
+  public isLoaded = () => Object.keys(this.mapping).length !== 0;
+
+  private loadFromFile = async () => {
+    logger.info('Loading mapping file', { label: 'Anime-List Sync' });
+    try {
+      const mappingStat = await fsp.stat(LOCAL_PATH);
+      const file = await fsp.readFile(LOCAL_PATH);
+      const xml = (await xml2js.parseStringPromise(file)) as AnimeList;
+
+      this.mapping = {};
+      this.specials = {};
+      for (const anime of xml['anime-list'].anime) {
+        // tvdbId can be nonnumber, like 'movie' string
+        let tvdbId: number | undefined;
+        if (anime.$.tvdbid && !isNaN(Number(anime.$.tvdbid))) {
+          tvdbId = Number(anime.$.tvdbid);
+        } else {
+          tvdbId = undefined;
+        }
+
+        let imdbIds: (string | undefined)[];
+        if (anime.$.imdbid) {
+          // if there are multiple imdb entries, then they map to different movies
+          imdbIds = anime.$.imdbid.split(',');
+        } else {
+          // in case there is no imdbid, that's ok as there will be tmdbid
+          imdbIds = [undefined];
+        }
+
+        const tmdbId = anime.$.tmdbid ? Number(anime.$.tmdbid) : undefined;
+        const anidbId = Number(anime.$.anidbid);
+        this.mapping[anidbId] = {
+          // for season 0 ignore tvdbid, because this must be movie/OVA
+          tvdbId: anime.$.defaulttvdbseason === '0' ? undefined : tvdbId,
+          tmdbId: tmdbId,
+          imdbId: imdbIds[0], // this is used for one AniDB -> one imdb movie mapping
+        };
+
+        if (tvdbId) {
+          const mappingList = anime['mapping-list'];
+          if (mappingList && mappingList.length != 0) {
+            let imdbIndex = 0;
+            for (const mapping of mappingList[0].mapping) {
+              const text = mapping._;
+              if (text && mapping.$.tvdbseason === '0') {
+                let matches;
+                while ((matches = mappingRegexp.exec(text)) !== null) {
+                  const episode = Number(matches[1]);
+                  if (!this.specials[tvdbId]) {
+                    this.specials[tvdbId] = {};
+                  }
+                  // map next available imdbid to episode in s0
+                  const imdbId =
+                    imdbIndex > imdbIds.length ? undefined : imdbIds[imdbIndex];
+                  if (tmdbId || imdbId) {
+                    this.specials[tvdbId][episode] = {
+                      tmdbId: tmdbId,
+                      imdbId: imdbId,
+                    };
+                    imdbIndex++;
+                  }
+                }
+              }
+            }
+          } else {
+            // some movies do not have mapping-list, so map episode 1,2,3,..to movies
+            // movies must have imdbid or tmdbid
+            const hasImdb = imdbIds.length > 1 || imdbIds[0] !== undefined;
+            if ((hasImdb || tmdbId) && anime.$.defaulttvdbseason === '0') {
+              if (!this.specials[tvdbId]) {
+                this.specials[tvdbId] = {};
+              }
+              // map each imdbid to episode in s0, episode index starts with 1
+              for (let idx = 0; idx < imdbIds.length; idx++) {
+                this.specials[tvdbId][idx + 1] = {
+                  tmdbId: tmdbId,
+                  imdbId: imdbIds[idx],
+                };
+              }
+            }
+          }
+        }
+      }
+      this.mappingModified = mappingStat.mtime;
+      logger.info(
+        `Loaded ${
+          Object.keys(this.mapping).length
+        } AniDB items from mapping file`,
+        { label: 'Anime-List Sync' }
+      );
+    } catch (e) {
+      throw new Error(`Failed to load Anime-List mappings: ${e.message}`);
+    }
+  };
+
+  private downloadFile = async () => {
+    logger.info('Downloading latest mapping file', {
+      label: 'Anime-List Sync',
+    });
+    try {
+      const response = await axios.get(MAPPING_URL, {
+        responseType: 'stream',
+      });
+      await new Promise<void>((resolve) => {
+        const writer = fs.createWriteStream(LOCAL_PATH);
+        writer.on('finish', resolve);
+        response.data.pipe(writer);
+      });
+    } catch (e) {
+      throw new Error(`Failed to download Anime-List mapping: ${e.message}`);
+    }
+  };
+
+  public sync = async () => {
+    // make sure only one sync runs at a time
+    if (this.syncing) {
+      return;
+    }
+
+    this.syncing = true;
+    try {
+      // check if local file is not "expired" yet
+      if (fs.existsSync(LOCAL_PATH)) {
+        const now = new Date();
+        const stat = await fsp.stat(LOCAL_PATH);
+        if (now.getTime() - stat.mtime.getTime() < UPDATE_INTERVAL_MSEC) {
+          if (!this.isLoaded()) {
+            // no need to download, but make sure file is loaded
+            await this.loadFromFile();
+          } else if (
+            this.mappingModified &&
+            stat.mtime.getTime() > this.mappingModified.getTime()
+          ) {
+            // if file has been modified externally since last load, reload it
+            await this.loadFromFile();
+          }
+          return;
+        }
+      }
+      await this.downloadFile();
+      await this.loadFromFile();
+    } finally {
+      this.syncing = false;
+    }
+  };
+
+  public getFromAnidbId = (anidbId: number): AnidbItem | undefined => {
+    return this.mapping[anidbId];
+  };
+
+  public getSpecialEpisode = (
+    tvdbId: number,
+    episode: number
+  ): AnidbItem | undefined => {
+    const episodes = this.specials[tvdbId];
+    return episodes ? episodes[episode] : undefined;
+  };
+}
+
+const animeList = new AnimeListMapping();
+
+export default animeList;
--- a/server/api/plexapi.ts
+++ b/server/api/plexapi.ts
@@ -9,6 +9,8 @@ export interface PlexLibraryItem {
  guid: string;
  parentGuid?: string;
  grandparentGuid?: string;
+  addedAt: number;
+  updatedAt: number;
  type: 'movie' | 'show' | 'season' | 'episode';
 }

@@ -48,6 +50,25 @@ export interface PlexMetadata {
  parentIndex?: number;
  leafCount: number;
  viewedLeafCount: number;
+  addedAt: number;
+  updatedAt: number;
+  Media: Media[];
+}
+
+interface Media {
+  id: number;
+  duration: number;
+  bitrate: number;
+  width: number;
+  height: number;
+  aspectRatio: number;
+  audioChannels: number;
+  audioCodec: string;
+  videoCodec: string;
+  videoResolution: string;
+  container: string;
+  videoFrameRate: string;
+  videoProfile: string;
 }

 interface PlexMetadataResponse {
@@ -123,6 +144,14 @@ class PlexAPI {
    return response.MediaContainer.Metadata[0];
  }

+  public async getChildrenMetadata(key: string): Promise<PlexMetadata[]> {
+    const response = await this.plexClient.query<PlexMetadataResponse>(
+      `/library/metadata/${key}/children`
+    );
+
+    return response.MediaContainer.Metadata;
+  }
+
  public async getRecentlyAdded(id: string): Promise<PlexLibraryItem[]> {
    const response = await this.plexClient.query<PlexLibraryResponse>(
      `/library/sections/${id}/recentlyAdded`
--- a/server/api/radarr.ts
+++ b/server/api/radarr.ts
@@ -29,7 +29,7 @@ interface RadarrMovie {
  hasFile: boolean;
 }

-interface RadarrRootFolder {
+export interface RadarrRootFolder {
  id: number;
  path: string;
  freeSpace: number;
@@ -40,7 +40,7 @@ interface RadarrRootFolder {
  }[];
 }

-interface RadarrProfile {
+export interface RadarrProfile {
  id: number;
  name: string;
 }
--- a/server/api/rottentomatoes.ts
+++ b/server/api/rottentomatoes.ts
@@ -92,7 +92,27 @@ class RottenTomatoes {
        }
      );

-      const movie = response.data.movies.find((movie) => movie.year === year);
+      // First, attempt to match exact name and year
+      let movie = response.data.movies.find(
+        (movie) => movie.year === year && movie.title === name
+      );
+
+      // If we don't find a movie, try to match partial name and year
+      if (!movie) {
+        movie = response.data.movies.find(
+          (movie) => movie.year === year && movie.title.includes(name)
+        );
+      }
+
+      // If we still dont find a movie, try to match just on year
+      if (!movie) {
+        movie = response.data.movies.find((movie) => movie.year === year);
+      }
+
+      // One last try, try exact name match only
+      if (!movie) {
+        movie = response.data.movies.find((movie) => movie.title === name);
+      }

      if (!movie) {
        return null;
--- a/server/constants/user.ts
+++ b/server/constants/user.ts
@@ -0,0 +1,4 @@
+export enum UserType {
+  PLEX = 1,
+  LOCAL = 2,
+}
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -40,12 +40,15 @@ class Media {
    }
  }

-  public static async getMedia(id: number): Promise<Media | undefined> {
+  public static async getMedia(
+    id: number,
+    mediaType: MediaType
+  ): Promise<Media | undefined> {
    const mediaRepository = getRepository(Media);

    try {
      const media = await mediaRepository.findOne({
-        where: { tmdbId: id },
+        where: { tmdbId: id, mediaType },
        relations: ['requests'],
      });

@@ -62,7 +65,7 @@ class Media {
  @Column({ type: 'varchar' })
  public mediaType: MediaType;

-  @Column({ unique: true })
+  @Column()
  @Index()
  public tmdbId: number;

@@ -70,13 +73,16 @@ class Media {
  @Index()
  public tvdbId?: number;

-  @Column({ unique: true, nullable: true })
+  @Column({ nullable: true })
  @Index()
  public imdbId?: string;

  @Column({ type: 'int', default: MediaStatus.UNKNOWN })
  public status: MediaStatus;

+  @Column({ type: 'int', default: MediaStatus.UNKNOWN })
+  public status4k: MediaStatus;
+
  @OneToMany(() => MediaRequest, (request) => request.media, { cascade: true })
  public requests: MediaRequest[];

@@ -95,6 +101,9 @@ class Media {
  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public lastSeasonChange: Date;

+  @Column({ type: 'datetime', nullable: true })
+  public mediaAddedAt: Date;
+
  constructor(init?: Partial<Media>) {
    Object.assign(this, init);
  }
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -65,6 +65,18 @@ export class MediaRequest {
  })
  public seasons: SeasonRequest[];

+  @Column({ default: false })
+  public is4k: boolean;
+
+  @Column({ nullable: true })
+  public serverId: number;
+
+  @Column({ nullable: true })
+  public profileId: number;
+
+  @Column({ nullable: true })
+  public rootFolder: string;
+
  constructor(init?: Partial<MediaRequest>) {
    Object.assign(this, init);
  }
@@ -72,11 +84,11 @@ export class MediaRequest {
  @AfterUpdate()
  @AfterInsert()
  public async sendMedia(): Promise<void> {
-    await Promise.all([this._sendToRadarr(), this._sendToSonarr()]);
+    await Promise.all([this.sendToRadarr(), this.sendToSonarr()]);
  }

  @AfterInsert()
-  private async _notifyNewRequest() {
+  public async notifyNewRequest(): Promise<void> {
    if (this.status === MediaRequestStatus.PENDING) {
      const mediaRepository = getRepository(Media);
      const media = await mediaRepository.findOne({
@@ -126,8 +138,11 @@ export class MediaRequest {
   * auto approved content
   */
  @AfterUpdate()
-  private async _notifyApproved() {
-    if (this.status === MediaRequestStatus.APPROVED) {
+  public async notifyApprovedOrDeclined(): Promise<void> {
+    if (
+      this.status === MediaRequestStatus.APPROVED ||
+      this.status === MediaRequestStatus.DECLINED
+    ) {
      const mediaRepository = getRepository(Media);
      const media = await mediaRepository.findOne({
        where: { id: this.media.id },
@@ -139,30 +154,40 @@ export class MediaRequest {
      const tmdb = new TheMovieDb();
      if (this.media.mediaType === MediaType.MOVIE) {
        const movie = await tmdb.getMovie({ movieId: this.media.tmdbId });
-        notificationManager.sendNotification(Notification.MEDIA_APPROVED, {
-          subject: movie.title,
-          message: movie.overview,
-          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
-          notifyUser: this.requestedBy,
-          media,
-        });
+        notificationManager.sendNotification(
+          this.status === MediaRequestStatus.APPROVED
+            ? Notification.MEDIA_APPROVED
+            : Notification.MEDIA_DECLINED,
+          {
+            subject: movie.title,
+            message: movie.overview,
+            image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
+            notifyUser: this.requestedBy,
+            media,
+          }
+        );
      } else if (this.media.mediaType === MediaType.TV) {
        const tv = await tmdb.getTvShow({ tvId: this.media.tmdbId });
-        notificationManager.sendNotification(Notification.MEDIA_APPROVED, {
-          subject: tv.name,
-          message: tv.overview,
-          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
-          notifyUser: this.requestedBy,
-          media,
-          extra: [
-            {
-              name: 'Seasons',
-              value: this.seasons
-                .map((season) => season.seasonNumber)
-                .join(', '),
-            },
-          ],
-        });
+        notificationManager.sendNotification(
+          this.status === MediaRequestStatus.APPROVED
+            ? Notification.MEDIA_APPROVED
+            : Notification.MEDIA_DECLINED,
+          {
+            subject: tv.name,
+            message: tv.overview,
+            image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
+            notifyUser: this.requestedBy,
+            media,
+            extra: [
+              {
+                name: 'Seasons',
+                value: this.seasons
+                  .map((season) => season.seasonNumber)
+                  .join(', '),
+              },
+            ],
+          }
+        );
      }
    }
  }
@@ -181,15 +206,23 @@ export class MediaRequest {
    }
    const seasonRequestRepository = getRepository(SeasonRequest);
    if (this.status === MediaRequestStatus.APPROVED) {
-      media.status = MediaStatus.PROCESSING;
+      if (this.is4k) {
+        media.status4k = MediaStatus.PROCESSING;
+      } else {
+        media.status = MediaStatus.PROCESSING;
+      }
      mediaRepository.save(media);
    }

    if (
-      this.media.mediaType === MediaType.MOVIE &&
+      media.mediaType === MediaType.MOVIE &&
      this.status === MediaRequestStatus.DECLINED
    ) {
-      media.status = MediaStatus.UNKNOWN;
+      if (this.is4k) {
+        media.status4k = MediaStatus.UNKNOWN;
+      } else {
+        media.status = MediaStatus.UNKNOWN;
+      }
      mediaRepository.save(media);
    }

@@ -224,18 +257,31 @@ export class MediaRequest {
  }

  @AfterRemove()
-  private async _handleRemoveParentUpdate() {
+  public async handleRemoveParentUpdate(): Promise<void> {
    const mediaRepository = getRepository(Media);
    const fullMedia = await mediaRepository.findOneOrFail({
      where: { id: this.media.id },
+      relations: ['requests'],
    });
-    if (!fullMedia.requests || fullMedia.requests.length === 0) {
+
+    if (
+      !fullMedia.requests.some((request) => !request.is4k) &&
+      fullMedia.status !== MediaStatus.AVAILABLE
+    ) {
      fullMedia.status = MediaStatus.UNKNOWN;
-      mediaRepository.save(fullMedia);
    }
+
+    if (
+      !fullMedia.requests.some((request) => request.is4k) &&
+      fullMedia.status4k !== MediaStatus.AVAILABLE
+    ) {
+      fullMedia.status4k = MediaStatus.UNKNOWN;
+    }
+
+    mediaRepository.save(fullMedia);
  }

-  private async _sendToRadarr() {
+  public async sendToRadarr(): Promise<void> {
    if (
      this.status === MediaRequestStatus.APPROVED &&
      this.type === MediaType.MOVIE
@@ -251,18 +297,58 @@ export class MediaRequest {
          return;
        }

-        const radarrSettings = settings.radarr.find(
-          (radarr) => radarr.isDefault && !radarr.is4k
+        let radarrSettings = settings.radarr.find(
+          (radarr) => radarr.isDefault && radarr.is4k === this.is4k
        );

+        if (
+          this.serverId !== null &&
+          this.serverId >= 0 &&
+          radarrSettings?.id !== this.serverId
+        ) {
+          radarrSettings = settings.radarr.find(
+            (radarr) => radarr.id === this.serverId
+          );
+          logger.info(
+            `Request has an override server: ${radarrSettings?.name}`,
+            { label: 'Media Request' }
+          );
+        }
+
        if (!radarrSettings) {
          logger.info(
-            'There is no default radarr configured. Did you set any of your Radarr servers as default?',
+            `There is no default ${
+              this.is4k ? '4K ' : ''
+            }radarr configured. Did you set any of your Radarr servers as default?`,
            { label: 'Media Request' }
          );
          return;
        }

+        let rootFolder = radarrSettings.activeDirectory;
+        let qualityProfile = radarrSettings.activeProfileId;
+
+        if (
+          this.rootFolder &&
+          this.rootFolder !== '' &&
+          this.rootFolder !== radarrSettings.activeDirectory
+        ) {
+          rootFolder = this.rootFolder;
+          logger.info(`Request has an override root folder: ${rootFolder}`, {
+            label: 'Media Request',
+          });
+        }
+
+        if (
+          this.profileId &&
+          this.profileId !== radarrSettings.activeProfileId
+        ) {
+          qualityProfile = this.profileId;
+          logger.info(`Request has an override profile id: ${qualityProfile}`, {
+            label: 'Media Request',
+          });
+        }
+
        const tmdb = new TheMovieDb();
        const radarr = new RadarrAPI({
          apiKey: radarrSettings.apiKey,
@@ -275,9 +361,9 @@ export class MediaRequest {
        // Run this asynchronously so we don't wait for it on the UI side
        radarr
          .addMovie({
-            profileId: radarrSettings.activeProfileId,
-            qualityProfileId: radarrSettings.activeProfileId,
-            rootFolderPath: radarrSettings.activeDirectory,
+            profileId: qualityProfile,
+            qualityProfileId: qualityProfile,
+            rootFolderPath: rootFolder,
            minimumAvailability: radarrSettings.minimumAvailability,
            title: movie.title,
            tmdbId: movie.id,
@@ -325,7 +411,7 @@ export class MediaRequest {
    }
  }

-  private async _sendToSonarr() {
+  public async sendToSonarr(): Promise<void> {
    if (
      this.status === MediaRequestStatus.APPROVED &&
      this.type === MediaType.TV
@@ -341,13 +427,29 @@ export class MediaRequest {
          return;
        }

-        const sonarrSettings = settings.sonarr.find(
-          (sonarr) => sonarr.isDefault && !sonarr.is4k
+        let sonarrSettings = settings.sonarr.find(
+          (sonarr) => sonarr.isDefault && sonarr.is4k === this.is4k
        );

+        if (
+          this.serverId !== null &&
+          this.serverId >= 0 &&
+          sonarrSettings?.id !== this.serverId
+        ) {
+          sonarrSettings = settings.sonarr.find(
+            (sonarr) => sonarr.id === this.serverId
+          );
+          logger.info(
+            `Request has an override server: ${sonarrSettings?.name}`,
+            { label: 'Media Request' }
+          );
+        }
+
        if (!sonarrSettings) {
          logger.info(
-            'There is no default sonarr configured. Did you set any of your Sonarr servers as default?',
+            `There is no default ${
+              this.is4k ? '4K ' : ''
+            }sonarr configured. Did you set any of your Sonarr servers as default?`,
            { label: 'Media Request' }
          );
          return;
@@ -386,17 +488,38 @@ export class MediaRequest {
          seriesType = 'anime';
        }

+        let rootFolder =
+          seriesType === 'anime' && sonarrSettings.activeAnimeDirectory
+            ? sonarrSettings.activeAnimeDirectory
+            : sonarrSettings.activeDirectory;
+        let qualityProfile =
+          seriesType === 'anime' && sonarrSettings.activeAnimeProfileId
+            ? sonarrSettings.activeAnimeProfileId
+            : sonarrSettings.activeProfileId;
+
+        if (
+          this.rootFolder &&
+          this.rootFolder !== '' &&
+          this.rootFolder !== rootFolder
+        ) {
+          rootFolder = this.rootFolder;
+          logger.info(`Request has an override root folder: ${rootFolder}`, {
+            label: 'Media Request',
+          });
+        }
+
+        if (this.profileId && this.profileId !== qualityProfile) {
+          qualityProfile = this.profileId;
+          logger.info(`Request has an override profile id: ${qualityProfile}`, {
+            label: 'Media Request',
+          });
+        }
+
        // Run this asynchronously so we don't wait for it on the UI side
        sonarr
          .addSeries({
-            profileId:
-              seriesType === 'anime' && sonarrSettings.activeAnimeProfileId
-                ? sonarrSettings.activeAnimeProfileId
-                : sonarrSettings.activeProfileId,
-            rootFolderPath:
-              seriesType === 'anime' && sonarrSettings.activeAnimeDirectory
-                ? sonarrSettings.activeAnimeDirectory
-                : sonarrSettings.activeDirectory,
+            profileId: qualityProfile,
+            rootFolderPath: rootFolder,
            title: series.name,
            tvdbid: series.external_ids.tvdb_id,
            seasons: this.seasons.map((season) => season.seasonNumber),
--- a/server/entity/Season.ts
+++ b/server/entity/Season.ts
@@ -20,6 +20,9 @@ class Season {
  @Column({ type: 'int', default: MediaStatus.UNKNOWN })
  public status: MediaStatus;

+  @Column({ type: 'int', default: MediaStatus.UNKNOWN })
+  public status4k: MediaStatus;
+
  @ManyToOne(() => Media, (media) => media.seasons, { onDelete: 'CASCADE' })
  public media: Promise<Media>;

--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -9,6 +9,13 @@ import {
 } from 'typeorm';
 import { Permission, hasPermission } from '../lib/permissions';
 import { MediaRequest } from './MediaRequest';
+import bcrypt from 'bcrypt';
+import path from 'path';
+import PreparedEmail from '../lib/email';
+import logger from '../logger';
+import { getSettings } from '../lib/settings';
+import { default as generatePassword } from 'secure-random-password';
+import { UserType } from '../constants/user';

@Entity()
 export class User {
@@ -16,7 +23,7 @@ export class User {
    return users.map((u) => u.filter());
  }

-  static readonly filteredFields: string[] = ['plexToken'];
+  static readonly filteredFields: string[] = ['plexToken', 'password'];

  @PrimaryGeneratedColumn()
  public id: number;
@@ -27,8 +34,14 @@ export class User {
  @Column()
  public username: string;

-  @Column({ select: false })
-  public plexId: number;
+  @Column({ nullable: true, select: false })
+  public password?: string;
+
+  @Column({ type: 'integer', default: UserType.PLEX })
+  public userType: UserType;
+
+  @Column({ nullable: true, select: false })
+  public plexId?: number;

  @Column({ nullable: true, select: false })
  public plexToken?: string;
@@ -69,4 +82,47 @@ export class User {
  public hasPermission(permissions: Permission | Permission[]): boolean {
    return !!hasPermission(permissions, this.permissions);
  }
+
+  public passwordMatch(password: string): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+      if (this.password) {
+        resolve(bcrypt.compare(password, this.password));
+      } else {
+        return reject(false);
+      }
+    });
+  }
+
+  public async setPassword(password: string): Promise<void> {
+    const hashedPassword = await bcrypt.hash(password, 12);
+    this.password = hashedPassword;
+  }
+
+  public async resetPassword(): Promise<void> {
+    const password = generatePassword.randomPassword({ length: 16 });
+    this.setPassword(password);
+
+    const applicationUrl = getSettings().main.applicationUrl;
+    try {
+      logger.info(`Sending password email for ${this.email}`, {
+        label: 'User creation',
+      });
+      const email = new PreparedEmail();
+      await email.send({
+        template: path.join(__dirname, '../templates/email/password'),
+        message: {
+          to: this.email,
+        },
+        locals: {
+          password: password,
+          applicationUrl,
+        },
+      });
+    } catch (e) {
+      logger.error('Failed to send out password email', {
+        label: 'User creation',
+        message: e.message,
+      });
+    }
+  }
 }
--- a/server/index.ts
+++ b/server/index.ts
@@ -17,8 +17,11 @@ import { startJobs } from './job/schedule';
 import notificationManager from './lib/notifications';
 import DiscordAgent from './lib/notifications/agents/discord';
 import EmailAgent from './lib/notifications/agents/email';
+import TelegramAgent from './lib/notifications/agents/telegram';
 import { getAppVersion } from './utils/appVersion';
 import SlackAgent from './lib/notifications/agents/slack';
+import PushoverAgent from './lib/notifications/agents/pushover';
+import WebhookAgent from './lib/notifications/agents/webhook';

 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');

@@ -47,6 +50,9 @@ app
      new DiscordAgent(),
      new EmailAgent(),
      new SlackAgent(),
+      new TelegramAgent(),
+      new PushoverAgent(),
+      new WebhookAgent(),
    ]);

    // Start Jobs
--- a/server/interfaces/api/serviceInterfaces.ts
+++ b/server/interfaces/api/serviceInterfaces.ts
@@ -0,0 +1,18 @@
+import { RadarrProfile, RadarrRootFolder } from '../../api/radarr';
+
+export interface ServiceCommonServer {
+  id: number;
+  name: string;
+  is4k: boolean;
+  isDefault: boolean;
+  activeProfileId: number;
+  activeDirectory: string;
+  activeAnimeProfileId?: number;
+  activeAnimeDirectory?: string;
+}
+
+export interface ServiceCommonServerWithDetails {
+  server: ServiceCommonServer;
+  profiles: RadarrProfile[];
+  rootFolders: Partial<RadarrRootFolder>[];
+}
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/server/interfaces/api/settingsInterfaces.ts
@@ -4,3 +4,9 @@ export interface SettingsAboutResponse {
  totalMediaItems: number;
  tz?: string;
 }
+
+export interface PublicSettingsResponse {
+  initialized: boolean;
+  movie4kEnabled: boolean;
+  series4kEnabled: boolean;
+}
--- a/server/job/plexsync/index.ts
+++ b/server/job/plexsync/index.ts
@@ -1,6 +1,6 @@
 import { getRepository } from 'typeorm';
 import { User } from '../../entity/User';
-import PlexAPI, { PlexLibraryItem } from '../../api/plexapi';
+import PlexAPI, { PlexLibraryItem, PlexMetadata } from '../../api/plexapi';
 import TheMovieDb, {
  TmdbMovieDetails,
  TmdbTvDetails,
@@ -11,15 +11,23 @@ import logger from '../../logger';
 import { getSettings, Library } from '../../lib/settings';
 import Season from '../../entity/Season';
 import { uniqWith } from 'lodash';
+import { v4 as uuid } from 'uuid';
+import animeList from '../../api/animelist';
+import AsyncLock from '../../utils/asyncLock';

 const BUNDLE_SIZE = 20;
 const UPDATE_RATE = 4 * 1000;

 const imdbRegex = new RegExp(/imdb:\/\/(tt[0-9]+)/);
 const tmdbRegex = new RegExp(/tmdb:\/\/([0-9]+)/);
-const tvdbRegex = new RegExp(/tvdb:\/\/([0-9]+)|hama:\/\/tvdb-([0-9]+)/);
+const tvdbRegex = new RegExp(/tvdb:\/\/([0-9]+)/);
 const tmdbShowRegex = new RegExp(/themoviedb:\/\/([0-9]+)/);
 const plexRegex = new RegExp(/plex:\/\//);
+// Hama agent uses ASS naming, see details here:
+// https://github.com/ZeroQI/Absolute-Series-Scanner/blob/master/README.md#forcing-the-movieseries-id
+const hamaTvdbRegex = new RegExp(/hama:\/\/tvdb[0-9]?-([0-9]+)/);
+const hamaAnidbRegex = new RegExp(/hama:\/\/anidb[0-9]?-([0-9]+)/);
+const HAMA_AGENT = 'com.plexapp.agents.hama';

 interface SyncStatus {
  running: boolean;
@@ -30,6 +38,7 @@ interface SyncStatus {
 }

 class JobPlexSync {
+  private sessionId: string;
  private tmdb: TheMovieDb;
  private plexClient: PlexAPI;
  private items: PlexLibraryItem[] = [];
@@ -38,17 +47,20 @@ class JobPlexSync {
  private currentLibrary: Library;
  private running = false;
  private isRecentOnly = false;
+  private enable4kMovie = false;
+  private enable4kShow = false;
+  private asyncLock = new AsyncLock();

  constructor({ isRecentOnly }: { isRecentOnly?: boolean } = {}) {
    this.tmdb = new TheMovieDb();
    this.isRecentOnly = isRecentOnly ?? false;
  }

-  private async getExisting(tmdbId: number) {
+  private async getExisting(tmdbId: number, mediaType: MediaType) {
    const mediaRepository = getRepository(Media);

    const existing = await mediaRepository.findOne({
-      where: { tmdbId: tmdbId },
+      where: { tmdbId: tmdbId, mediaType },
    });

    return existing;
@@ -78,23 +90,71 @@ class JobPlexSync {
          }
        });

-        const existing = await this.getExisting(newMedia.tmdbId);
+        const has4k = metadata.Media.some(
+          (media) => media.videoResolution === '4k'
+        );
+        const hasOtherResolution = metadata.Media.some(
+          (media) => media.videoResolution !== '4k'
+        );

-        if (existing && existing.status === MediaStatus.AVAILABLE) {
-          this.log(`Title exists and is already available ${metadata.title}`);
-        } else if (existing && existing.status !== MediaStatus.AVAILABLE) {
-          existing.status = MediaStatus.AVAILABLE;
-          mediaRepository.save(existing);
-          this.log(
-            `Request for ${metadata.title} exists. Setting status AVAILABLE`,
-            'info'
+        await this.asyncLock.dispatch(newMedia.tmdbId, async () => {
+          const existing = await this.getExisting(
+            newMedia.tmdbId,
+            MediaType.MOVIE
          );
-        } else {
-          newMedia.status = MediaStatus.AVAILABLE;
-          newMedia.mediaType = MediaType.MOVIE;
-          await mediaRepository.save(newMedia);
-          this.log(`Saved ${plexitem.title}`);
-        }
+
+          if (existing) {
+            let changedExisting = false;
+
+            if (
+              (hasOtherResolution || (!this.enable4kMovie && has4k)) &&
+              existing.status !== MediaStatus.AVAILABLE
+            ) {
+              existing.status = MediaStatus.AVAILABLE;
+              existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+              changedExisting = true;
+            }
+
+            if (
+              has4k &&
+              this.enable4kMovie &&
+              existing.status4k !== MediaStatus.AVAILABLE
+            ) {
+              existing.status4k = MediaStatus.AVAILABLE;
+              changedExisting = true;
+            }
+
+            if (!existing.mediaAddedAt && !changedExisting) {
+              existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+              changedExisting = true;
+            }
+
+            if (changedExisting) {
+              await mediaRepository.save(existing);
+              this.log(
+                `Request for ${metadata.title} exists. New media types set to AVAILABLE`,
+                'info'
+              );
+            } else {
+              this.log(
+                `Title already exists and no new media types found ${metadata.title}`
+              );
+            }
+          } else {
+            newMedia.status =
+              hasOtherResolution || (!this.enable4kMovie && has4k)
+                ? MediaStatus.AVAILABLE
+                : MediaStatus.UNKNOWN;
+            newMedia.status4k =
+              has4k && this.enable4kMovie
+                ? MediaStatus.AVAILABLE
+                : MediaStatus.UNKNOWN;
+            newMedia.mediaType = MediaType.MOVIE;
+            newMedia.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+            await mediaRepository.save(newMedia);
+            this.log(`Saved ${plexitem.title}`);
+          }
+        });
      } else {
        let tmdbMovieId: number | undefined;
        let tmdbMovie: TmdbMovieDetails | undefined;
@@ -115,30 +175,7 @@ class JobPlexSync {
          throw new Error('Unable to find TMDB ID');
        }

-        const existing = await this.getExisting(tmdbMovieId);
-        if (existing && existing.status === MediaStatus.AVAILABLE) {
-          this.log(`Title exists and is already available ${plexitem.title}`);
-        } else if (existing && existing.status !== MediaStatus.AVAILABLE) {
-          existing.status = MediaStatus.AVAILABLE;
-          await mediaRepository.save(existing);
-          this.log(
-            `Request for ${plexitem.title} exists. Setting status AVAILABLE`,
-            'info'
-          );
-        } else {
-          // If we have a tmdb movie guid but it didn't already exist, only then
-          // do we request the movie from tmdb (to reduce api requests)
-          if (!tmdbMovie) {
-            tmdbMovie = await this.tmdb.getMovie({ movieId: tmdbMovieId });
-          }
-          const newMedia = new Media();
-          newMedia.imdbId = tmdbMovie.external_ids.imdb_id;
-          newMedia.tmdbId = tmdbMovie.id;
-          newMedia.status = MediaStatus.AVAILABLE;
-          newMedia.mediaType = MediaType.MOVIE;
-          await mediaRepository.save(newMedia);
-          this.log(`Saved ${tmdbMovie.title}`);
-        }
+        await this.processMovieWithId(plexitem, tmdbMovie, tmdbMovieId);
      }
    } catch (e) {
      this.log(
@@ -152,6 +189,113 @@ class JobPlexSync {
    }
  }

+  private async processMovieWithId(
+    plexitem: PlexLibraryItem,
+    tmdbMovie: TmdbMovieDetails | undefined,
+    tmdbMovieId: number
+  ) {
+    const mediaRepository = getRepository(Media);
+
+    await this.asyncLock.dispatch(tmdbMovieId, async () => {
+      const metadata = await this.plexClient.getMetadata(plexitem.ratingKey);
+      const existing = await this.getExisting(tmdbMovieId, MediaType.MOVIE);
+
+      const has4k = metadata.Media.some(
+        (media) => media.videoResolution === '4k'
+      );
+      const hasOtherResolution = metadata.Media.some(
+        (media) => media.videoResolution !== '4k'
+      );
+
+      if (existing) {
+        let changedExisting = false;
+
+        if (
+          (hasOtherResolution || (!this.enable4kMovie && has4k)) &&
+          existing.status !== MediaStatus.AVAILABLE
+        ) {
+          existing.status = MediaStatus.AVAILABLE;
+          existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+          changedExisting = true;
+        }
+
+        if (
+          has4k &&
+          this.enable4kMovie &&
+          existing.status4k !== MediaStatus.AVAILABLE
+        ) {
+          existing.status4k = MediaStatus.AVAILABLE;
+          changedExisting = true;
+        }
+
+        if (!existing.mediaAddedAt && !changedExisting) {
+          existing.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+          changedExisting = true;
+        }
+
+        if (changedExisting) {
+          await mediaRepository.save(existing);
+          this.log(
+            `Request for ${metadata.title} exists. New media types set to AVAILABLE`,
+            'info'
+          );
+        } else {
+          this.log(
+            `Title already exists and no new media types found ${metadata.title}`
+          );
+        }
+      } else {
+        // If we have a tmdb movie guid but it didn't already exist, only then
+        // do we request the movie from tmdb (to reduce api requests)
+        if (!tmdbMovie) {
+          tmdbMovie = await this.tmdb.getMovie({ movieId: tmdbMovieId });
+        }
+        const newMedia = new Media();
+        newMedia.imdbId = tmdbMovie.external_ids.imdb_id;
+        newMedia.tmdbId = tmdbMovie.id;
+        newMedia.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+        newMedia.status =
+          hasOtherResolution || (!this.enable4kMovie && has4k)
+            ? MediaStatus.AVAILABLE
+            : MediaStatus.UNKNOWN;
+        newMedia.status4k =
+          has4k && this.enable4kMovie
+            ? MediaStatus.AVAILABLE
+            : MediaStatus.UNKNOWN;
+        newMedia.mediaType = MediaType.MOVIE;
+        await mediaRepository.save(newMedia);
+        this.log(`Saved ${tmdbMovie.title}`);
+      }
+    });
+  }
+
+  // this adds all movie episodes from specials season for Hama agent
+  private async processHamaSpecials(metadata: PlexMetadata, tvdbId: number) {
+    const specials = metadata.Children?.Metadata.find(
+      (md) => Number(md.index) === 0
+    );
+    if (specials) {
+      const episodes = await this.plexClient.getChildrenMetadata(
+        specials.ratingKey
+      );
+      if (episodes) {
+        for (const episode of episodes) {
+          const special = animeList.getSpecialEpisode(tvdbId, episode.index);
+          if (special) {
+            if (special.tmdbId) {
+              await this.processMovieWithId(episode, undefined, special.tmdbId);
+            } else if (special.imdbId) {
+              const tmdbMovie = await this.tmdb.getMovieByImdbId({
+                imdbId: special.imdbId,
+              });
+              await this.processMovieWithId(episode, tmdbMovie, tmdbMovie.id);
+            }
+          }
+        }
+      }
+    }
+  }
+
  private async processShow(plexitem: PlexLibraryItem) {
    const mediaRepository = getRepository(Media);

@@ -179,110 +323,272 @@ class JobPlexSync {
        if (matchedtmdb?.[1]) {
          tvShow = await this.tmdb.getTvShow({ tvId: Number(matchedtmdb[1]) });
        }
-      }
+      } else if (metadata.guid.match(hamaTvdbRegex)) {
+        const matched = metadata.guid.match(hamaTvdbRegex);
+        const tvdbId = matched?.[1];

-      if (tvShow && metadata) {
-        // Lets get the available seasons from plex
-        const seasons = tvShow.seasons;
-        const media = await mediaRepository.findOne({
-          where: { tmdbId: tvShow.id, mediaType: MediaType.TV },
-        });
+        if (tvdbId) {
+          tvShow = await this.tmdb.getShowByTvdbId({ tvdbId: Number(tvdbId) });
+          if (animeList.isLoaded()) {
+            await this.processHamaSpecials(metadata, Number(tvdbId));
+          } else {
+            this.log(
+              `Hama id ${plexitem.guid} detected, but library agent is not set to Hama`,
+              'warn'
+            );
+          }
+        }
+      } else if (metadata.guid.match(hamaAnidbRegex)) {
+        const matched = metadata.guid.match(hamaAnidbRegex);

-        const newSeasons: Season[] = [];
-
-        const currentSeasonAvailable = (
-          media?.seasons.filter(
-            (season) => season.status === MediaStatus.AVAILABLE
-          ) ?? []
-        ).length;
-
-        seasons.forEach((season) => {
-          const matchedPlexSeason = metadata.Children?.Metadata.find(
-            (md) => Number(md.index) === season.season_number
+        if (!animeList.isLoaded()) {
+          this.log(
+            `Hama id ${plexitem.guid} detected, but library agent is not set to Hama`,
+            'warn'
          );
+        } else if (matched?.[1]) {
+          const anidbId = Number(matched[1]);
+          const result = animeList.getFromAnidbId(anidbId);

-          const existingSeason = media?.seasons.find(
-            (es) => es.seasonNumber === season.season_number
-          );
-
-          // Check if we found the matching season and it has all the available episodes
-          if (
-            matchedPlexSeason &&
-            Number(matchedPlexSeason.leafCount) === season.episode_count
-          ) {
-            if (existingSeason) {
-              existingSeason.status = MediaStatus.AVAILABLE;
+          // first try to lookup tvshow by tvdbid
+          if (result?.tvdbId) {
+            const extResponse = await this.tmdb.getByExternalId({
+              externalId: result.tvdbId,
+              type: 'tvdb',
+            });
+            if (extResponse.tv_results[0]) {
+              tvShow = await this.tmdb.getTvShow({
+                tvId: extResponse.tv_results[0].id,
+              });
            } else {
-              newSeasons.push(
-                new Season({
-                  seasonNumber: season.season_number,
-                  status: MediaStatus.AVAILABLE,
-                })
+              this.log(
+                `Missing TVDB ${result.tvdbId} entry in TMDB for AniDB ${anidbId}`
              );
            }
-          } else if (matchedPlexSeason) {
-            if (existingSeason) {
-              existingSeason.status = MediaStatus.PARTIALLY_AVAILABLE;
-            } else {
-              newSeasons.push(
-                new Season({
-                  seasonNumber: season.season_number,
-                  status: MediaStatus.PARTIALLY_AVAILABLE,
-                })
+            await this.processHamaSpecials(metadata, result.tvdbId);
+          }
+
+          if (!tvShow) {
+            // if lookup of tvshow above failed, then try movie with tmdbid/imdbid
+            // note - some tv shows have imdbid set too, that's why this need to go second
+            if (result?.tmdbId) {
+              return await this.processMovieWithId(
+                plexitem,
+                undefined,
+                result.tmdbId
+              );
+            } else if (result?.imdbId) {
+              const tmdbMovie = await this.tmdb.getMovieByImdbId({
+                imdbId: result.imdbId,
+              });
+              return await this.processMovieWithId(
+                plexitem,
+                tmdbMovie,
+                tmdbMovie.id
              );
            }
          }
-        });
+        }
+      }

-        // Remove extras season. We dont count it for determining availability
-        const filteredSeasons = tvShow.seasons.filter(
-          (season) => season.season_number !== 0
-        );
+      if (tvShow) {
+        await this.asyncLock.dispatch(tvShow.id, async () => {
+          if (!tvShow) {
+            // this will never execute, but typescript thinks somebody could reset tvShow from
+            // outer scope back to null before this async gets called
+            return;
+          }

-        const isAllSeasons =
-          newSeasons.length + (media?.seasons.length ?? 0) >=
-          filteredSeasons.length;
+          // Lets get the available seasons from plex
+          const seasons = tvShow.seasons;
+          const media = await this.getExisting(tvShow.id, MediaType.TV);

-        if (media) {
-          // Update existing
-          media.seasons = [...media.seasons, ...newSeasons];
+          const newSeasons: Season[] = [];

-          const newSeasonAvailable = (
-            media.seasons.filter(
+          const currentStandardSeasonAvailable = (
+            media?.seasons.filter(
              (season) => season.status === MediaStatus.AVAILABLE
            ) ?? []
          ).length;
+          const current4kSeasonAvailable = (
+            media?.seasons.filter(
+              (season) => season.status4k === MediaStatus.AVAILABLE
+            ) ?? []
+          ).length;

-          // If at least one new season has become available, update
-          // the lastSeasonChange field so we can trigger notifications
-          if (newSeasonAvailable > currentSeasonAvailable) {
-            this.log(
-              `Detected ${
-                newSeasonAvailable - currentSeasonAvailable
-              } new season(s) for ${tvShow.name}`,
-              'debug'
+          for (const season of seasons) {
+            const matchedPlexSeason = metadata.Children?.Metadata.find(
+              (md) => Number(md.index) === season.season_number
            );
-            media.lastSeasonChange = new Date();
+
+            const existingSeason = media?.seasons.find(
+              (es) => es.seasonNumber === season.season_number
+            );
+
+            // Check if we found the matching season and it has all the available episodes
+            if (matchedPlexSeason) {
+              // If we have a matched plex season, get its children metadata so we can check details
+              const episodes = await this.plexClient.getChildrenMetadata(
+                matchedPlexSeason.ratingKey
+              );
+              // Total episodes that are in standard definition (not 4k)
+              const totalStandard = episodes.filter((episode) =>
+                episode.Media.some((media) => media.videoResolution !== '4k')
+              ).length;
+
+              // Total episodes that are in 4k
+              const total4k = episodes.filter((episode) =>
+                episode.Media.some((media) => media.videoResolution === '4k')
+              ).length;
+
+              if (existingSeason) {
+                // These ternary statements look super confusing, but they are simply
+                // setting the status to AVAILABLE if all of a type is there, partially if some,
+                // and then not modifying the status if there are 0 items
+                existingSeason.status =
+                  totalStandard === season.episode_count
+                    ? MediaStatus.AVAILABLE
+                    : totalStandard > 0
+                    ? MediaStatus.PARTIALLY_AVAILABLE
+                    : existingSeason.status;
+                existingSeason.status4k =
+                  total4k === season.episode_count
+                    ? MediaStatus.AVAILABLE
+                    : total4k > 0
+                    ? MediaStatus.PARTIALLY_AVAILABLE
+                    : existingSeason.status4k;
+              } else {
+                newSeasons.push(
+                  new Season({
+                    seasonNumber: season.season_number,
+                    // This ternary is the same as the ones above, but it just falls back to "UNKNOWN"
+                    // if we dont have any items for the season
+                    status:
+                      totalStandard === season.episode_count
+                        ? MediaStatus.AVAILABLE
+                        : totalStandard > 0
+                        ? MediaStatus.PARTIALLY_AVAILABLE
+                        : MediaStatus.UNKNOWN,
+                    status4k:
+                      total4k === season.episode_count
+                        ? MediaStatus.AVAILABLE
+                        : total4k > 0
+                        ? MediaStatus.PARTIALLY_AVAILABLE
+                        : MediaStatus.UNKNOWN,
+                  })
+                );
+              }
+            }
          }

-          media.status = isAllSeasons
-            ? MediaStatus.AVAILABLE
-            : MediaStatus.PARTIALLY_AVAILABLE;
-          await mediaRepository.save(media);
-          this.log(`Updating existing title: ${tvShow.name}`);
-        } else {
-          const newMedia = new Media({
-            mediaType: MediaType.TV,
-            seasons: newSeasons,
-            tmdbId: tvShow.id,
-            tvdbId: tvShow.external_ids.tvdb_id,
-            status: isAllSeasons
+          // Remove extras season. We dont count it for determining availability
+          const filteredSeasons = tvShow.seasons.filter(
+            (season) => season.season_number !== 0
+          );
+
+          const isAllStandardSeasons =
+            newSeasons.filter(
+              (season) => season.status === MediaStatus.AVAILABLE
+            ).length +
+              (media?.seasons.filter(
+                (season) => season.status === MediaStatus.AVAILABLE
+              ).length ?? 0) >=
+            filteredSeasons.length;
+
+          const isAll4kSeasons =
+            newSeasons.filter(
+              (season) => season.status4k === MediaStatus.AVAILABLE
+            ).length +
+              (media?.seasons.filter(
+                (season) => season.status4k === MediaStatus.AVAILABLE
+              ).length ?? 0) >=
+            filteredSeasons.length;
+
+          if (media) {
+            // Update existing
+            media.seasons = [...media.seasons, ...newSeasons];
+
+            const newStandardSeasonAvailable = (
+              media.seasons.filter(
+                (season) => season.status === MediaStatus.AVAILABLE
+              ) ?? []
+            ).length;
+
+            const new4kSeasonAvailable = (
+              media.seasons.filter(
+                (season) => season.status4k === MediaStatus.AVAILABLE
+              ) ?? []
+            ).length;
+
+            // If at least one new season has become available, update
+            // the lastSeasonChange field so we can trigger notifications
+            if (newStandardSeasonAvailable > currentStandardSeasonAvailable) {
+              this.log(
+                `Detected ${
+                  newStandardSeasonAvailable - currentStandardSeasonAvailable
+                } new standard season(s) for ${tvShow.name}`,
+                'debug'
+              );
+              media.lastSeasonChange = new Date();
+              media.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+            }
+
+            if (new4kSeasonAvailable > current4kSeasonAvailable) {
+              this.log(
+                `Detected ${
+                  new4kSeasonAvailable - current4kSeasonAvailable
+                } new 4K season(s) for ${tvShow.name}`,
+                'debug'
+              );
+              media.lastSeasonChange = new Date();
+            }
+
+            if (!media.mediaAddedAt) {
+              media.mediaAddedAt = new Date(plexitem.addedAt * 1000);
+            }
+
+            media.status = isAllStandardSeasons
              ? MediaStatus.AVAILABLE
-              : MediaStatus.PARTIALLY_AVAILABLE,
-          });
-          await mediaRepository.save(newMedia);
-          this.log(`Saved ${tvShow.name}`);
-        }
+              : media.seasons.some(
+                  (season) => season.status !== MediaStatus.UNKNOWN
+                )
+              ? MediaStatus.PARTIALLY_AVAILABLE
+              : MediaStatus.UNKNOWN;
+            media.status4k = isAll4kSeasons
+              ? MediaStatus.AVAILABLE
+              : media.seasons.some(
+                  (season) => season.status4k !== MediaStatus.UNKNOWN
+                )
+              ? MediaStatus.PARTIALLY_AVAILABLE
+              : MediaStatus.UNKNOWN;
+            await mediaRepository.save(media);
+            this.log(`Updating existing title: ${tvShow.name}`);
+          } else {
+            const newMedia = new Media({
+              mediaType: MediaType.TV,
+              seasons: newSeasons,
+              tmdbId: tvShow.id,
+              tvdbId: tvShow.external_ids.tvdb_id,
+              mediaAddedAt: new Date(plexitem.addedAt * 1000),
+              status: isAllStandardSeasons
+                ? MediaStatus.AVAILABLE
+                : newSeasons.some(
+                    (season) => season.status !== MediaStatus.UNKNOWN
+                  )
+                ? MediaStatus.PARTIALLY_AVAILABLE
+                : MediaStatus.UNKNOWN,
+              status4k: isAll4kSeasons
+                ? MediaStatus.AVAILABLE
+                : newSeasons.some(
+                    (season) => season.status4k !== MediaStatus.UNKNOWN
+                  )
+                ? MediaStatus.PARTIALLY_AVAILABLE
+                : MediaStatus.UNKNOWN,
+            });
+            await mediaRepository.save(newMedia);
+            this.log(`Saved ${tvShow.name}`);
+          }
+        });
      } else {
        this.log(`failed show: ${plexitem.guid}`);
      }
@@ -321,22 +627,35 @@ class JobPlexSync {
  private async loop({
    start = 0,
    end = BUNDLE_SIZE,
+    sessionId,
  }: {
    start?: number;
    end?: number;
+    sessionId?: string;
  } = {}) {
    const slicedItems = this.items.slice(start, end);
-    if (start < this.items.length && this.running) {
+
+    if (!this.running) {
+      throw new Error('Sync was aborted.');
+    }
+
+    if (this.sessionId !== sessionId) {
+      throw new Error('New session was started. Old session aborted.');
+    }
+
+    if (start < this.items.length) {
      this.progress = start;
      await this.processItems(slicedItems);

-      await new Promise<void>((resolve) =>
-        setTimeout(async () => {
-          await this.loop({
+      await new Promise<void>((resolve, reject) =>
+        setTimeout(() => {
+          this.loop({
            start: start + BUNDLE_SIZE,
            end: end + BUNDLE_SIZE,
-          });
-          resolve();
+            sessionId,
+          })
+            .then(() => resolve())
+            .catch((e) => reject(new Error(e.message)));
        }, UPDATE_RATE)
      );
    }
@@ -344,28 +663,67 @@ class JobPlexSync {

  private log(
    message: string,
-    level: 'info' | 'error' | 'debug' = 'debug',
+    level: 'info' | 'error' | 'debug' | 'warn' = 'debug',
    optional?: Record<string, unknown>
  ): void {
    logger[level](message, { label: 'Plex Sync', ...optional });
  }

+  // checks if any of this.libraries has Hama agent set in Plex
+  private async hasHamaAgent() {
+    const plexLibraries = await this.plexClient.getLibraries();
+    return this.libraries.some((library) =>
+      plexLibraries.some(
+        (plexLibrary) =>
+          plexLibrary.agent === HAMA_AGENT && library.id === plexLibrary.key
+      )
+    );
+  }
+
  public async run(): Promise<void> {
    const settings = getSettings();
-    if (!this.running) {
+    const sessionId = uuid();
+    this.sessionId = sessionId;
+    logger.info('Plex Sync Starting', { sessionId, label: 'Plex Sync' });
+    try {
      this.running = true;
      const userRepository = getRepository(User);
-      const admin = await userRepository.findOneOrFail({
+      const admin = await userRepository.findOne({
        select: ['id', 'plexToken'],
        order: { id: 'ASC' },
      });

+      if (!admin) {
+        return this.log('No admin configured. Plex sync skipped.', 'warn');
+      }
+
      this.plexClient = new PlexAPI({ plexToken: admin.plexToken });

      this.libraries = settings.plex.libraries.filter(
        (library) => library.enabled
      );

+      this.enable4kMovie = settings.radarr.some((radarr) => radarr.is4k);
+      if (this.enable4kMovie) {
+        this.log(
+          'At least one 4K Radarr server was detected. 4K movie detection is now enabled',
+          'info'
+        );
+      }
+
+      this.enable4kShow = settings.sonarr.some((sonarr) => sonarr.is4k);
+      if (this.enable4kShow) {
+        this.log(
+          'At least one 4K Sonarr server was detected. 4K series detection is now enabled',
+          'info'
+        );
+      }
+
+      const hasHama = await this.hasHamaAgent();
+      if (hasHama) {
+        await animeList.sync();
+      }
+
      if (this.isRecentOnly) {
        for (const library of this.libraries) {
          this.currentLibrary = library;
@@ -392,18 +750,31 @@ class JobPlexSync {
            return mediaA.ratingKey === mediaB.ratingKey;
          });

-          await this.loop();
+          await this.loop({ sessionId });
        }
      } else {
        for (const library of this.libraries) {
          this.currentLibrary = library;
          this.log(`Beginning to process library: ${library.name}`, 'info');
          this.items = await this.plexClient.getLibraryContents(library.id);
-          await this.loop();
+          await this.loop({ sessionId });
        }
      }
-      this.running = false;
-      this.log('complete');
+      this.log(
+        this.isRecentOnly
+          ? 'Recently Added Scan Complete'
+          : 'Full Scan Complete'
+      );
+    } catch (e) {
+      logger.error('Sync interrupted', {
+        label: 'Plex Sync',
+        errorMessage: e.message,
+      });
+    } finally {
+      // If a new scanning session hasnt started, set running back to false
+      if (this.sessionId === sessionId) {
+        this.running = false;
+      }
    }
  }

--- a/server/lib/email/index.ts
+++ b/server/lib/email/index.ts
@@ -0,0 +1,38 @@
+import nodemailer from 'nodemailer';
+import Email from 'email-templates';
+import { getSettings } from '../settings';
+class PreparedEmail extends Email {
+  public constructor() {
+    const settings = getSettings().notifications.agents.email;
+
+    const transport = nodemailer.createTransport({
+      host: settings.options.smtpHost,
+      port: settings.options.smtpPort,
+      secure: settings.options.secure,
+      tls: settings.options.allowSelfSigned
+        ? {
+            rejectUnauthorized: false,
+          }
+        : undefined,
+      auth:
+        settings.options.authUser && settings.options.authPass
+          ? {
+              user: settings.options.authUser,
+              pass: settings.options.authPass,
+            }
+          : undefined,
+    });
+    super({
+      message: {
+        from: {
+          name: settings.options.senderName,
+          address: settings.options.emailFrom,
+        },
+      },
+      send: true,
+      transport: transport,
+    });
+  }
+}
+
+export default PreparedEmail;
--- a/server/lib/notifications/agents/discord.ts
+++ b/server/lib/notifications/agents/discord.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { Notification } from '..';
+import { hasNotificationType, Notification } from '..';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentDiscord } from '../../settings';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
@@ -158,6 +158,28 @@ class DiscordAgent
          }
        );

+        if (settings.main.applicationUrl) {
+          fields.push({
+            name: 'View Media',
+            value: `${settings.main.applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`,
+          });
+        }
+        break;
+      case Notification.MEDIA_DECLINED:
+        color = EmbedColors.RED;
+        fields.push(
+          {
+            name: 'Requested By',
+            value: payload.notifyUser.username ?? '',
+            inline: true,
+          },
+          {
+            name: 'Status',
+            value: 'Declined',
+            inline: true,
+          }
+        );
+
        if (settings.main.applicationUrl) {
          fields.push({
            name: 'View Media',
@@ -196,10 +218,12 @@ class DiscordAgent
    };
  }

-  // TODO: Add checking for type here once we add notification type filters for agents
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public shouldSend(_type: Notification): boolean {
-    if (this.getSettings().enabled && this.getSettings().options.webhookUrl) {
+  public shouldSend(type: Notification): boolean {
+    if (
+      this.getSettings().enabled &&
+      this.getSettings().options.webhookUrl &&
+      hasNotificationType(type, this.getSettings().types)
+    ) {
      return true;
    }

--- a/server/lib/notifications/agents/email.ts
+++ b/server/lib/notifications/agents/email.ts
@@ -1,13 +1,12 @@
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
-import { Notification } from '..';
+import { hasNotificationType, Notification } from '..';
 import path from 'path';
 import { getSettings, NotificationAgentEmail } from '../../settings';
-import nodemailer from 'nodemailer';
-import Email from 'email-templates';
 import logger from '../../../logger';
 import { getRepository } from 'typeorm';
 import { User } from '../../../entity/User';
 import { Permission } from '../../permissions';
+import PreparedEmail from '../../email';

 class EmailAgent
  extends BaseAgent<NotificationAgentEmail>
@@ -22,51 +21,19 @@ class EmailAgent
    return settings.notifications.agents.email;
  }

-  // TODO: Add checking for type here once we add notification type filters for agents
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public shouldSend(_type: Notification): boolean {
+  public shouldSend(type: Notification): boolean {
    const settings = this.getSettings();

-    if (settings.enabled) {
+    if (
+      settings.enabled &&
+      hasNotificationType(type, this.getSettings().types)
+    ) {
      return true;
    }

    return false;
  }

-  private getSmtpTransport() {
-    const emailSettings = this.getSettings().options;
-
-    return nodemailer.createTransport({
-      host: emailSettings.smtpHost,
-      port: emailSettings.smtpPort,
-      secure: emailSettings.secure,
-      tls: emailSettings.allowSelfSigned
-        ? {
-            rejectUnauthorized: false,
-          }
-        : undefined,
-      auth:
-        emailSettings.authUser && emailSettings.authPass
-          ? {
-              user: emailSettings.authUser,
-              pass: emailSettings.authPass,
-            }
-          : undefined,
-    });
-  }
-
-  private getNewEmail() {
-    const settings = this.getSettings();
-    return new Email({
-      message: {
-        from: settings.options.emailFrom,
-      },
-      send: true,
-      transport: this.getSmtpTransport(),
-    });
-  }
-
  private async sendMediaRequestEmail(payload: NotificationPayload) {
    // This is getting main settings for the whole app
    const applicationUrl = getSettings().main.applicationUrl;
@@ -78,7 +45,7 @@ class EmailAgent
      users
        .filter((user) => user.hasPermission(Permission.MANAGE_REQUESTS))
        .forEach((user) => {
-          const email = this.getNewEmail();
+          const email = new PreparedEmail();

          email.send({
            template: path.join(
@@ -123,7 +90,7 @@ class EmailAgent
      users
        .filter((user) => user.hasPermission(Permission.MANAGE_REQUESTS))
        .forEach((user) => {
-          const email = this.getNewEmail();
+          const email = new PreparedEmail();

          email.send({
            template: path.join(
@@ -162,7 +129,7 @@ class EmailAgent
    // This is getting main settings for the whole app
    const applicationUrl = getSettings().main.applicationUrl;
    try {
-      const email = this.getNewEmail();
+      const email = new PreparedEmail();

      await email.send({
        template: path.join(
@@ -195,11 +162,48 @@ class EmailAgent
    }
  }

+  private async sendMediaDeclinedEmail(payload: NotificationPayload) {
+    // This is getting main settings for the whole app
+    const applicationUrl = getSettings().main.applicationUrl;
+    try {
+      const email = new PreparedEmail();
+
+      await email.send({
+        template: path.join(
+          __dirname,
+          '../../../templates/email/media-request'
+        ),
+        message: {
+          to: payload.notifyUser.email,
+        },
+        locals: {
+          body: 'Your request for the following media was declined:',
+          mediaName: payload.subject,
+          imageUrl: payload.image,
+          timestamp: new Date().toTimeString(),
+          requestedBy: payload.notifyUser.username,
+          actionUrl: applicationUrl
+            ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
+            : undefined,
+          applicationUrl,
+          requestType: 'Request Declined',
+        },
+      });
+      return true;
+    } catch (e) {
+      logger.error('Mail notification failed to send', {
+        label: 'Notifications',
+        message: e.message,
+      });
+      return false;
+    }
+  }
+
  private async sendMediaAvailableEmail(payload: NotificationPayload) {
    // This is getting main settings for the whole app
    const applicationUrl = getSettings().main.applicationUrl;
    try {
-      const email = this.getNewEmail();
+      const email = new PreparedEmail();

      await email.send({
        template: path.join(
@@ -236,7 +240,7 @@ class EmailAgent
    // This is getting main settings for the whole app
    const applicationUrl = getSettings().main.applicationUrl;
    try {
-      const email = this.getNewEmail();
+      const email = new PreparedEmail();

      await email.send({
        template: path.join(__dirname, '../../../templates/email/test-email'),
@@ -271,6 +275,9 @@ class EmailAgent
      case Notification.MEDIA_APPROVED:
        this.sendMediaApprovedEmail(payload);
        break;
+      case Notification.MEDIA_DECLINED:
+        this.sendMediaDeclinedEmail(payload);
+        break;
      case Notification.MEDIA_AVAILABLE:
        this.sendMediaAvailableEmail(payload);
        break;
--- a/server/lib/notifications/agents/pushover.ts
+++ b/server/lib/notifications/agents/pushover.ts
@@ -0,0 +1,129 @@
+import axios from 'axios';
+import { hasNotificationType, Notification } from '..';
+import logger from '../../../logger';
+import { getSettings, NotificationAgentPushover } from '../../settings';
+import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+
+interface PushoverPayload {
+  token: string;
+  user: string;
+  title: string;
+  message: string;
+  html: number;
+}
+
+class PushoverAgent
+  extends BaseAgent<NotificationAgentPushover>
+  implements NotificationAgent {
+  protected getSettings(): NotificationAgentPushover {
+    if (this.settings) {
+      return this.settings;
+    }
+
+    const settings = getSettings();
+
+    return settings.notifications.agents.pushover;
+  }
+
+  public shouldSend(type: Notification): boolean {
+    if (
+      this.getSettings().enabled &&
+      this.getSettings().options.accessToken &&
+      this.getSettings().options.userToken &&
+      hasNotificationType(type, this.getSettings().types)
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  private constructMessageDetails(
+    type: Notification,
+    payload: NotificationPayload
+  ): { title: string; message: string } {
+    const settings = getSettings();
+    let messageTitle = '';
+    let message = '';
+
+    const title = payload.subject;
+    const plot = payload.message;
+    const user = payload.notifyUser.username;
+
+    switch (type) {
+      case Notification.MEDIA_PENDING:
+        messageTitle = 'New Request';
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `<b>Requested By</b>\n${user}\n\n`;
+        message += `<b>Status</b>\nPending Approval\n`;
+        break;
+      case Notification.MEDIA_APPROVED:
+        messageTitle = 'Request Approved';
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `<b>Requested By</b>\n${user}\n\n`;
+        message += `<b>Status</b>\nProcessing Request\n`;
+        break;
+      case Notification.MEDIA_AVAILABLE:
+        messageTitle = 'Now available!';
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `<b>Requested By</b>\n${user}\n\n`;
+        message += `<b>Status</b>\nAvailable\n`;
+        break;
+      case Notification.MEDIA_DECLINED:
+        messageTitle = 'Request Declined';
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `<b>Requested By</b>\n${user}\n\n`;
+        message += `<b>Status</b>\nDeclined\n`;
+        break;
+      case Notification.TEST_NOTIFICATION:
+        messageTitle = 'Test Notification';
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `<b>Requested By</b>\n${user}\n`;
+        break;
+    }
+
+    if (settings.main.applicationUrl && payload.media) {
+      const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
+      message += `<a href="${actionUrl}">Open in Overseerr</a>`;
+    }
+
+    return { title: messageTitle, message };
+  }
+
+  public async send(
+    type: Notification,
+    payload: NotificationPayload
+  ): Promise<boolean> {
+    logger.debug('Sending Pushover notification', { label: 'Notifications' });
+    try {
+      const endpoint = 'https://api.pushover.net/1/messages.json';
+
+      const { accessToken, userToken } = this.getSettings().options;
+
+      const { title, message } = this.constructMessageDetails(type, payload);
+
+      await axios.post(endpoint, {
+        token: accessToken,
+        user: userToken,
+        title: title,
+        message: message,
+        html: 1,
+      } as PushoverPayload);
+
+      return true;
+    } catch (e) {
+      logger.error('Error sending Pushover notification', {
+        label: 'Notifications',
+        message: e.message,
+      });
+      return false;
+    }
+  }
+}
+
+export default PushoverAgent;
--- a/server/lib/notifications/agents/slack.ts
+++ b/server/lib/notifications/agents/slack.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { Notification } from '..';
+import { hasNotificationType, Notification } from '..';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentSlack } from '../../settings';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
@@ -96,6 +96,22 @@ class SlackAgent
          actionUrl = `${settings.main.applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`;
        }
        break;
+      case Notification.MEDIA_DECLINED:
+        header = 'Request Declined';
+        fields.push(
+          {
+            type: 'mrkdwn',
+            text: `*Requested By*\n${payload.notifyUser.username ?? ''}`,
+          },
+          {
+            type: 'mrkdwn',
+            text: '*Status*\nDeclined',
+          }
+        );
+        if (settings.main.applicationUrl) {
+          actionUrl = `${settings.main.applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`;
+        }
+        break;
      case Notification.MEDIA_AVAILABLE:
        header = 'Now available!';
        fields.push(
@@ -187,10 +203,12 @@ class SlackAgent
    };
  }

-  // TODO: Add checking for type here once we add notification type filters for agents
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public shouldSend(_type: Notification): boolean {
-    if (this.getSettings().enabled && this.getSettings().options.webhookUrl) {
+  public shouldSend(type: Notification): boolean {
+    if (
+      this.getSettings().enabled &&
+      this.getSettings().options.webhookUrl &&
+      hasNotificationType(type, this.getSettings().types)
+    ) {
      return true;
    }

--- a/server/lib/notifications/agents/telegram.ts
+++ b/server/lib/notifications/agents/telegram.ts
@@ -0,0 +1,135 @@
+import axios from 'axios';
+import { hasNotificationType, Notification } from '..';
+import logger from '../../../logger';
+import { getSettings, NotificationAgentTelegram } from '../../settings';
+import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+
+interface TelegramPayload {
+  text: string;
+  parse_mode: string;
+  chat_id: string;
+}
+
+class TelegramAgent
+  extends BaseAgent<NotificationAgentTelegram>
+  implements NotificationAgent {
+  private baseUrl = 'https://api.telegram.org/';
+
+  protected getSettings(): NotificationAgentTelegram {
+    if (this.settings) {
+      return this.settings;
+    }
+
+    const settings = getSettings();
+
+    return settings.notifications.agents.telegram;
+  }
+
+  public shouldSend(type: Notification): boolean {
+    if (
+      this.getSettings().enabled &&
+      this.getSettings().options.botAPI &&
+      this.getSettings().options.chatId &&
+      hasNotificationType(type, this.getSettings().types)
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  private escapeText(text: string | undefined): string {
+    return text ? text.replace(/[_*[\]()~>#+=|{}.!-]/gi, (x) => '\\' + x) : '';
+  }
+
+  private buildMessage(
+    type: Notification,
+    payload: NotificationPayload
+  ): string {
+    const settings = getSettings();
+    let message = '';
+
+    const title = this.escapeText(payload.subject);
+    const plot = this.escapeText(payload.message);
+    const user = this.escapeText(payload.notifyUser.username);
+
+    /* eslint-disable no-useless-escape */
+    switch (type) {
+      case Notification.MEDIA_PENDING:
+        message += `\*New Request\*\n`;
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `\*Requested By\*\n${user}\n\n`;
+        message += `\*Status\*\nPending Approval\n`;
+
+        break;
+      case Notification.MEDIA_APPROVED:
+        message += `\*Request Approved\*\n`;
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `\*Requested By\*\n${user}\n\n`;
+        message += `\*Status\*\nProcessing Request\n`;
+
+        break;
+      case Notification.MEDIA_DECLINED:
+        message += `\*Request Declined\*\n`;
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `\*Requested By\*\n${user}\n\n`;
+        message += `\*Status\*\nDeclined\n`;
+
+        break;
+      case Notification.MEDIA_AVAILABLE:
+        message += `\*Now available\\!\*\n`;
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `\*Requested By\*\n${user}\n\n`;
+        message += `\*Status\*\nAvailable\n`;
+
+        break;
+      case Notification.TEST_NOTIFICATION:
+        message += `\*Test Notification\*\n`;
+        message += `${title}\n\n`;
+        message += `${plot}\n\n`;
+        message += `\*Requested By\*\n${user}\n`;
+
+        break;
+    }
+
+    if (settings.main.applicationUrl && payload.media) {
+      const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
+      message += `\[Open in Overseerr\]\(${actionUrl}\)`;
+    }
+    /* eslint-enable */
+
+    return message;
+  }
+
+  public async send(
+    type: Notification,
+    payload: NotificationPayload
+  ): Promise<boolean> {
+    logger.debug('Sending telegram notification', { label: 'Notifications' });
+    try {
+      const endpoint = `${this.baseUrl}bot${
+        this.getSettings().options.botAPI
+      }/sendMessage`;
+
+      await axios.post(endpoint, {
+        text: this.buildMessage(type, payload),
+        parse_mode: 'MarkdownV2',
+        chat_id: `${this.getSettings().options.chatId}`,
+      } as TelegramPayload);
+
+      return true;
+    } catch (e) {
+      logger.error('Error sending Telegram notification', {
+        label: 'Notifications',
+        message: e.message,
+      });
+      return false;
+    }
+  }
+}
+
+export default TelegramAgent;
--- a/server/lib/notifications/agents/webhook.ts
+++ b/server/lib/notifications/agents/webhook.ts
@@ -0,0 +1,139 @@
+import axios from 'axios';
+import { get } from 'lodash';
+import { hasNotificationType, Notification } from '..';
+import { MediaStatus } from '../../../constants/media';
+import logger from '../../../logger';
+import { getSettings, NotificationAgentWebhook } from '../../settings';
+import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
+
+type KeyMapFunction = (
+  payload: NotificationPayload,
+  type: Notification
+) => string;
+
+const KeyMap: Record<string, string | KeyMapFunction> = {
+  notification_type: (_payload, type) => Notification[type],
+  subject: 'subject',
+  message: 'message',
+  image: 'image',
+  notifyuser_username: 'notifyUser.username',
+  notifyuser_email: 'notifyUser.email',
+  notifyuser_avatar: 'notifyUser.avatar',
+  media_tmdbid: 'media.tmdbId',
+  media_imdbid: 'media.imdbId',
+  media_tvdbid: 'media.tvdbId',
+  media_type: 'media.mediaType',
+  media_status: (payload) =>
+    payload.media?.status ? MediaStatus[payload.media?.status] : '',
+  media_status4k: (payload) =>
+    payload.media?.status ? MediaStatus[payload.media?.status4k] : '',
+};
+
+class WebhookAgent
+  extends BaseAgent<NotificationAgentWebhook>
+  implements NotificationAgent {
+  protected getSettings(): NotificationAgentWebhook {
+    if (this.settings) {
+      return this.settings;
+    }
+
+    const settings = getSettings();
+
+    return settings.notifications.agents.webhook;
+  }
+
+  private parseKeys(
+    finalPayload: Record<string, unknown>,
+    payload: NotificationPayload,
+    type: Notification
+  ): Record<string, unknown> {
+    Object.keys(finalPayload).forEach((key) => {
+      if (key === '{{extra}}') {
+        finalPayload.extra = payload.extra ?? [];
+        delete finalPayload[key];
+        key = 'extra';
+      } else if (key === '{{media}}') {
+        if (payload.media) {
+          finalPayload.media = finalPayload[key];
+        } else {
+          finalPayload.media = null;
+        }
+        delete finalPayload[key];
+        key = 'media';
+      }
+
+      if (typeof finalPayload[key] === 'string') {
+        Object.keys(KeyMap).forEach((keymapKey) => {
+          const keymapValue = KeyMap[keymapKey as keyof typeof KeyMap];
+          finalPayload[key] = (finalPayload[key] as string).replace(
+            `{{${keymapKey}}}`,
+            typeof keymapValue === 'function'
+              ? keymapValue(payload, type)
+              : get(payload, keymapValue) ?? ''
+          );
+        });
+      } else if (finalPayload[key] && typeof finalPayload[key] === 'object') {
+        finalPayload[key] = this.parseKeys(
+          finalPayload[key] as Record<string, unknown>,
+          payload,
+          type
+        );
+      }
+    });
+
+    return finalPayload;
+  }
+
+  private buildPayload(type: Notification, payload: NotificationPayload) {
+    const payloadString = Buffer.from(
+      this.getSettings().options.jsonPayload,
+      'base64'
+    ).toString('ascii');
+
+    const parsedJSON = JSON.parse(JSON.parse(payloadString));
+
+    return this.parseKeys(parsedJSON, payload, type);
+  }
+
+  public shouldSend(type: Notification): boolean {
+    if (
+      this.getSettings().enabled &&
+      this.getSettings().options.webhookUrl &&
+      hasNotificationType(type, this.getSettings().types)
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public async send(
+    type: Notification,
+    payload: NotificationPayload
+  ): Promise<boolean> {
+    logger.debug('Sending webhook notification', { label: 'Notifications' });
+    try {
+      const { webhookUrl, authHeader } = this.getSettings().options;
+
+      if (!webhookUrl) {
+        return false;
+      }
+
+      await axios.post(webhookUrl, this.buildPayload(type, payload), {
+        headers: {
+          Authorization: authHeader,
+        },
+      });
+
+      return true;
+    } catch (e) {
+      logger.error('Error sending Webhook notification', {
+        label: 'Notifications',
+        errorMessage: e.message,
+      });
+      return false;
+    }
+  }
+}
+
+export default WebhookAgent;
--- a/server/lib/notifications/index.ts
+++ b/server/lib/notifications/index.ts
@@ -7,8 +7,30 @@ export enum Notification {
  MEDIA_AVAILABLE = 8,
  MEDIA_FAILED = 16,
  TEST_NOTIFICATION = 32,
+  MEDIA_DECLINED = 64,
 }

+export const hasNotificationType = (
+  types: Notification | Notification[],
+  value: number
+): boolean => {
+  let total = 0;
+
+  // If we are not checking any notifications, bail out and return true
+  if (types === 0) {
+    return true;
+  }
+
+  if (Array.isArray(types)) {
+    // Combine all notification values into one
+    total = types.reduce((a, v) => a + v, 0);
+  } else {
+    total = types;
+  }
+
+  return !!(value & total);
+};
+
 class NotificationManager {
  private activeAgents: NotificationAgent[] = [];

--- a/server/lib/permissions.ts
+++ b/server/lib/permissions.ts
@@ -9,6 +9,10 @@ export enum Permission {
  AUTO_APPROVE = 128,
  AUTO_APPROVE_MOVIE = 256,
  AUTO_APPROVE_TV = 512,
+  REQUEST_4K = 1024,
+  REQUEST_4K_MOVIE = 2048,
+  REQUEST_4K_TV = 4096,
+  REQUEST_ADVANCED = 8192,
 }

 /**
--- a/server/lib/settings.ts
+++ b/server/lib/settings.ts
@@ -55,6 +55,11 @@ interface PublicSettings {
  initialized: boolean;
 }

+interface FullPublicSettings extends PublicSettings {
+  movie4kEnabled: boolean;
+  series4kEnabled: boolean;
+}
+
 export interface NotificationAgentConfig {
  enabled: boolean;
  types: number;
@@ -81,6 +86,31 @@ export interface NotificationAgentEmail extends NotificationAgentConfig {
    authUser?: string;
    authPass?: string;
    allowSelfSigned: boolean;
+    senderName: string;
+  };
+}
+
+export interface NotificationAgentTelegram extends NotificationAgentConfig {
+  options: {
+    botAPI: string;
+    chatId: string;
+  };
+}
+
+export interface NotificationAgentPushover extends NotificationAgentConfig {
+  options: {
+    accessToken: string;
+    userToken: string;
+    priority: number;
+    sound: string;
+  };
+}
+
+export interface NotificationAgentWebhook extends NotificationAgentConfig {
+  options: {
+    webhookUrl: string;
+    jsonPayload: string;
+    authHeader: string;
  };
 }

@@ -88,6 +118,9 @@ interface NotificationAgents {
  email: NotificationAgentEmail;
  discord: NotificationAgentDiscord;
  slack: NotificationAgentSlack;
+  telegram: NotificationAgentTelegram;
+  pushover: NotificationAgentPushover;
+  webhook: NotificationAgentWebhook;
 }

 interface NotificationSettings {
@@ -104,7 +137,9 @@ interface AllSettings {
  notifications: NotificationSettings;
 }

-const SETTINGS_PATH = path.join(__dirname, '../../config/settings.json');
+const SETTINGS_PATH = process.env.CONFIG_DIRECTORY
+  ? `${process.env.CONFIG_DIRECTORY}/settings.json`
+  : path.join(__dirname, '../../config/settings.json');

 class Settings {
  private data: AllSettings;
@@ -140,6 +175,7 @@ class Settings {
              smtpPort: 587,
              secure: false,
              allowSelfSigned: false,
+              senderName: 'Overseerr',
            },
          },
          discord: {
@@ -156,6 +192,34 @@ class Settings {
              webhookUrl: '',
            },
          },
+          telegram: {
+            enabled: false,
+            types: 0,
+            options: {
+              botAPI: '',
+              chatId: '',
+            },
+          },
+          pushover: {
+            enabled: false,
+            types: 0,
+            options: {
+              accessToken: '',
+              userToken: '',
+              priority: 0,
+              sound: '',
+            },
+          },
+          webhook: {
+            enabled: false,
+            types: 0,
+            options: {
+              webhookUrl: '',
+              authHeader: '',
+              jsonPayload:
+                'IntcbiAgICBcIm5vdGlmaWNhdGlvbl90eXBlXCI6IFwie3tub3RpZmljYXRpb25fdHlwZX19XCIsXG4gICAgXCJzdWJqZWN0XCI6IFwie3tzdWJqZWN0fX1cIixcbiAgICBcIm1lc3NhZ2VcIjogXCJ7e21lc3NhZ2V9fVwiLFxuICAgIFwiaW1hZ2VcIjogXCJ7e2ltYWdlfX1cIixcbiAgICBcImVtYWlsXCI6IFwie3tub3RpZnl1c2VyX2VtYWlsfX1cIixcbiAgICBcInVzZXJuYW1lXCI6IFwie3tub3RpZnl1c2VyX3VzZXJuYW1lfX1cIixcbiAgICBcImF2YXRhclwiOiBcInt7bm90aWZ5dXNlcl9hdmF0YXJ9fVwiLFxuICAgIFwie3ttZWRpYX19XCI6IHtcbiAgICAgICAgXCJtZWRpYV90eXBlXCI6IFwie3ttZWRpYV90eXBlfX1cIixcbiAgICAgICAgXCJ0bWRiSWRcIjogXCJ7e21lZGlhX3RtZGJpZH19XCIsXG4gICAgICAgIFwiaW1kYklkXCI6IFwie3ttZWRpYV9pbWRiaWR9fVwiLFxuICAgICAgICBcInR2ZGJJZFwiOiBcInt7bWVkaWFfdHZkYmlkfX1cIixcbiAgICAgICAgXCJzdGF0dXNcIjogXCJ7e21lZGlhX3N0YXR1c319XCIsXG4gICAgICAgIFwic3RhdHVzNGtcIjogXCJ7e21lZGlhX3N0YXR1czRrfX1cIlxuICAgIH0sXG4gICAgXCJ7e2V4dHJhfX1cIjogW11cbn0i',
+            },
+          },
        },
      },
    };
@@ -208,6 +272,18 @@ class Settings {
    this.data.public = data;
  }

+  get fullPublicSettings(): FullPublicSettings {
+    return {
+      ...this.data.public,
+      movie4kEnabled: this.data.radarr.some(
+        (radarr) => radarr.is4k && radarr.isDefault
+      ),
+      series4kEnabled: this.data.sonarr.some(
+        (sonarr) => sonarr.is4k && sonarr.isDefault
+      ),
+    };
+  }
+
  get notifications(): NotificationSettings {
    return this.data.notifications;
  }
--- a/server/logger.ts
+++ b/server/logger.ts
@@ -42,7 +42,9 @@ const logger = winston.createLogger({
      ),
    }),
    new winston.transports.DailyRotateFile({
-      filename: path.join(__dirname, '../config/logs/overseerr-%DATE%.log'),
+      filename: process.env.CONFIG_DIRECTORY
+        ? `${process.env.CONFIG_DIRECTORY}/logs/overseerr-%DATE%.log`
+        : path.join(__dirname, '../config/logs/overseerr-%DATE%.log'),
      datePattern: 'YYYY-MM-DD',
      zippedArchive: true,
      maxSize: '20m',
--- a/server/migration/1609236552057-RemoveTmdbIdUniqueConstraint.ts
+++ b/server/migration/1609236552057-RemoveTmdbIdUniqueConstraint.ts
@@ -0,0 +1,52 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveTmdbIdUniqueConstraint1609236552057
+  implements MigrationInterface {
+  name = 'RemoveTmdbIdUniqueConstraint1609236552057';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange" FROM "media"`
+    );
+    await queryRunner.query(`DROP TABLE "media"`);
+    await queryRunner.query(`ALTER TABLE "temporary_media" RENAME TO "media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`ALTER TABLE "media" RENAME TO "temporary_media"`);
+    await queryRunner.query(
+      `CREATE TABLE "media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"), CONSTRAINT "UQ_7157aad07c73f6a6ae3bbd5ef5e" UNIQUE ("tmdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange" FROM "temporary_media"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+  }
+}
--- a/server/migration/1610070934506-LocalUsers.ts
+++ b/server/migration/1610070934506-LocalUsers.ts
@@ -0,0 +1,43 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class LocalUsers1610070934506 implements MigrationInterface {
+  name = 'LocalUsers1610070934506';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar NOT NULL, "plexId" integer NOT NULL, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt" FROM "user"`
+    );
+    await queryRunner.query(`DROP TABLE "user"`);
+    await queryRunner.query(`ALTER TABLE "temporary_user" RENAME TO "user"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar NOT NULL, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType" FROM "user"`
+    );
+    await queryRunner.query(`DROP TABLE "user"`);
+    await queryRunner.query(`ALTER TABLE "temporary_user" RENAME TO "user"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "user" RENAME TO "temporary_user"`);
+    await queryRunner.query(
+      `CREATE TABLE "user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar NOT NULL, "plexId" integer NOT NULL, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType" FROM "temporary_user"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user"`);
+    await queryRunner.query(`ALTER TABLE "user" RENAME TO "temporary_user"`);
+    await queryRunner.query(
+      `CREATE TABLE "user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar NOT NULL, "plexId" integer NOT NULL, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt" FROM "temporary_user"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user"`);
+  }
+}
--- a/server/migration/1610370640747-Add4kStatusFields.ts
+++ b/server/migration/1610370640747-Add4kStatusFields.ts
@@ -0,0 +1,91 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class Add4kStatusFields1610370640747 implements MigrationInterface {
+  name = 'Add4kStatusFields1610370640747';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_season" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "seasonNumber" integer NOT NULL, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "mediaId" integer, "status4k" integer NOT NULL DEFAULT (1), CONSTRAINT "FK_087099b39600be695591da9a49c" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_season"("id", "seasonNumber", "status", "createdAt", "updatedAt", "mediaId") SELECT "id", "seasonNumber", "status", "createdAt", "updatedAt", "mediaId" FROM "season"`
+    );
+    await queryRunner.query(`DROP TABLE "season"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_season" RENAME TO "season"`
+    );
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "status4k" integer NOT NULL DEFAULT (1), CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange" FROM "media"`
+    );
+    await queryRunner.query(`DROP TABLE "media"`);
+    await queryRunner.query(`ALTER TABLE "temporary_media" RENAME TO "media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(
+      `CREATE TABLE "temporary_media_request" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "status" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "type" varchar NOT NULL, "mediaId" integer, "requestedById" integer, "modifiedById" integer, "is4k" boolean NOT NULL DEFAULT (0), "serverId" integer, "profileId" integer, "rootFolder" varchar, CONSTRAINT "FK_f4fc4efa14c3ba2b29c4525fa15" FOREIGN KEY ("modifiedById") REFERENCES "user" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_6997bee94720f1ecb7f31137095" FOREIGN KEY ("requestedById") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_media_request"("id", "status", "createdAt", "updatedAt", "type", "mediaId", "requestedById", "modifiedById") SELECT "id", "status", "createdAt", "updatedAt", "type", "mediaId", "requestedById", "modifiedById" FROM "media_request"`
+    );
+    await queryRunner.query(`DROP TABLE "media_request"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_media_request" RENAME TO "media_request"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "media_request" RENAME TO "temporary_media_request"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "media_request" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "status" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "type" varchar NOT NULL, "mediaId" integer, "requestedById" integer, "modifiedById" integer, CONSTRAINT "FK_f4fc4efa14c3ba2b29c4525fa15" FOREIGN KEY ("modifiedById") REFERENCES "user" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_6997bee94720f1ecb7f31137095" FOREIGN KEY ("requestedById") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "media_request"("id", "status", "createdAt", "updatedAt", "type", "mediaId", "requestedById", "modifiedById") SELECT "id", "status", "createdAt", "updatedAt", "type", "mediaId", "requestedById", "modifiedById" FROM "temporary_media_request"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_media_request"`);
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(`ALTER TABLE "media" RENAME TO "temporary_media"`);
+    await queryRunner.query(
+      `CREATE TABLE "media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange" FROM "temporary_media"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" RENAME TO "temporary_season"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "season" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "seasonNumber" integer NOT NULL, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "mediaId" integer, CONSTRAINT "FK_087099b39600be695591da9a49c" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "season"("id", "seasonNumber", "status", "createdAt", "updatedAt", "mediaId") SELECT "id", "seasonNumber", "status", "createdAt", "updatedAt", "mediaId" FROM "temporary_season"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_season"`);
+  }
+}
--- a/server/migration/1610522845513-AddMediaAddedFieldToMedia.ts
+++ b/server/migration/1610522845513-AddMediaAddedFieldToMedia.ts
@@ -0,0 +1,52 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddMediaAddedFieldToMedia1610522845513
+  implements MigrationInterface {
+  name = 'AddMediaAddedFieldToMedia1610522845513';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "status4k" integer NOT NULL DEFAULT (1), "mediaAddedAt" datetime, CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange", "status4k") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange", "status4k" FROM "media"`
+    );
+    await queryRunner.query(`DROP TABLE "media"`);
+    await queryRunner.query(`ALTER TABLE "temporary_media" RENAME TO "media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`ALTER TABLE "media" RENAME TO "temporary_media"`);
+    await queryRunner.query(
+      `CREATE TABLE "media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "status4k" integer NOT NULL DEFAULT (1), CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange", "status4k") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "createdAt", "updatedAt", "lastSeasonChange", "status4k" FROM "temporary_media"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+  }
+}
--- a/server/models/Collection.ts
+++ b/server/models/Collection.ts
@@ -1,4 +1,5 @@
 import { TmdbCollection } from '../api/themoviedb';
+import { MediaType } from '../constants/media';
 import Media from '../entity/Media';
 import { mapMovieResult, MovieResult } from './Search';

@@ -23,7 +24,9 @@ export const mapCollection = (
  parts: collection.parts.map((part) =>
    mapMovieResult(
      part,
-      media?.find((req) => req.tmdbId === part.id)
+      media?.find(
+        (req) => req.tmdbId === part.id && req.mediaType === MediaType.MOVIE
+      )
    )
  ),
 });
--- a/server/models/Search.ts
+++ b/server/models/Search.ts
@@ -3,6 +3,7 @@ import type {
  TmdbPersonResult,
  TmdbTvResult,
 } from '../api/themoviedb';
+import { MediaType as MainMediaType } from '../constants/media';
 import Media from '../entity/Media';

 export type MediaType = 'tv' | 'movie' | 'person';
@@ -122,12 +123,18 @@ export const mapSearchResults = (
      case 'movie':
        return mapMovieResult(
          result,
-          media?.find((req) => req.tmdbId === result.id)
+          media?.find(
+            (req) =>
+              req.tmdbId === result.id && req.mediaType === MainMediaType.MOVIE
+          )
        );
      case 'tv':
        return mapTvResult(
          result,
-          media?.find((req) => req.tmdbId === result.id)
+          media?.find(
+            (req) =>
+              req.tmdbId === result.id && req.mediaType === MainMediaType.TV
+          )
        );
      default:
        return mapPersonResult(result);
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -6,6 +6,7 @@ import { isAuthenticated } from '../middleware/auth';
 import { Permission } from '../lib/permissions';
 import logger from '../logger';
 import { getSettings } from '../lib/settings';
+import { UserType } from '../constants/user';

 const authRoutes = Router();

@@ -67,6 +68,7 @@ authRoutes.post('/login', async (req, res, next) => {
          plexToken: account.authToken,
          permissions: Permission.ADMIN,
          avatar: account.thumb,
+          userType: UserType.PLEX,
        });
        await userRepository.save(user);
      }
@@ -89,6 +91,7 @@ authRoutes.post('/login', async (req, res, next) => {
            plexToken: account.authToken,
            permissions: settings.main.defaultPermissions,
            avatar: account.thumb,
+            userType: UserType.PLEX,
          });
          await userRepository.save(user);
        } else {
@@ -126,6 +129,53 @@ authRoutes.post('/login', async (req, res, next) => {
  }
 });

+authRoutes.post('/local', async (req, res, next) => {
+  const userRepository = getRepository(User);
+  const body = req.body as { email?: string; password?: string };
+
+  if (!body.email || !body.password) {
+    return res
+      .status(500)
+      .json({ error: 'You must provide an email and a password' });
+  }
+  try {
+    const user = await userRepository.findOne({
+      select: ['id', 'password'],
+      where: { email: body.email, userType: UserType.LOCAL },
+    });
+
+    const isCorrectCredentials = await user?.passwordMatch(body.password);
+
+    // User doesn't exist or credentials are incorrect
+    if (!isCorrectCredentials) {
+      logger.info('Failed login attempt from user with incorrect credentials', {
+        label: 'Auth',
+        account: {
+          email: body.email,
+          password: '__REDACTED__',
+        },
+      });
+      return next({
+        status: 403,
+        message: 'You do not have access to this Plex server',
+      });
+    }
+
+    // Set logged in session
+    if (user && req.session) {
+      req.session.userId = user.id;
+    }
+
+    return res.status(200).json(user?.filter() ?? {});
+  } catch (e) {
+    logger.error(e.message, { label: 'Auth' });
+    return next({
+      status: 500,
+      message: 'Something went wrong.',
+    });
+  }
+});
+
 authRoutes.get('/logout', (req, res, next) => {
  req.session?.destroy((err) => {
    if (err) {
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -26,7 +26,9 @@ discoverRoutes.get('/movies', async (req, res) => {
    results: data.results.map((result) =>
      mapMovieResult(
        result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+        )
      )
    ),
  });
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -13,15 +13,25 @@ import tvRoutes from './tv';
 import mediaRoutes from './media';
 import personRoutes from './person';
 import collectionRoutes from './collection';
+import { getAppVersion, getCommitTag } from '../utils/appVersion';
+import serviceRoutes from './service';

 const router = Router();

 router.use(checkUser);
+
+router.get('/status', (req, res) => {
+  return res.status(200).json({
+    version: getAppVersion(),
+    commitTag: getCommitTag(),
+  });
+});
+
 router.use('/user', isAuthenticated(Permission.MANAGE_USERS), user);
 router.get('/settings/public', (_req, res) => {
  const settings = getSettings();

-  return res.status(200).json(settings.public);
+  return res.status(200).json(settings.fullPublicSettings);
 });
 router.use(
  '/settings',
@@ -36,6 +46,7 @@ router.use('/tv', isAuthenticated(), tvRoutes);
 router.use('/media', isAuthenticated(), mediaRoutes);
 router.use('/person', isAuthenticated(), personRoutes);
 router.use('/collection', isAuthenticated(), collectionRoutes);
+router.use('/service', isAuthenticated(), serviceRoutes);
 router.use('/auth', authRoutes);

 router.get('/', (_req, res) => {
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -47,6 +47,10 @@ mediaRoutes.get('/', async (req, res, next) => {
        updatedAt: 'DESC',
      };
      break;
+    case 'mediaAdded':
+      sortFilter = {
+        mediaAddedAt: 'DESC',
+      };
  }

  try {
--- a/server/routes/movie.ts
+++ b/server/routes/movie.ts
@@ -5,6 +5,7 @@ import { mapMovieResult } from '../models/Search';
 import Media from '../entity/Media';
 import RottenTomatoes from '../api/rottentomatoes';
 import logger from '../logger';
+import { MediaType } from '../constants/media';

 const movieRoutes = Router();

@@ -17,7 +18,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
      language: req.query.language as string,
    });

-    const media = await Media.getMedia(tmdbMovie.id);
+    const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);

    return res.status(200).json(mapMovieDetails(tmdbMovie, media));
  } catch (e) {
@@ -49,7 +50,9 @@ movieRoutes.get('/:id/recommendations', async (req, res) => {
    results: results.results.map((result) =>
      mapMovieResult(
        result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+        )
      )
    ),
  });
@@ -75,7 +78,9 @@ movieRoutes.get('/:id/similar', async (req, res) => {
    results: results.results.map((result) =>
      mapMovieResult(
        result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+        )
      )
    ),
  });
--- a/server/routes/person.ts
+++ b/server/routes/person.ts
@@ -45,13 +45,19 @@ personRoutes.get('/:id/combined_credits', async (req, res) => {
    cast: combinedCredits.cast.map((result) =>
      mapCastCredits(
        result,
-        castMedia.find((med) => med.tmdbId === result.id)
+        castMedia.find(
+          (med) =>
+            med.tmdbId === result.id && med.mediaType === result.media_type
+        )
      )
    ),
    crew: combinedCredits.crew.map((result) =>
      mapCrewCredits(
        result,
-        crewMedia.find((med) => med.tmdbId === result.id)
+        crewMedia.find(
+          (med) =>
+            med.tmdbId === result.id && med.mediaType === result.media_type
+        )
      )
    ),
    id: combinedCredits.id,
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -102,7 +102,7 @@ requestRoutes.post(
          : await tmdb.getTvShow({ tvId: req.body.mediaId });

      let media = await mediaRepository.findOne({
-        where: { tmdbId: req.body.mediaId },
+        where: { tmdbId: req.body.mediaId, mediaType: req.body.mediaType },
        relations: ['requests'],
      });

@@ -110,15 +110,21 @@ requestRoutes.post(
        media = new Media({
          tmdbId: tmdbMedia.id,
          tvdbId: tmdbMedia.external_ids.tvdb_id,
-          status: MediaStatus.PENDING,
+          status: !req.body.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN,
+          status4k: req.body.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN,
          mediaType: req.body.mediaType,
        });
        await mediaRepository.save(media);
      } else {
-        if (media.status === MediaStatus.UNKNOWN) {
+        if (media.status === MediaStatus.UNKNOWN && !req.body.is4k) {
          media.status = MediaStatus.PENDING;
          await mediaRepository.save(media);
        }
+
+        if (media.status4k === MediaStatus.UNKNOWN && req.body.is4k) {
+          media.status4k = MediaStatus.PENDING;
+          await mediaRepository.save(media);
+        }
      }

      if (req.body.mediaType === 'movie') {
@@ -137,6 +143,10 @@ requestRoutes.post(
            req.user?.hasPermission(Permission.AUTO_APPROVE_MOVIE)
              ? req.user
              : undefined,
+          is4k: req.body.is4k,
+          serverId: req.body.serverId,
+          profileId: req.body.profileId,
+          rootFolder: req.body.rootFolder,
        });

        await requestRepository.save(request);
@@ -149,13 +159,15 @@ requestRoutes.post(
        // already requested. In the case they were, we just throw out any duplicates but still approve the request.
        // (Unless there are no seasons, in which case we abort)
        if (media.requests) {
-          existingSeasons = media.requests.reduce((seasons, request) => {
-            const combinedSeasons = request.seasons.map(
-              (season) => season.seasonNumber
-            );
+          existingSeasons = media.requests
+            .filter((request) => request.is4k === req.body.is4k)
+            .reduce((seasons, request) => {
+              const combinedSeasons = request.seasons.map(
+                (season) => season.seasonNumber
+              );

-            return [...seasons, ...combinedSeasons];
-          }, [] as number[]);
+              return [...seasons, ...combinedSeasons];
+            }, [] as number[]);
        }

        const finalSeasons = requestedSeasons.filter(
@@ -164,7 +176,7 @@ requestRoutes.post(

        if (finalSeasons.length === 0) {
          return next({
-            status: 500,
+            status: 202,
            message: 'No seasons available to request',
          });
        }
@@ -186,6 +198,10 @@ requestRoutes.post(
            req.user?.hasPermission(Permission.AUTO_APPROVE_TV)
              ? req.user
              : undefined,
+          is4k: req.body.is4k,
+          serverId: req.body.serverId,
+          profileId: req.body.profileId,
+          rootFolder: req.body.rootFolder,
          seasons: finalSeasons.map(
            (sn) =>
              new SeasonRequest({
@@ -205,11 +221,31 @@ requestRoutes.post(

      next({ status: 500, message: 'Invalid media type' });
    } catch (e) {
-      next({ message: e.message, status: 500 });
+      next({ status: 500, message: e.message });
    }
  }
 );

+requestRoutes.get('/count', async (_req, res, next) => {
+  const requestRepository = getRepository(MediaRequest);
+
+  try {
+    const pendingCount = await requestRepository.count({
+      status: MediaRequestStatus.PENDING,
+    });
+    const approvedCount = await requestRepository.count({
+      status: MediaRequestStatus.APPROVED,
+    });
+
+    return res.status(200).json({
+      pending: pendingCount,
+      approved: approvedCount,
+    });
+  } catch (e) {
+    next({ status: 500, message: e.message });
+  }
+});
+
 requestRoutes.get('/:requestId', async (req, res, next) => {
  const requestRepository = getRepository(MediaRequest);

@@ -225,6 +261,102 @@ requestRoutes.get('/:requestId', async (req, res, next) => {
  }
 });

+requestRoutes.put<{ requestId: string }>(
+  '/:requestId',
+  isAuthenticated(Permission.MANAGE_REQUESTS),
+  async (req, res, next) => {
+    const requestRepository = getRepository(MediaRequest);
+    try {
+      const request = await requestRepository.findOne(
+        Number(req.params.requestId)
+      );
+
+      if (!request) {
+        return next({ status: 404, message: 'Request not found' });
+      }
+
+      if (req.body.mediaType === 'movie') {
+        request.serverId = req.body.serverId;
+        request.profileId = req.body.profileId;
+        request.rootFolder = req.body.rootFolder;
+
+        requestRepository.save(request);
+      } else if (req.body.mediaType === 'tv') {
+        const mediaRepository = getRepository(Media);
+        request.serverId = req.body.serverId;
+        request.profileId = req.body.profileId;
+        request.rootFolder = req.body.rootFolder;
+
+        const requestedSeasons = req.body.seasons as number[] | undefined;
+
+        if (!requestedSeasons || requestedSeasons.length === 0) {
+          throw new Error(
+            'Missing seasons. If you want to cancel a tv request, use the DELETE method.'
+          );
+        }
+
+        // Get existing media so we can work with all the requests
+        const media = await mediaRepository.findOneOrFail({
+          where: { tmdbId: request.media.tmdbId, mediaType: MediaType.TV },
+          relations: ['requests'],
+        });
+
+        // Get all requested seasons that are not part of this request we are editing
+        const existingSeasons = media.requests
+          .filter((r) => r.is4k === request.is4k && r.id !== request.id)
+          .reduce((seasons, r) => {
+            const combinedSeasons = r.seasons.map(
+              (season) => season.seasonNumber
+            );
+
+            return [...seasons, ...combinedSeasons];
+          }, [] as number[]);
+
+        const filteredSeasons = requestedSeasons.filter(
+          (rs) => !existingSeasons.includes(rs)
+        );
+
+        if (filteredSeasons.length === 0) {
+          return next({
+            status: 202,
+            message: 'No seasons available to request',
+          });
+        }
+
+        const newSeasons = requestedSeasons.filter(
+          (sn) => !request.seasons.map((s) => s.seasonNumber).includes(sn)
+        );
+
+        request.seasons = request.seasons.filter((rs) =>
+          filteredSeasons.includes(rs.seasonNumber)
+        );
+
+        if (newSeasons.length > 0) {
+          logger.debug('Adding new seasons to request', {
+            label: 'Media Request',
+            newSeasons,
+          });
+          request.seasons.push(
+            ...newSeasons.map(
+              (ns) =>
+                new SeasonRequest({
+                  seasonNumber: ns,
+                  status: MediaRequestStatus.PENDING,
+                })
+            )
+          );
+        }
+
+        await requestRepository.save(request);
+      }
+
+      return res.status(200).json(request);
+    } catch (e) {
+      next({ status: 500, message: e.message });
+    }
+  }
+);
+
 requestRoutes.delete('/:requestId', async (req, res, next) => {
  const requestRepository = getRepository(MediaRequest);

@@ -280,6 +412,7 @@ requestRoutes.post<{
    }
  }
 );
+
 requestRoutes.get<{
  requestId: string;
  status: 'pending' | 'approve' | 'decline';
--- a/server/routes/service.ts
+++ b/server/routes/service.ts
@@ -0,0 +1,148 @@
+import { Router } from 'express';
+import RadarrAPI from '../api/radarr';
+import SonarrAPI from '../api/sonarr';
+import {
+  ServiceCommonServer,
+  ServiceCommonServerWithDetails,
+} from '../interfaces/api/serviceInterfaces';
+import { getSettings } from '../lib/settings';
+
+const serviceRoutes = Router();
+
+serviceRoutes.get('/radarr', async (req, res) => {
+  const settings = getSettings();
+
+  const filteredRadarrServers: ServiceCommonServer[] = settings.radarr.map(
+    (radarr) => ({
+      id: radarr.id,
+      name: radarr.name,
+      is4k: radarr.is4k,
+      isDefault: radarr.isDefault,
+      activeDirectory: radarr.activeDirectory,
+      activeProfileId: radarr.activeProfileId,
+    })
+  );
+
+  return res.status(200).json(filteredRadarrServers);
+});
+
+serviceRoutes.get<{ radarrId: string }>(
+  '/radarr/:radarrId',
+  async (req, res, next) => {
+    const settings = getSettings();
+
+    const radarrSettings = settings.radarr.find(
+      (radarr) => radarr.id === Number(req.params.radarrId)
+    );
+
+    if (!radarrSettings) {
+      return next({
+        status: 404,
+        message: 'Radarr server with provided ID  does not exist.',
+      });
+    }
+
+    const radarr = new RadarrAPI({
+      apiKey: radarrSettings.apiKey,
+      url: `${radarrSettings.useSsl ? 'https' : 'http'}://${
+        radarrSettings.hostname
+      }:${radarrSettings.port}${radarrSettings.baseUrl ?? ''}/api`,
+    });
+
+    const profiles = await radarr.getProfiles();
+    const rootFolders = await radarr.getRootFolders();
+
+    return res.status(200).json({
+      server: {
+        id: radarrSettings.id,
+        name: radarrSettings.name,
+        is4k: radarrSettings.is4k,
+        isDefault: radarrSettings.isDefault,
+        activeDirectory: radarrSettings.activeDirectory,
+        activeProfileId: radarrSettings.activeProfileId,
+      },
+      profiles: profiles.map((profile) => ({
+        id: profile.id,
+        name: profile.name,
+      })),
+      rootFolders: rootFolders.map((folder) => ({
+        id: folder.id,
+        freeSpace: folder.freeSpace,
+        path: folder.path,
+        totalSpace: folder.totalSpace,
+      })),
+    } as ServiceCommonServerWithDetails);
+  }
+);
+
+serviceRoutes.get('/sonarr', async (req, res) => {
+  const settings = getSettings();
+
+  const filteredSonarrServers: ServiceCommonServer[] = settings.sonarr.map(
+    (sonarr) => ({
+      id: sonarr.id,
+      name: sonarr.name,
+      is4k: sonarr.is4k,
+      isDefault: sonarr.isDefault,
+      activeDirectory: sonarr.activeDirectory,
+      activeProfileId: sonarr.activeProfileId,
+      activeAnimeProfileId: sonarr.activeAnimeProfileId,
+      activeAnimeDirectory: sonarr.activeAnimeDirectory,
+    })
+  );
+
+  return res.status(200).json(filteredSonarrServers);
+});
+
+serviceRoutes.get<{ sonarrId: string }>(
+  '/sonarr/:sonarrId',
+  async (req, res, next) => {
+    const settings = getSettings();
+
+    const sonarrSettings = settings.sonarr.find(
+      (radarr) => radarr.id === Number(req.params.sonarrId)
+    );
+
+    if (!sonarrSettings) {
+      return next({
+        status: 404,
+        message: 'Radarr server with provided ID  does not exist.',
+      });
+    }
+
+    const sonarr = new SonarrAPI({
+      apiKey: sonarrSettings.apiKey,
+      url: `${sonarrSettings.useSsl ? 'https' : 'http'}://${
+        sonarrSettings.hostname
+      }:${sonarrSettings.port}${sonarrSettings.baseUrl ?? ''}/api`,
+    });
+
+    const profiles = await sonarr.getProfiles();
+    const rootFolders = await sonarr.getRootFolders();
+
+    return res.status(200).json({
+      server: {
+        id: sonarrSettings.id,
+        name: sonarrSettings.name,
+        is4k: sonarrSettings.is4k,
+        isDefault: sonarrSettings.isDefault,
+        activeDirectory: sonarrSettings.activeDirectory,
+        activeProfileId: sonarrSettings.activeProfileId,
+        activeAnimeProfileId: sonarrSettings.activeAnimeProfileId,
+        activeAnimeDirectory: sonarrSettings.activeAnimeDirectory,
+      },
+      profiles: profiles.map((profile) => ({
+        id: profile.id,
+        name: profile.name,
+      })),
+      rootFolders: rootFolders.map((folder) => ({
+        id: folder.id,
+        freeSpace: folder.freeSpace,
+        path: folder.path,
+        totalSpace: folder.totalSpace,
+      })),
+    } as ServiceCommonServerWithDetails);
+  }
+);
+
+export default serviceRoutes;
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -5,29 +5,28 @@ import {
  SonarrSettings,
  Library,
  MainSettings,
-} from '../lib/settings';
+} from '../../lib/settings';
 import { getRepository } from 'typeorm';
-import { User } from '../entity/User';
-import PlexAPI from '../api/plexapi';
-import { jobPlexFullSync } from '../job/plexsync';
-import SonarrAPI from '../api/sonarr';
-import RadarrAPI from '../api/radarr';
-import logger from '../logger';
-import { scheduledJobs } from '../job/schedule';
-import { Permission } from '../lib/permissions';
-import { isAuthenticated } from '../middleware/auth';
+import { User } from '../../entity/User';
+import PlexAPI from '../../api/plexapi';
+import { jobPlexFullSync } from '../../job/plexsync';
+import SonarrAPI from '../../api/sonarr';
+import RadarrAPI from '../../api/radarr';
+import logger from '../../logger';
+import { scheduledJobs } from '../../job/schedule';
+import { Permission } from '../../lib/permissions';
+import { isAuthenticated } from '../../middleware/auth';
 import { merge, omit } from 'lodash';
-import Media from '../entity/Media';
-import { MediaRequest } from '../entity/MediaRequest';
-import { getAppVersion } from '../utils/appVersion';
-import { SettingsAboutResponse } from '../interfaces/api/settingsInterfaces';
-import { Notification } from '../lib/notifications';
-import DiscordAgent from '../lib/notifications/agents/discord';
-import EmailAgent from '../lib/notifications/agents/email';
-import SlackAgent from '../lib/notifications/agents/slack';
+import Media from '../../entity/Media';
+import { MediaRequest } from '../../entity/MediaRequest';
+import { getAppVersion } from '../../utils/appVersion';
+import { SettingsAboutResponse } from '../../interfaces/api/settingsInterfaces';
+import notificationRoutes from './notifications';

 const settingsRoutes = Router();

+settingsRoutes.use('/notifications', notificationRoutes);
+
 const filteredMainSettings = (
  user: User,
  main: MainSettings
@@ -435,108 +434,6 @@ settingsRoutes.get(
  }
 );

-settingsRoutes.get('/notifications/discord', (_req, res) => {
-  const settings = getSettings();
-
-  res.status(200).json(settings.notifications.agents.discord);
-});
-
-settingsRoutes.post('/notifications/discord', (req, res) => {
-  const settings = getSettings();
-
-  settings.notifications.agents.discord = req.body;
-  settings.save();
-
-  res.status(200).json(settings.notifications.agents.discord);
-});
-
-settingsRoutes.post('/notifications/discord/test', (req, res, next) => {
-  if (!req.user) {
-    return next({
-      status: 500,
-      message: 'User information missing from request',
-    });
-  }
-
-  const discordAgent = new DiscordAgent(req.body);
-  discordAgent.send(Notification.TEST_NOTIFICATION, {
-    notifyUser: req.user,
-    subject: 'Test Notification',
-    message:
-      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
-  });
-
-  return res.status(204).send();
-});
-
-settingsRoutes.get('/notifications/slack', (_req, res) => {
-  const settings = getSettings();
-
-  res.status(200).json(settings.notifications.agents.slack);
-});
-
-settingsRoutes.post('/notifications/slack', (req, res) => {
-  const settings = getSettings();
-
-  settings.notifications.agents.slack = req.body;
-  settings.save();
-
-  res.status(200).json(settings.notifications.agents.slack);
-});
-
-settingsRoutes.post('/notifications/slack/test', (req, res, next) => {
-  if (!req.user) {
-    return next({
-      status: 500,
-      message: 'User information missing from request',
-    });
-  }
-
-  const slackAgent = new SlackAgent(req.body);
-  slackAgent.send(Notification.TEST_NOTIFICATION, {
-    notifyUser: req.user,
-    subject: 'Test Notification',
-    message:
-      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
-  });
-
-  return res.status(204).send();
-});
-
-settingsRoutes.get('/notifications/email', (_req, res) => {
-  const settings = getSettings();
-
-  res.status(200).json(settings.notifications.agents.email);
-});
-
-settingsRoutes.post('/notifications/email', (req, res) => {
-  const settings = getSettings();
-
-  settings.notifications.agents.email = req.body;
-  settings.save();
-
-  res.status(200).json(settings.notifications.agents.email);
-});
-
-settingsRoutes.post('/notifications/email/test', (req, res, next) => {
-  if (!req.user) {
-    return next({
-      status: 500,
-      message: 'User information missing from request',
-    });
-  }
-
-  const emailAgent = new EmailAgent(req.body);
-  emailAgent.send(Notification.TEST_NOTIFICATION, {
-    notifyUser: req.user,
-    subject: 'Test Notification',
-    message:
-      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
-  });
-
-  return res.status(204).send();
-});
-
 settingsRoutes.get('/about', async (req, res) => {
  const mediaRepository = getRepository(Media);
  const mediaRequestRepository = getRepository(MediaRequest);
--- a/server/routes/settings/notifications.ts
+++ b/server/routes/settings/notifications.ts
@@ -0,0 +1,265 @@
+import { Router } from 'express';
+import { getSettings } from '../../lib/settings';
+import { Notification } from '../../lib/notifications';
+import DiscordAgent from '../../lib/notifications/agents/discord';
+import EmailAgent from '../../lib/notifications/agents/email';
+import SlackAgent from '../../lib/notifications/agents/slack';
+import TelegramAgent from '../../lib/notifications/agents/telegram';
+import PushoverAgent from '../../lib/notifications/agents/pushover';
+import WebhookAgent from '../../lib/notifications/agents/webhook';
+
+const notificationRoutes = Router();
+
+notificationRoutes.get('/discord', (_req, res) => {
+  const settings = getSettings();
+
+  res.status(200).json(settings.notifications.agents.discord);
+});
+
+notificationRoutes.post('/discord', (req, res) => {
+  const settings = getSettings();
+
+  settings.notifications.agents.discord = req.body;
+  settings.save();
+
+  res.status(200).json(settings.notifications.agents.discord);
+});
+
+notificationRoutes.post('/discord/test', (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information missing from request',
+    });
+  }
+
+  const discordAgent = new DiscordAgent(req.body);
+  discordAgent.send(Notification.TEST_NOTIFICATION, {
+    notifyUser: req.user,
+    subject: 'Test Notification',
+    message:
+      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
+  });
+
+  return res.status(204).send();
+});
+
+notificationRoutes.get('/slack', (_req, res) => {
+  const settings = getSettings();
+
+  res.status(200).json(settings.notifications.agents.slack);
+});
+
+notificationRoutes.post('/slack', (req, res) => {
+  const settings = getSettings();
+
+  settings.notifications.agents.slack = req.body;
+  settings.save();
+
+  res.status(200).json(settings.notifications.agents.slack);
+});
+
+notificationRoutes.post('/slack/test', (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information missing from request',
+    });
+  }
+
+  const slackAgent = new SlackAgent(req.body);
+  slackAgent.send(Notification.TEST_NOTIFICATION, {
+    notifyUser: req.user,
+    subject: 'Test Notification',
+    message:
+      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
+  });
+
+  return res.status(204).send();
+});
+
+notificationRoutes.get('/telegram', (_req, res) => {
+  const settings = getSettings();
+
+  res.status(200).json(settings.notifications.agents.telegram);
+});
+
+notificationRoutes.post('/telegram', (req, res) => {
+  const settings = getSettings();
+
+  settings.notifications.agents.telegram = req.body;
+  settings.save();
+
+  res.status(200).json(settings.notifications.agents.telegram);
+});
+
+notificationRoutes.post('/telegram/test', (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information missing from request',
+    });
+  }
+
+  const telegramAgent = new TelegramAgent(req.body);
+  telegramAgent.send(Notification.TEST_NOTIFICATION, {
+    notifyUser: req.user,
+    subject: 'Test Notification',
+    message:
+      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
+  });
+
+  return res.status(204).send();
+});
+
+notificationRoutes.get('/pushover', (_req, res) => {
+  const settings = getSettings();
+
+  res.status(200).json(settings.notifications.agents.pushover);
+});
+
+notificationRoutes.post('/pushover', (req, res) => {
+  const settings = getSettings();
+
+  settings.notifications.agents.pushover = req.body;
+  settings.save();
+
+  res.status(200).json(settings.notifications.agents.pushover);
+});
+
+notificationRoutes.post('/pushover/test', (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information missing from request',
+    });
+  }
+
+  const pushoverAgent = new PushoverAgent(req.body);
+  pushoverAgent.send(Notification.TEST_NOTIFICATION, {
+    notifyUser: req.user,
+    subject: 'Test Notification',
+    message:
+      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
+  });
+
+  return res.status(204).send();
+});
+
+notificationRoutes.get('/email', (_req, res) => {
+  const settings = getSettings();
+
+  res.status(200).json(settings.notifications.agents.email);
+});
+
+notificationRoutes.post('/email', (req, res) => {
+  const settings = getSettings();
+
+  settings.notifications.agents.email = req.body;
+  settings.save();
+
+  res.status(200).json(settings.notifications.agents.email);
+});
+
+notificationRoutes.post('/email/test', (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information missing from request',
+    });
+  }
+
+  const emailAgent = new EmailAgent(req.body);
+  emailAgent.send(Notification.TEST_NOTIFICATION, {
+    notifyUser: req.user,
+    subject: 'Test Notification',
+    message:
+      'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
+  });
+
+  return res.status(204).send();
+});
+
+notificationRoutes.get('/webhook', (_req, res) => {
+  const settings = getSettings();
+
+  const webhookSettings = settings.notifications.agents.webhook;
+
+  const response: typeof webhookSettings = {
+    enabled: webhookSettings.enabled,
+    types: webhookSettings.types,
+    options: {
+      ...webhookSettings.options,
+      jsonPayload: JSON.parse(
+        Buffer.from(webhookSettings.options.jsonPayload, 'base64').toString(
+          'ascii'
+        )
+      ),
+    },
+  };
+
+  res.status(200).json(response);
+});
+
+notificationRoutes.post('/webhook', (req, res, next) => {
+  const settings = getSettings();
+  try {
+    JSON.parse(req.body.options.jsonPayload);
+
+    settings.notifications.agents.webhook = {
+      enabled: req.body.enabled,
+      types: req.body.types,
+      options: {
+        jsonPayload: Buffer.from(req.body.options.jsonPayload).toString(
+          'base64'
+        ),
+        webhookUrl: req.body.options.webhookUrl,
+        authHeader: req.body.options.authHeader,
+      },
+    };
+    settings.save();
+
+    res.status(200).json(settings.notifications.agents.webhook);
+  } catch (e) {
+    next({ status: 500, message: e.message });
+  }
+});
+
+notificationRoutes.post('/webhook/test', (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information missing from request',
+    });
+  }
+
+  try {
+    JSON.parse(req.body.options.jsonPayload);
+
+    const testBody = {
+      enabled: req.body.enabled,
+      types: req.body.types,
+      options: {
+        jsonPayload: Buffer.from(req.body.options.jsonPayload).toString(
+          'base64'
+        ),
+        webhookUrl: req.body.options.webhookUrl,
+        authHeader: req.body.options.authHeader,
+      },
+    };
+
+    const webhookAgent = new WebhookAgent(testBody);
+    webhookAgent.send(Notification.TEST_NOTIFICATION, {
+      notifyUser: req.user,
+      subject: 'Test Notification',
+      message:
+        'This is a test notification! Check check, 1, 2, 3. Are we coming in clear?',
+    });
+
+    return res.status(204).send();
+  } catch (e) {
+    next({ status: 500, message: e.message });
+  }
+});
+
+export default notificationRoutes;
--- a/server/routes/tv.ts
+++ b/server/routes/tv.ts
@@ -5,6 +5,7 @@ import { mapTvResult } from '../models/Search';
 import Media from '../entity/Media';
 import RottenTomatoes from '../api/rottentomatoes';
 import logger from '../logger';
+import { MediaType } from '../constants/media';

 const tvRoutes = Router();

@@ -16,7 +17,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
      language: req.query.language as string,
    });

-    const media = await Media.getMedia(tv.id);
+    const media = await Media.getMedia(tv.id, MediaType.TV);

    return res.status(200).json(mapTvDetails(tv, media));
  } catch (e) {
@@ -60,7 +61,9 @@ tvRoutes.get('/:id/recommendations', async (req, res) => {
    results: results.results.map((result) =>
      mapTvResult(
        result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.TV
+        )
      )
    ),
  });
@@ -86,7 +89,9 @@ tvRoutes.get('/:id/similar', async (req, res) => {
    results: results.results.map((result) =>
      mapTvResult(
        result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.TV
+        )
      )
    ),
  });
--- a/server/routes/user.ts
+++ b/server/routes/user.ts
@@ -6,6 +6,8 @@ import { User } from '../entity/User';
 import { hasPermission, Permission } from '../lib/permissions';
 import { getSettings } from '../lib/settings';
 import logger from '../logger';
+import gravatarUrl from 'gravatar-url';
+import { UserType } from '../constants/user';

 const router = Router();

@@ -19,13 +21,34 @@ router.get('/', async (_req, res) => {

 router.post('/', async (req, res, next) => {
  try {
+    const settings = getSettings().notifications.agents.email;
+
+    const body = req.body;
    const userRepository = getRepository(User);

+    const passedExplicitPassword = body.password && body.password.length > 0;
+    const avatar = gravatarUrl(body.email, { default: 'mm', size: 200 });
+
+    if (!passedExplicitPassword && !settings.enabled) {
+      throw new Error('Email notifications must be enabled');
+    }
+
    const user = new User({
-      email: req.body.email,
-      permissions: req.body.permissions,
+      avatar: body.avatar ?? avatar,
+      username: body.username ?? body.email,
+      email: body.email,
+      password: body.password,
+      permissions: Permission.REQUEST,
      plexToken: '',
+      userType: UserType.LOCAL,
    });
+
+    if (passedExplicitPassword) {
+      await user?.setPassword(body.password);
+    } else {
+      await user?.resetPassword();
+    }
+
    await userRepository.save(user);
    return res.status(201).json(user.filter());
  } catch (e) {
@@ -179,6 +202,7 @@ router.post('/import-from-plex', async (req, res, next) => {
            plexId: parseInt(account.id),
            plexToken: '',
            avatar: account.thumb,
+            userType: UserType.PLEX,
          });
          await userRepository.save(newUser);
          createdUsers.push(newUser);
--- a/server/subscriber/MediaSubscriber.ts
+++ b/server/subscriber/MediaSubscriber.ts
@@ -8,12 +8,16 @@ import TheMovieDb from '../api/themoviedb';
 import { MediaStatus, MediaType } from '../constants/media';
 import Media from '../entity/Media';
 import { MediaRequest } from '../entity/MediaRequest';
+import Season from '../entity/Season';
 import notificationManager, { Notification } from '../lib/notifications';

@EventSubscriber()
 export class MediaSubscriber implements EntitySubscriberInterface {
-  private async notifyAvailableMovie(entity: Media) {
-    if (entity.status === MediaStatus.AVAILABLE) {
+  private async notifyAvailableMovie(entity: Media, dbEntity?: Media) {
+    if (
+      entity.status === MediaStatus.AVAILABLE &&
+      dbEntity?.status !== MediaStatus.AVAILABLE
+    ) {
      if (entity.mediaType === MediaType.MOVIE) {
        const requestRepository = getRepository(MediaRequest);
        const relatedRequests = await requestRepository.find({
@@ -39,10 +43,13 @@ export class MediaSubscriber implements EntitySubscriberInterface {
  }

  private async notifyAvailableSeries(entity: Media, dbEntity: Media) {
+    const seasonRepository = getRepository(Season);
    const newAvailableSeasons = entity.seasons
      .filter((season) => season.status === MediaStatus.AVAILABLE)
      .map((season) => season.seasonNumber);
-    const oldAvailableSeasons = dbEntity.seasons
+    const oldSeasonIds = dbEntity.seasons.map((season) => season.id);
+    const oldSeasons = await seasonRepository.findByIds(oldSeasonIds);
+    const oldAvailableSeasons = oldSeasons
      .filter((season) => season.status === MediaStatus.AVAILABLE)
      .map((season) => season.seasonNumber);

@@ -96,11 +103,15 @@ export class MediaSubscriber implements EntitySubscriberInterface {
  }

  public beforeUpdate(event: UpdateEvent<Media>): void {
+    if (!event.entity) {
+      return;
+    }
+
    if (
      event.entity.mediaType === MediaType.MOVIE &&
      event.entity.status === MediaStatus.AVAILABLE
    ) {
-      this.notifyAvailableMovie(event.entity);
+      this.notifyAvailableMovie(event.entity, event.databaseEntity);
    }

    if (
--- a/server/templates/email/password/html.pug
+++ b/server/templates/email/password/html.pug
@@ -0,0 +1,98 @@
+doctype html
+head
+  meta(charset='utf-8')
+  meta(name='x-apple-disable-message-reformatting')
+  meta(http-equiv='x-ua-compatible' content='ie=edge')
+  meta(name='viewport' content='width=device-width, initial-scale=1')
+  meta(name='format-detection' content='telephone=no, date=no, address=no, email=no')
+  link(href='https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&amp;display=swap' rel='stylesheet' media='screen')
+  //if mso
+    xml
+      o:officedocumentsettings
+        o:pixelsperinch 96
+    style.
+      td,
+      th,
+      div,
+      p,
+      a,
+      h1,
+      h2,
+      h3,
+      h4,
+      h5,
+      h6 {
+      font-family: 'Segoe UI', sans-serif;
+      mso-line-height-rule: exactly;
+      }
+  style.
+    @media (max-width: 600px) {
+    .sm-w-full {
+    width: 100% !important;
+    }
+    }
+div(role='article' aria-roledescription='email' aria-label='' lang='en')
+  table(style="\
+  background-color: #f2f4f6;\
+  font-family: 'Nunito Sans', -apple-system, 'Segoe UI', sans-serif;\
+  width: 100%;\
+  " width='100%' bgcolor='#f2f4f6' cellpadding='0' cellspacing='0' role='presentation')
+    tr
+      td(align='center')
+        table(style='width: 100%' width='100%' cellpadding='0' cellspacing='0' role='presentation')
+          tr
+            td(align='center' style='\
+            font-size: 16px;\
+            padding-top: 25px;\
+            padding-bottom: 25px;\
+            text-align: center;\
+            ')
+              a(href=applicationUrl style='\
+              text-shadow: 0 1px 0 #ffffff;\
+              font-weight: 700;\
+              font-size: 16px;\
+              color: #a8aaaf;\
+              text-decoration: none;\
+              ')
+                | Overseerr
+          tr
+            td(style='width: 100%' width='100%')
+              table.sm-w-full(align='center' style='\
+              background-color: #ffffff;\
+              margin-left: auto;\
+              margin-right: auto;\
+              width: 570px;\
+              ' width='570' bgcolor='#ffffff' cellpadding='0' cellspacing='0' role='presentation')
+                tr
+                  td(style='padding: 45px')
+                    div(style='font-size: 16px; text-align: center; padding-bottom: 14px;')
+                      | Your new password is:
+                    div(style='font-size: 16px; text-align: center')
+                      | #{password}
+        p(style='\
+        font-size: 13px;\
+        line-height: 24px;\
+        margin-top: 6px;\
+        margin-bottom: 20px;\
+        color: #51545e;\
+        ')
+          a(href=applicationUrl style='color: #3869d4') Open Overseerr
+tr
+  td
+    table.sm-w-full(align='center' style='\
+    margin-left: auto;\
+    margin-right: auto;\
+    text-align: center;\
+    width: 570px;\
+    ' width='570' cellpadding='0' cellspacing='0' role='presentation')
+      tr
+        td(align='center' style='font-size: 16px; padding: 45px')
+          p(style='\
+          font-size: 13px;\
+          line-height: 24px;\
+          margin-top: 6px;\
+          margin-bottom: 20px;\
+          text-align: center;\
+          color: #a8aaaf;\
+          ')
+            | Overseerr.
--- a/server/templates/email/password/subject.pug
+++ b/server/templates/email/password/subject.pug
@@ -0,0 +1 @@
+= `Password reset - Overseerr`
--- a/server/utils/appVersion.ts
+++ b/server/utils/appVersion.ts
@@ -1,3 +1,20 @@
+import { existsSync } from 'fs';
+import path from 'path';
+import logger from '../logger';
+
+const COMMIT_TAG_PATH = path.join(__dirname, '../../committag.json');
+let commitTag = 'local';
+
+if (existsSync(COMMIT_TAG_PATH)) {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  commitTag = require(COMMIT_TAG_PATH).commitTag;
+  logger.info(`Commit Tag: ${commitTag}`);
+}
+
+export const getCommitTag = (): string => {
+  return commitTag;
+};
+
 export const getAppVersion = (): string => {
  // eslint-disable-next-line @typescript-eslint/no-var-requires
  const { version } = require('../../package.json');
@@ -5,7 +22,7 @@ export const getAppVersion = (): string => {
  let finalVersion = version;

  if (version === '0.1.0') {
-    finalVersion = `develop-${process.env.COMMIT_TAG ?? 'local'}`;
+    finalVersion = `develop-${getCommitTag()}`;
  }

  return finalVersion;
--- a/server/utils/asyncLock.ts
+++ b/server/utils/asyncLock.ts
@@ -0,0 +1,54 @@
+import { EventEmitter } from 'events';
+
+// whenever you need to run async code on tv show or movie that does "get existing" / "check if need to create new" / "save"
+// then you need to put all of that code in "await asyncLock.dispatch" callback based on media id
+// this will guarantee that only one part of code will run at the same for this media id to avoid code
+// trying to create two or more entries for same movie/tvshow (which would result in sqlite unique constraint failrue)
+
+class AsyncLock {
+  private locked: { [key: string]: boolean } = {};
+  private ee = new EventEmitter();
+
+  constructor() {
+    this.ee.setMaxListeners(0);
+  }
+
+  private acquire = async (key: string) => {
+    return new Promise((resolve) => {
+      if (!this.locked[key]) {
+        this.locked[key] = true;
+        return resolve(undefined);
+      }
+
+      const nextAcquire = () => {
+        if (!this.locked[key]) {
+          this.locked[key] = true;
+          this.ee.removeListener(key, nextAcquire);
+          return resolve(undefined);
+        }
+      };
+
+      this.ee.on(key, nextAcquire);
+    });
+  };
+
+  private release = (key: string): void => {
+    delete this.locked[key];
+    setImmediate(() => this.ee.emit(key));
+  };
+
+  public dispatch = async (
+    key: string | number,
+    callback: () => Promise<void>
+  ) => {
+    const skey = String(key);
+    await this.acquire(skey);
+    try {
+      await callback();
+    } finally {
+      this.release(skey);
+    }
+  };
+}
+
+export default AsyncLock;
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,93 @@
+name: overseerr
+adopt-info: overseerr
+license: MIT
+summary: Request management and media discovery tool for the Plex ecosystem.
+description: >
+  Overseerr is a free and open source software application for managing requests for your media library.
+  It integrates with your existing services such as Sonarr, Radarr and Plex!
+base: core18
+confinement: strict
+
+parts:
+  overseerr:
+    plugin: nodejs
+    nodejs-version: "12.18.4"
+    nodejs-package-manager: "yarn"
+    nodejs-yarn-version: v1.22.5
+    build-packages:
+      - git
+      - on arm64:
+        - build-essential
+        - automake
+        - python-gi
+        - python-gi-dev
+      - on armhf:
+        - libatomic1
+        - build-essential
+        - automake
+        - python-gi
+        - python-gi-dev
+    source: .
+    override-pull: |
+      snapcraftctl pull
+      # Get information to determine snap grade and version
+      BRANCH=$(git rev-parse --abbrev-ref HEAD)
+      COMMIT=$(git rev-parse HEAD)
+      COMMIT_SHORT=$(git rev-parse --short HEAD)
+      VERSION='v'$(cat package.json | grep 'version' | head -1 | sed 's/.*"\(.*\)"\,/\1/')
+      if [ "$VERSION" = "v0.1.0" ]; then
+        SNAP_VERSION=$COMMIT_SHORT
+        GRADE=devel
+      else
+        SNAP_VERSION=$VERSION
+        GRADE=stable
+      fi
+      # Write COMMIT_TAG as it is needed durring the build process
+      echo $COMMIT > commit.txt
+      # Print debug info for build version
+      echo "{\"commitShort\": \"$COMMIT_SHORT\", \
+      \"version\": \"$VERSION\", \
+      \"snapVersion\": \"$SNAP_VERSION\", \
+      \"snapGrade\": \"$GRADE\", \
+      \"branch\": \"$BRANCH\", \
+      \"commit\": \"$COMMIT\"}"
+      echo "{\"commitTag\": \"$COMMIT\"}" > committag.json
+      # Set snap version and grade
+      snapcraftctl set-version "$SNAP_VERSION"
+      snapcraftctl set-grade "$GRADE"
+    build-environment:
+      - PATH: "$SNAPCRAFT_PART_BUILD/node_modules/.bin:$SNAPCRAFT_PART_BUILD/../npm/bin:$PATH"
+    override-build: |
+      set -e
+      # Set COMMIT_TAG before the build begins
+      export COMMIT_TAG=$(cat $SNAPCRAFT_PART_BUILD/commit.txt)
+      snapcraftctl build
+      yarn build
+      # Copy files needed for staging
+      cp $SNAPCRAFT_PART_BUILD/committag.json $SNAPCRAFT_PART_INSTALL/
+      cp -R $SNAPCRAFT_PART_BUILD/.next $SNAPCRAFT_PART_INSTALL/
+      cp -R $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/
+      cp -R $SNAPCRAFT_PART_BUILD/node_modules $SNAPCRAFT_PART_INSTALL/
+      # Remove .github and gitbook as it will fail snap lint
+      rm -rf $SNAPCRAFT_PART_INSTALL/.github && rm $SNAPCRAFT_PART_INSTALL/.gitbook.yaml
+    stage:
+      [ .next, ./* ]
+    prime:
+      [ .next, ./* ]
+
+apps:
+  deamon:
+    command: /bin/sh -c "cd $SNAP && node dist/index.js"
+    daemon: simple
+    restart-condition: on-failure
+    restart-delay: 5s
+    plugs:
+      - home
+      - network
+      - network-bind
+    environment:
+      PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
+      OVERSEERR_SNAP: "True"
+      CONFIG_DIRECTORY: $SNAP_USER_COMMON
+      LOG_LEVEL: "debug"
+      NODE_ENV: "production"
--- a/src/assets/bolt.svg
+++ b/src/assets/bolt.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.3 1.046A1 1 0 0112 2v5h4a1 1 0 01.82 1.573l-7 10A1 1 0 018 18v-5H4a1 1 0 01-.82-1.573l7-10a1 1 0 011.12-.38z" clip-rule="evenodd"></path></svg>
--- a/src/assets/extlogos/pushover.svg
+++ b/src/assets/extlogos/pushover.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="57 57 602 602" version="1.1">
+  <g id="layer1" stroke="none" stroke-width="1" fill="rgb(31, 41, 55)" fill-rule="evenodd" transform="translate(58.964119, 58.887520)" opacity="0.91">
+    <ellipse style="fill: rgb(255, 255, 255); fill-rule: evenodd; stroke: rgb(255, 255, 255); stroke-width: 0;" transform="matrix(-0.674571, 0.73821, -0.73821, -0.674571, 556.833239, 241.613465)" cx="216.308" cy="152.076" rx="296.855" ry="296.855"></ellipse>
+    <path d="M 280.949 172.514 L 355.429 162.714 L 282.909 326.374 L 282.909 326.374 C 295.649 325.394 308.142 321.067 320.389 313.394 L 320.389 313.394 L 320.389 313.394 C 332.642 305.714 343.916 296.077 354.209 284.484 L 354.209 284.484 L 354.209 284.484 C 364.496 272.884 373.396 259.981 380.909 245.774 L 380.909 245.774 L 380.909 245.774 C 388.422 231.561 393.812 217.594 397.079 203.874 L 397.079 203.874 L 397.079 203.874 C 399.039 195.381 399.939 187.214 399.779 179.374 L 399.779 179.374 L 399.779 179.374 C 399.612 171.534 397.569 164.674 393.649 158.794 L 393.649 158.794 L 393.649 158.794 C 389.729 152.914 383.766 148.177 375.759 144.584 L 375.759 144.584 L 375.759 144.584 C 367.759 140.991 356.899 139.194 343.179 139.194 L 343.179 139.194 L 343.179 139.194 C 327.172 139.194 311.409 141.807 295.889 147.034 L 295.889 147.034 L 295.889 147.034 C 280.376 152.261 266.002 159.857 252.769 169.824 L 252.769 169.824 L 252.769 169.824 C 239.542 179.784 228.029 192.197 218.229 207.064 L 218.229 207.064 L 218.229 207.064 C 208.429 221.924 201.406 238.827 197.159 257.774 L 197.159 257.774 L 197.159 257.774 C 195.526 263.981 194.546 268.961 194.219 272.714 L 194.219 272.714 L 194.219 272.714 C 193.892 276.474 193.812 279.577 193.979 282.024 L 193.979 282.024 L 193.979 282.024 C 194.139 284.477 194.462 286.357 194.949 287.664 L 194.949 287.664 L 194.949 287.664 C 195.442 288.971 195.852 290.277 196.179 291.584 L 196.179 291.584 L 196.179 291.584 C 179.519 291.584 167.349 288.234 159.669 281.534 L 159.669 281.534 L 159.669 281.534 C 151.996 274.841 150.119 263.164 154.039 246.504 L 154.039 246.504 L 154.039 246.504 C 157.959 229.191 166.862 212.694 180.749 197.014 L 180.749 197.014 L 180.749 197.014 C 194.629 181.334 211.122 167.531 230.229 155.604 L 230.229 155.604 L 230.229 155.604 C 249.342 143.684 270.249 134.214 292.949 127.194 L 292.949 127.194 L 292.949 127.194 C 315.656 120.167 337.789 116.654 359.349 116.654 L 359.349 116.654 L 359.349 116.654 C 378.296 116.654 394.219 119.347 407.119 124.734 L 407.119 124.734 L 407.119 124.734 C 420.026 130.127 430.072 137.234 437.259 146.054 L 437.259 146.054 L 437.259 146.054 C 444.446 154.874 448.936 165.164 450.729 176.924 L 450.729 176.924 L 450.729 176.924 C 452.529 188.684 451.959 200.934 449.019 213.674 L 449.019 213.674 L 449.019 213.674 C 445.426 229.027 438.646 244.464 428.679 259.984 L 428.679 259.984 L 428.679 259.984 C 418.719 275.497 406.226 289.544 391.199 302.124 L 391.199 302.124 L 391.199 302.124 C 376.172 314.697 358.939 324.904 339.499 332.744 L 339.499 332.744 L 339.499 332.744 C 320.066 340.584 299.406 344.504 277.519 344.504 L 277.519 344.504 L 275.069 344.504 L 212.839 484.154 L 142.279 484.154 L 280.949 172.514 Z" transform="matrix(1, 0, 0, 1, 0, 0)" style="fill-rule: nonzero; white-space: pre;"></path>
+  </g>
+</svg>
--- a/src/assets/extlogos/telegram.svg
+++ b/src/assets/extlogos/telegram.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 24C0 37.2548 10.7452 48 24 48C37.2548 48 48 37.2548 48 24C48 10.7452 37.2548 0 24 0C10.7452 0 0 10.7452 0 24ZM19.6 35L20.0083 28.8823L20.008 28.882L31.1369 18.839C31.6253 18.4055 31.0303 18.1941 30.3819 18.5873L16.6473 27.2523L10.7147 25.4007C9.4335 25.0084 9.4243 24.128 11.0023 23.4951L34.1203 14.5809C35.1762 14.1015 36.1953 14.8345 35.7922 16.4505L31.8552 35.0031C31.5803 36.3215 30.7837 36.6368 29.68 36.0278L23.6827 31.5969L20.8 34.4C20.7909 34.4088 20.7819 34.4176 20.7729 34.4264C20.4505 34.7403 20.1837 35 19.6 35Z" fill="currentColor"/>
+</svg>
--- a/src/assets/logo.svg
+++ b/src/assets/logo.svg
@@ -1,4 +0,0 @@
-<svg width="264" viewBox="0 0 264 264" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="132" cy="132" r="123" fill="#5A67D8" stroke="#7F9CF5" stroke-width="18"/>
-<path d="M42.608 143.864C42.608 125.72 47.312 110.936 56.72 99.512C66.704 87.128 80.384 80.936 97.76 80.936C110.336 80.936 119.792 84.008 126.128 90.152C132.464 96.2 135.632 105.656 135.632 118.52C135.632 138.104 130.64 153.608 120.656 165.032C110.768 176.264 97.52 181.88 80.912 181.88C67.952 181.88 58.304 178.664 51.968 172.232C45.728 165.704 42.608 156.248 42.608 143.864ZM80.48 114.056C76.16 131.336 74 146.792 74 160.424C74 163.688 74.528 166.376 75.584 168.488C76.736 170.6 78.752 171.656 81.632 171.656C84.608 171.656 87.008 170.984 88.832 169.64C90.656 168.2 92.288 165.896 93.728 162.728C96.032 157.544 98.24 149.48 100.352 138.536C102.56 127.496 103.76 119.72 103.952 115.208C104.144 110.6 104.24 106.568 104.24 103.112C104.24 99.656 103.712 96.824 102.656 94.616C101.6 92.408 99.632 91.304 96.752 91.304C93.968 91.304 91.616 92.168 89.696 93.896C86.144 97.16 83.072 103.88 80.48 114.056ZM198.842 112.472C200.282 109.592 201.002 106.808 201.002 104.12C201.002 101.432 200.858 99.368 200.57 97.928C200.282 96.392 199.802 95.048 199.13 93.896C197.69 91.4 195.53 90.152 192.65 90.152C189.098 90.152 185.882 91.448 183.002 94.04C179.93 96.728 178.394 100.184 178.394 104.408C178.394 107.096 179.306 109.496 181.13 111.608C183.05 113.624 185.45 115.592 188.33 117.512C191.21 119.432 194.282 121.352 197.546 123.272C200.81 125.192 203.882 127.304 206.762 129.608C213.386 134.888 216.698 141.08 216.698 148.184C216.698 152.984 215.402 157.448 212.81 161.576C210.314 165.608 206.954 169.112 202.73 172.088C193.514 178.616 182.81 181.88 170.618 181.88C160.73 181.88 153.242 180.296 148.154 177.128C143.066 173.864 140.522 169.784 140.522 164.888C140.522 156.152 143.93 150.68 150.746 148.472C152.666 147.8 155.066 147.464 157.946 147.464C160.922 147.464 164.09 148.088 167.45 149.336C165.914 153.272 165.146 157.016 165.146 160.568C165.146 168.248 167.882 172.088 173.354 172.088C176.906 172.088 180.122 170.792 183.002 168.2C185.978 165.608 187.466 162.872 187.466 159.992C187.466 157.016 186.506 154.472 184.586 152.36C182.762 150.248 180.458 148.376 177.674 146.744C174.89 145.016 171.866 143.336 168.602 141.704C165.434 140.072 162.458 138.104 159.674 135.8C153.146 130.52 149.882 123.656 149.882 115.208C149.882 109.736 151.226 104.888 153.914 100.664C156.602 96.344 160.106 92.744 164.426 89.864C173.066 84.008 182.666 81.08 193.226 81.08C203.882 81.08 211.754 82.664 216.842 85.832C222.026 89 224.618 93.272 224.618 98.648C224.618 103.352 222.794 107.192 219.146 110.168C215.978 112.664 212.474 113.912 208.634 113.912C204.794 113.912 201.53 113.432 198.842 112.472Z" fill="#F7FAFC"/>
-</svg>
--- a/src/assets/useradd.svg
+++ b/src/assets/useradd.svg
@@ -0,0 +1 @@
+<svg class="w-6 h-6" fill="currentColor" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18 9v3m0 0v3m0-3h3m-3 0h-3m-2-5a4 4 0 11-8 0 4 4 0 018 0zM3 20a6 6 0 0112 0v1H3v-1z"></path></svg>
--- a/src/assets/xcircle.svg
+++ b/src/assets/xcircle.svg
@@ -0,0 +1 @@
+<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
--- a/src/components/CollectionDetails/index.tsx
+++ b/src/components/CollectionDetails/index.tsx
@@ -102,7 +102,7 @@ const CollectionDetails: React.FC<CollectionDetailsProps> = ({

  return (
    <div
-      className="px-4 pt-4 -mx-4 -mt-2 bg-center bg-cover sm:px-8 "
+      className="px-4 pt-4 -mx-4 -mt-2 bg-center bg-cover"
      style={{
        height: 493,
        backgroundImage: `linear-gradient(180deg, rgba(17, 24, 39, 0.47) 0%, rgba(17, 24, 39, 1) 100%), url(//image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath})`,
--- a/src/components/Common/Alert/index.tsx
+++ b/src/components/Common/Alert/index.tsx
@@ -58,9 +58,9 @@ const Alert: React.FC<AlertProps> = ({ title, children, type }) => {
      <div className="flex">
        <div className={`flex-shrink-0 ${design.titleColor}`}>{design.svg}</div>
        <div className="ml-3">
-          <h3 className={`text-sm font-medium ${design.titleColor}`}>
+          <div className={`text-sm font-medium ${design.titleColor}`}>
            {title}
-          </h3>
+          </div>
          <div className={`mt-2 text-sm ${design.textColor}`}>{children}</div>
        </div>
      </div>
--- a/src/components/Common/ButtonWithDropdown/index.tsx
+++ b/src/components/Common/ButtonWithDropdown/index.tsx
@@ -39,10 +39,10 @@ const ButtonWithDropdown: React.FC<ButtonWithDropdownProps> = ({
  useClickOutside(buttonRef, () => setIsOpen(false));

  return (
-    <span className="relative z-0 inline-flex rounded-md shadow-sm">
+    <span className="relative z-0 inline-flex h-full rounded-md shadow-sm">
      <button
        type="button"
-        className={`relative inline-flex items-center px-4 py-2 text-white bg-indigo-600 hover:bg-indigo-500 text-sm leading-5 font-medium hover:text-white focus:ring-indigo active:bg-indigo-700 focus:z-10 focus:outline-none focus:ring-blue transition ease-in-out duration-150 ${
+        className={`relative inline-flex h-full items-center px-4 py-2 text-white bg-indigo-600 hover:bg-indigo-500 text-sm leading-5 font-medium hover:text-white focus:ring-indigo active:bg-indigo-700 focus:z-10 focus:outline-none focus:ring-blue transition ease-in-out duration-150 ${
          children ? 'rounded-l-md' : 'rounded-md'
        } ${className}`}
        ref={buttonRef}
@@ -54,7 +54,7 @@ const ButtonWithDropdown: React.FC<ButtonWithDropdownProps> = ({
        {children && (
          <button
            type="button"
-            className="relative inline-flex items-center px-2 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out bg-indigo-700 border border-indigo-600 rounded-r-md hover:bg-indigo-500 focus:z-10 focus:outline-none active:bg-indigo-700 focus:ring-blue"
+            className="relative inline-flex items-center h-full px-2 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out bg-indigo-700 border border-indigo-600 rounded-r-md hover:bg-indigo-500 focus:z-10 focus:outline-none active:bg-indigo-700 focus:ring-blue"
            aria-label="Expand"
            onClick={() => setIsOpen((state) => !state)}
          >
--- a/src/components/Common/List/index.tsx
+++ b/src/components/Common/List/index.tsx
@@ -7,7 +7,7 @@ interface ListItemProps {

 const ListItem: React.FC<ListItemProps> = ({ title, children }) => {
  return (
-    <div className="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+    <div className="py-4 sm:grid sm:grid-cols-3 sm:gap-4">
      <dt className="text-sm font-medium text-gray-200">{title}</dt>
      <dd className="mt-1 flex text-sm text-gray-400 sm:mt-0 sm:col-span-2">
        <span className="flex-grow">{children}</span>
--- a/src/components/Common/LoadingSpinner/index.tsx
+++ b/src/components/Common/LoadingSpinner/index.tsx
@@ -1,8 +1,37 @@
 import React from 'react';

+export const SmallLoadingSpinner: React.FC = () => {
+  return (
+    <div className="inset-0 flex items-center justify-center w-full h-full text-gray-200">
+      <svg
+        className="w-10 h-10"
+        viewBox="0 0 38 38"
+        xmlns="http://www.w3.org/2000/svg"
+        stroke="currentColor"
+      >
+        <g fill="none" fillRule="evenodd">
+          <g transform="translate(1 1)" strokeWidth="2">
+            <circle strokeOpacity=".5" cx="18" cy="18" r="18" />
+            <path d="M36 18c0-9.94-8.06-18-18-18">
+              <animateTransform
+                attributeName="transform"
+                type="rotate"
+                from="0 18 18"
+                to="360 18 18"
+                dur="1s"
+                repeatCount="indefinite"
+              />
+            </path>
+          </g>
+        </g>
+      </svg>
+    </div>
+  );
+};
+
 const LoadingSpinner: React.FC = () => {
  return (
-    <div className="h-64 inset-0 flex justify-center items-center text-gray-200">
+    <div className="inset-0 flex items-center justify-center h-64 text-gray-200">
      <svg
        className="w-16 h-16"
        viewBox="0 0 38 38"
--- a/src/components/Common/Modal/index.tsx
+++ b/src/components/Common/Modal/index.tsx
@@ -66,7 +66,7 @@ const Modal: React.FC<ModalProps> = ({
  return ReactDOM.createPortal(
    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
    <div
-      className="fixed top-0 left-0 right-0 bottom-0 bg-gray-800 bg-opacity-50 w-full h-full z-50 flex justify-center items-center"
+      className="fixed top-0 bottom-0 left-0 right-0 z-50 flex items-center justify-center w-full h-full bg-gray-800 bg-opacity-50"
      onKeyDown={(e) => {
        if (e.key === 'Escape') {
          typeof onCancel === 'function' && backgroundClickable
@@ -98,7 +98,7 @@ const Modal: React.FC<ModalProps> = ({
        show={!loading}
      >
        <div
-          className="inline-block align-bottom bg-gray-700 sm:rounded-lg px-4 pt-5 pb-4 text-left overflow-auto shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-3xl w-full sm:p-6 max-h-full"
+          className="inline-block w-full max-h-full px-4 pt-5 pb-4 overflow-auto text-left align-bottom transition-all transform bg-gray-700 shadow-xl sm:rounded-lg sm:my-8 sm:align-middle sm:max-w-3xl"
          role="dialog"
          aria-modal="true"
          aria-labelledby="modal-headline"
@@ -106,7 +106,7 @@ const Modal: React.FC<ModalProps> = ({
        >
          <div className="sm:flex sm:items-center">
            {iconSvg && (
-              <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-gray-600 text-white sm:mx-0 sm:h-10 sm:w-10">
+              <div className="flex items-center justify-center flex-shrink-0 w-12 h-12 mx-auto text-white bg-gray-600 rounded-full sm:mx-0 sm:h-10 sm:w-10">
                {iconSvg}
              </div>
            )}
@@ -116,12 +116,12 @@ const Modal: React.FC<ModalProps> = ({
              }`}
            >
              {title && (
-                <h3
-                  className="text-lg leading-6 font-medium text-white"
+                <span
+                  className="text-lg font-medium leading-6 text-white"
                  id="modal-headline"
                >
                  {title}
-                </h3>
+                </span>
              )}
            </div>
          </div>
@@ -131,7 +131,7 @@ const Modal: React.FC<ModalProps> = ({
            </div>
          )}
          {(onCancel || onOk || onSecondary || onTertiary) && (
-            <div className="mt-5 sm:mt-4 flex justify-center sm:justify-start flex-row-reverse">
+            <div className="flex flex-row-reverse justify-center mt-5 sm:mt-4 sm:justify-start">
              {typeof onOk === 'function' && (
                <Button
                  buttonType={okButtonType}
@@ -166,7 +166,7 @@ const Modal: React.FC<ModalProps> = ({
                <Button
                  buttonType={cancelButtonType}
                  onClick={onCancel}
-                  className="ml-3 sm:ml-0 sm:px-4"
+                  className="ml-3 sm:ml-0"
                >
                  {cancelText
                    ? cancelText
--- a/src/components/Common/SlideOver/index.tsx
+++ b/src/components/Common/SlideOver/index.tsx
@@ -1,8 +1,8 @@
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 import React, { useState, useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import Transition from '../../Transition';
 import { useLockBodyScroll } from '../../../hooks/useLockBodyScroll';
-import useClickOutside from '../../../hooks/useClickOutside';

 interface SlideOverProps {
  show?: boolean;
@@ -21,9 +21,6 @@ const SlideOver: React.FC<SlideOverProps> = ({
  const [isMounted, setIsMounted] = useState(false);
  const slideoverRef = useRef(null);
  useLockBodyScroll(show);
-  useClickOutside(slideoverRef, () => {
-    onClose();
-  });

  useEffect(() => {
    setIsMounted(true);
@@ -44,8 +41,15 @@ const SlideOver: React.FC<SlideOverProps> = ({
      leaveFrom="opacity-100"
      leaveTo="opacity-0"
    >
+      {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
      <div
        className={`z-50 fixed inset-0 overflow-hidden bg-opacity-50 bg-gray-800`}
+        onClick={() => onClose()}
+        onKeyDown={(e) => {
+          if (e.key === 'Escape') {
+            onClose();
+          }
+        }}
      >
        <div className="absolute inset-0 overflow-hidden">
          <section className="absolute inset-y-0 right-0 flex max-w-full pl-10">
@@ -59,9 +63,14 @@ const SlideOver: React.FC<SlideOverProps> = ({
              leaveFrom="translate-x-0"
              leaveTo="translate-x-full"
            >
-              <div className="w-screen max-w-md" ref={slideoverRef}>
+              {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+              <div
+                className="w-screen max-w-md"
+                ref={slideoverRef}
+                onClick={(e) => e.stopPropagation()}
+              >
                <div className="flex flex-col h-full overflow-y-scroll bg-gray-700 shadow-xl">
-                  <header className="px-4 py-6 space-y-1 bg-indigo-600 sm:px-6">
+                  <header className="px-4 py-6 space-y-1 bg-indigo-600">
                    <div className="flex items-center justify-between space-x-3">
                      <h2 className="text-lg font-medium leading-7 text-white">
                        {title}
@@ -97,7 +106,7 @@ const SlideOver: React.FC<SlideOverProps> = ({
                      </div>
                    )}
                  </header>
-                  <div className="relative flex-1 px-4 py-6 text-white sm:px-6">
+                  <div className="relative flex-1 px-4 py-6 text-white">
                    {children}
                  </div>
                </div>
--- a/src/components/Common/Table/index.tsx
+++ b/src/components/Common/Table/index.tsx
@@ -71,8 +71,8 @@ const TD: React.FC<TDProps> = ({
 const Table: React.FC = ({ children }) => {
  return (
    <div className="flex flex-col">
-      <div className="my-2 overflow-x-auto -mx-6 sm:-mx-6 md:mx-4 lg:mx-4">
-        <div className="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
+      <div className="my-2 overflow-x-auto -mx-6 md:mx-0 lg:mx-0">
+        <div className="py-2 align-middle inline-block min-w-full">
          <div className="shadow overflow-hidden sm:rounded-lg">
            <table className="min-w-full">{children}</table>
          </div>
--- a/src/components/Discover/index.tsx
+++ b/src/components/Discover/index.tsx
@@ -1,20 +1,13 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import useSWR from 'swr';
-import type {
-  MovieResult,
-  TvResult,
-  PersonResult,
-} from '../../../server/models/Search';
-import TitleCard from '../TitleCard';
-import PersonCard from '../PersonCard';
 import TmdbTitleCard from '../TitleCard/TmdbTitleCard';
 import Slider from '../Slider';
 import Link from 'next/link';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-import { LanguageContext } from '../../context/LanguageContext';
 import type { MediaResultsResponse } from '../../../server/interfaces/api/mediaInterfaces';
 import type { RequestResultsResponse } from '../../../server/interfaces/api/requestInterfaces';
 import RequestCard from '../RequestCard';
+import MediaSlider from '../MediaSlider';

 const messages = defineMessages({
  recentrequests: 'Recent Requests',
@@ -26,50 +19,11 @@ const messages = defineMessages({
  trending: 'Trending',
 });

-interface MovieDiscoverResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: MovieResult[];
-}
-
-interface TvDiscoverResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: TvResult[];
-}
-
-interface MixedResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: (TvResult | MovieResult | PersonResult)[];
-}
-
 const Discover: React.FC = () => {
  const intl = useIntl();
-  const { locale } = useContext(LanguageContext);
-  const { data: movieData, error: movieError } = useSWR<MovieDiscoverResult>(
-    `/api/v1/discover/movies?language=${locale}`
-  );
-  const { data: tvData, error: tvError } = useSWR<TvDiscoverResult>(
-    `/api/v1/discover/tv?language=${locale}`
-  );
-
-  const {
-    data: movieUpcomingData,
-    error: movieUpcomingError,
-  } = useSWR<MovieDiscoverResult>(
-    `/api/v1/discover/movies/upcoming?language=${locale}`
-  );
-
-  const { data: trendingData, error: trendingError } = useSWR<MixedResult>(
-    `/api/v1/discover/trending?language=${locale}`
-  );

  const { data: media, error: mediaError } = useSWR<MediaResultsResponse>(
-    '/api/v1/media?filter=available&take=20&sort=modified'
+    '/api/v1/media?filter=available&take=20&sort=mediaAdded'
  );

  const {
@@ -140,202 +94,29 @@ const Discover: React.FC = () => {
        placeholder={<RequestCard.Placeholder />}
        emptyMessage={intl.formatMessage(messages.nopending)}
      />
-      <div className="mt-6 mb-4 md:flex md:items-center md:justify-between">
-        <div className="flex-1 min-w-0">
-          <Link href="/discover/movies/upcoming">
-            <a className="inline-flex items-center text-xl leading-7 text-gray-300 hover:text-white sm:text-2xl sm:leading-9 sm:truncate">
-              <span>
-                <FormattedMessage {...messages.upcoming} />
-              </span>
-              <svg
-                className="w-6 h-6 ml-2"
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth={2}
-                  d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z"
-                />
-              </svg>
-            </a>
-          </Link>
-        </div>
-      </div>
-      <Slider
+      <MediaSlider
        sliderKey="upcoming"
-        isLoading={!movieUpcomingData && !movieUpcomingError}
-        isEmpty={false}
-        items={movieUpcomingData?.results.map((title) => (
-          <TitleCard
-            key={`upcoming-movie-slider-${title.id}`}
-            id={title.id}
-            image={title.posterPath}
-            status={title.mediaInfo?.status}
-            summary={title.overview}
-            title={title.title}
-            userScore={title.voteAverage}
-            year={title.releaseDate}
-            mediaType={title.mediaType}
-          />
-        ))}
+        title={intl.formatMessage(messages.upcoming)}
+        linkUrl="/discover/movies/upcoming"
+        url="/api/v1/discover/movies/upcoming"
      />
-      <div className="mt-6 mb-4 md:flex md:items-center md:justify-between">
-        <div className="flex-1 min-w-0">
-          <Link href="/discover/trending">
-            <a className="inline-flex items-center text-xl leading-7 text-gray-300 hover:text-white sm:text-2xl sm:leading-9 sm:truncate">
-              <span>
-                <FormattedMessage {...messages.trending} />
-              </span>
-              <svg
-                className="w-6 h-6 ml-2"
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth={2}
-                  d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z"
-                />
-              </svg>
-            </a>
-          </Link>
-        </div>
-      </div>
-      <Slider
+      <MediaSlider
        sliderKey="trending"
-        isLoading={!trendingData && !trendingError}
-        isEmpty={false}
-        items={trendingData?.results.map((title) => {
-          switch (title.mediaType) {
-            case 'movie':
-              return (
-                <TitleCard
-                  id={title.id}
-                  image={title.posterPath}
-                  status={title.mediaInfo?.status}
-                  summary={title.overview}
-                  title={title.title}
-                  userScore={title.voteAverage}
-                  year={title.releaseDate}
-                  mediaType={title.mediaType}
-                />
-              );
-            case 'tv':
-              return (
-                <TitleCard
-                  id={title.id}
-                  image={title.posterPath}
-                  status={title.mediaInfo?.status}
-                  summary={title.overview}
-                  title={title.name}
-                  userScore={title.voteAverage}
-                  year={title.firstAirDate}
-                  mediaType={title.mediaType}
-                />
-              );
-            case 'person':
-              return (
-                <PersonCard
-                  personId={title.id}
-                  name={title.name}
-                  profilePath={title.profilePath}
-                />
-              );
-          }
-        })}
+        title={intl.formatMessage(messages.trending)}
+        url="/api/v1/discover/trending"
+        linkUrl="/discover/trending"
      />
-      <div className="mt-6 mb-4 md:flex md:items-center md:justify-between">
-        <div className="flex-1 min-w-0">
-          <Link href="/discover/movies">
-            <a className="inline-flex items-center text-xl leading-7 text-gray-300 hover:text-white sm:text-2xl sm:leading-9 sm:truncate">
-              <span>
-                <FormattedMessage {...messages.popularmovies} />
-              </span>
-              <svg
-                className="w-6 h-6 ml-2"
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth={2}
-                  d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z"
-                />
-              </svg>
-            </a>
-          </Link>
-        </div>
-      </div>
-      <Slider
-        sliderKey="movies"
-        isLoading={!movieData && !movieError}
-        isEmpty={false}
-        items={movieData?.results.map((title) => (
-          <TitleCard
-            key={`popular-movie-slider-${title.id}`}
-            id={title.id}
-            image={title.posterPath}
-            status={title.mediaInfo?.status}
-            summary={title.overview}
-            title={title.title}
-            userScore={title.voteAverage}
-            year={title.releaseDate}
-            mediaType={title.mediaType}
-          />
-        ))}
+      <MediaSlider
+        sliderKey="popular-movies"
+        title={intl.formatMessage(messages.popularmovies)}
+        url="/api/v1/discover/movies"
+        linkUrl="/discover/movies"
      />
-      <div className="mt-4 mb-4 md:flex md:items-center md:justify-between">
-        <div className="flex-1 min-w-0">
-          <Link href="/discover/tv">
-            <a className="inline-flex items-center text-xl leading-7 text-gray-300 hover:text-white sm:text-2xl sm:leading-9 sm:truncate">
-              <span>
-                <FormattedMessage {...messages.populartv} />
-              </span>
-              <svg
-                className="w-6 h-6 ml-2"
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth={2}
-                  d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z"
-                />
-              </svg>
-            </a>
-          </Link>
-        </div>
-      </div>
-      <Slider
-        sliderKey="tv"
-        isLoading={!tvData && !tvError}
-        isEmpty={false}
-        items={tvData?.results.map((title) => (
-          <TitleCard
-            key={`popular-tv-slider-${title.id}`}
-            id={title.id}
-            image={title.posterPath}
-            status={title.mediaInfo?.status}
-            summary={title.overview}
-            title={title.name}
-            userScore={title.voteAverage}
-            year={title.firstAirDate}
-            mediaType={title.mediaType}
-          />
-        ))}
+      <MediaSlider
+        sliderKey="popular-tv"
+        title={intl.formatMessage(messages.populartv)}
+        url="/api/v1/discover/tv"
+        linkUrl="/discover/tv"
      />
    </>
  );
--- a/src/components/JSONEditor/index.tsx
+++ b/src/components/JSONEditor/index.tsx
@@ -0,0 +1,35 @@
+import React, { HTMLAttributes } from 'react';
+import AceEditor from 'react-ace';
+import 'ace-builds/src-noconflict/mode-json';
+import 'ace-builds/src-noconflict/theme-dracula';
+
+interface JSONEditorProps extends HTMLAttributes<HTMLDivElement> {
+  name: string;
+  value: string;
+  onUpdate: (value: string) => void;
+}
+
+const JSONEditor: React.FC<JSONEditorProps> = ({
+  name,
+  value,
+  onUpdate,
+  onBlur,
+}) => {
+  return (
+    <div className="w-full overflow-hidden rounded-md">
+      <AceEditor
+        mode="json"
+        theme="dracula"
+        onChange={onUpdate}
+        name={name}
+        editorProps={{ $blockScrolling: true }}
+        value={value}
+        onBlur={onBlur}
+        height="300px"
+        width="100%"
+      />
+    </div>
+  );
+};
+
+export default JSONEditor;
--- a/src/components/Layout/LanguagePicker/index.tsx
+++ b/src/components/Layout/LanguagePicker/index.tsx
@@ -23,7 +23,7 @@ const availableLanguages: AvailableLanguageObject = {
  },
  ja: {
    code: 'ja',
-    display: '日本語',
+    display: 'Japanese',
  },
  fr: {
    code: 'fr',
@@ -65,6 +65,10 @@ const availableLanguages: AvailableLanguageObject = {
    code: 'sv',
    display: 'Swedish',
  },
+  'zh-Hant': {
+    code: 'zh-Hant',
+    display: 'Chinese (Traditional)',
+  },
 };

 const LanguagePicker: React.FC = () => {
@@ -105,20 +109,20 @@ const LanguagePicker: React.FC = () => {
        leaveTo="transform opacity-0 scale-95"
      >
        <div
-          className="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg"
+          className="absolute right-0 w-48 mt-2 origin-top-right rounded-md shadow-lg"
          ref={dropdownRef}
        >
-          <div className="py-2 px-2 rounded-md bg-gray-700 ring-1 ring-black ring-opacity-5">
+          <div className="px-2 py-2 bg-gray-700 rounded-md ring-1 ring-black ring-opacity-5">
            <div>
              <label
                htmlFor="language"
-                className="block text-sm leading-5 font-medium text-gray-300 pb-2"
+                className="block pb-2 text-sm font-medium leading-5 text-gray-300"
              >
                <FormattedMessage {...messages.changelanguage} />
              </label>
              <select
                id="language"
-                className="mt-1 form-select block w-full pl-3 pr-10 py-2 text-base leading-6 text-white bg-gray-700 border-gray-600 focus:outline-none focus:ring-indigo focus:border-blue-800 sm:text-sm sm:leading-5"
+                className="block w-full py-2 pl-3 pr-10 mt-1 text-base leading-6 text-white bg-gray-700 border-gray-600 form-select focus:outline-none focus:ring-indigo focus:border-blue-800 sm:text-sm sm:leading-5"
                onChange={(e) =>
                  setLocale && setLocale(e.target.value as AvailableLocales)
                }
--- a/src/components/Layout/SearchInput/index.tsx
+++ b/src/components/Layout/SearchInput/index.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import useSearchInput from '../../../hooks/useSearchInput';
 import { defineMessages, useIntl } from 'react-intl';
+import ClearButton from '../../../assets/xcircle.svg';

 const messages = defineMessages({
  searchPlaceholder: 'Search Movies & TV',
@@ -8,16 +9,16 @@ const messages = defineMessages({

 const SearchInput: React.FC = () => {
  const intl = useIntl();
-  const { searchValue, setSearchValue, setIsOpen } = useSearchInput();
+  const { searchValue, setSearchValue, setIsOpen, clear } = useSearchInput();
  return (
-    <div className="flex-1 flex">
-      <div className="w-full flex md:ml-0">
+    <div className="flex flex-1">
+      <div className="flex w-full md:ml-0">
        <label htmlFor="search_field" className="sr-only">
          Search
        </label>
        <div className="relative w-full text-white focus-within:text-gray-200">
          <div className="absolute inset-y-0 left-0 flex items-center pointer-events-none">
-            <svg className="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
+            <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
              <path
                fillRule="evenodd"
                clipRule="evenodd"
@@ -27,14 +28,27 @@ const SearchInput: React.FC = () => {
          </div>
          <input
            id="search_field"
-            className="block w-full h-full pl-8 pr-1 py-2 rounded-md border-transparent focus:border-transparent bg-gray-600 text-white placeholder-gray-300 focus:outline-none focus:ring-0 focus:placeholder-gray-400 sm:text-base"
+            style={{ paddingRight: searchValue.length > 0 ? '1.75rem' : '' }}
+            className="block w-full h-full py-2 pl-8 text-white placeholder-gray-300 bg-gray-600 border-transparent rounded-md focus:border-transparent focus:outline-none focus:ring-0 focus:placeholder-gray-400 sm:text-base"
            placeholder={intl.formatMessage(messages.searchPlaceholder)}
            type="search"
            value={searchValue}
            onChange={(e) => setSearchValue(e.target.value)}
            onFocus={() => setIsOpen(true)}
-            onBlur={() => setIsOpen(false)}
+            onBlur={() => {
+              if (searchValue === '') {
+                setIsOpen(false);
+              }
+            }}
          />
+          {searchValue.length > 0 && (
+            <button
+              className="absolute inset-y-0 right-0 p-1 m-auto text-gray-400 transition border-none outline-none h-7 w-7 focus:outline-none focus:border-none hover:text-white"
+              onClick={() => clear()}
+            >
+              <ClearButton />
+            </button>
+          )}
        </div>
      </div>
    </div>
--- a/src/components/Layout/Sidebar/index.tsx
+++ b/src/components/Layout/Sidebar/index.tsx
@@ -175,11 +175,9 @@ const Sidebar: React.FC<SidebarProps> = ({ open, setClosed }) => {
                  >
                    <div className="flex-shrink-0 flex items-center px-4">
                      <span className="text-xl text-gray-50">
-                        <Link href="/">
-                          <a>
-                            <img src="/logo.png" alt="Overseerr Logo" />
-                          </a>
-                        </Link>
+                        <a href="/">
+                          <img src="/logo.png" alt="Overseerr Logo" />
+                        </a>
                      </span>
                    </div>
                    <nav className="mt-5 px-2 space-y-1">
@@ -239,11 +237,9 @@ const Sidebar: React.FC<SidebarProps> = ({ open, setClosed }) => {
            <div className="flex-1 flex flex-col pt-5 pb-4 overflow-y-auto">
              <div className="flex items-center flex-shrink-0 px-4">
                <span className="text-2xl text-gray-50">
-                  <Link href="/">
-                    <a>
-                      <img src="/logo.png" alt="Overseerr Logo" />
-                    </a>
-                  </Link>
+                  <a href="/">
+                    <img src="/logo.png" alt="Overseerr Logo" />
+                  </a>
                </span>
              </div>
              <nav className="mt-5 flex-1 px-2 bg-gray-800 space-y-1">
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -18,18 +18,18 @@ const Layout: React.FC = ({ children }) => {
  const router = useRouter();

  return (
-    <div className="min-h-full h-full flex bg-gray-900">
+    <div className="flex h-full min-w-0 min-h-full bg-gray-900">
      <Sidebar open={isSidebarOpen} setClosed={() => setSidebarOpen(false)} />

-      <div className="flex flex-col w-0 flex-1 md:ml-64 relative mb-16">
-        <div className="z-10 flex-shrink-0 flex h-16 bg-gray-600 shadow fixed right-0 left-0 md:left-64">
+      <div className="relative flex flex-col flex-1 w-0 min-w-0 mb-16 md:ml-64">
+        <div className="fixed left-0 right-0 z-10 flex flex-shrink-0 h-16 bg-gray-600 shadow md:left-64">
          <button
-            className="px-4 border-r border-gray-800 text-gray-200 focus:outline-none focus:bg-gray-300 focus:text-gray-600 md:hidden"
+            className="px-4 text-gray-200 border-r border-gray-800 focus:outline-none focus:bg-gray-300 focus:text-gray-600 md:hidden"
            aria-label="Open sidebar"
            onClick={() => setSidebarOpen(true)}
          >
            <svg
-              className="h-6 w-6"
+              className="w-6 h-6"
              stroke="currentColor"
              fill="none"
              viewBox="0 0 24 24"
@@ -42,7 +42,7 @@ const Layout: React.FC = ({ children }) => {
              />
            </svg>
          </button>
-          <div className="flex-1 px-4 flex justify-between">
+          <div className="flex justify-between flex-1 px-4">
            <SearchInput />
            <div className="flex items-center md:ml-6">
              <LanguagePicker />
@@ -51,18 +51,15 @@ const Layout: React.FC = ({ children }) => {
          </div>
        </div>

-        <main
-          className="relative z-0 top-16 focus:outline-none right-0"
-          tabIndex={0}
-        >
-          <div className="pt-2 pb-6 md:py-6">
-            <div className="max-w-8xl mx-auto px-4 sm:px-6 md:px-8">
+        <main className="relative z-0 top-16 focus:outline-none" tabIndex={0}>
+          <div className="pt-2 pb-6">
+            <div className="px-4 mx-auto max-w-8xl">
              {router.pathname === '/' && hasPermission(Permission.ADMIN) && (
-                <div className="rounded-md bg-indigo-700 p-4 mt-2">
+                <div className="p-4 mt-2 bg-indigo-700 rounded-md">
                  <div className="flex">
                    <div className="flex-shrink-0">
                      <svg
-                        className="h-5 w-5 text-white"
+                        className="w-5 h-5 text-white"
                        xmlns="http://www.w3.org/2000/svg"
                        viewBox="0 0 20 20"
                        fill="currentColor"
@@ -74,14 +71,14 @@ const Layout: React.FC = ({ children }) => {
                        />
                      </svg>
                    </div>
-                    <div className="ml-3 flex-1 md:flex md:justify-between">
+                    <div className="flex-1 ml-3 md:flex md:justify-between">
                      <p className="text-sm leading-5 text-white">
                        <FormattedMessage {...messages.alphawarning} />
                      </p>
                      <p className="mt-3 text-sm leading-5 md:mt-0 md:ml-6">
                        <a
                          href="http://github.com/sct/overseerr"
-                          className="whitespace-nowrap font-medium text-indigo-100 hover:text-white transition ease-in-out duration-150"
+                          className="font-medium text-indigo-100 transition duration-150 ease-in-out whitespace-nowrap hover:text-white"
                          target="_blank"
                          rel="noreferrer"
                        >
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.3 1.046A1 1 0 0112 2v5h4a1 1 0 01.82 1.573l-7 10A1 1 0 018 18v-5H4a1 1 0 01-.82-1.573l7-10a1 1 0 011.12-.38z" clip-rule="evenodd"></path></svg>`
				`@@ -0,0 +1 @@`
				`<svg class="w-6 h-6" fill="currentColor" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18 9v3m0 0v3m0-3h3m-3 0h-3m-2-5a4 4 0 11-8 0 4 4 0 018 0zM3 20a6 6 0 0112 0v1H3v-1z"></path></svg>`
				`@@ -0,0 +1 @@`
				`<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>`