Update CNAME

* docs: update docker volume location in windows

in newer versions of docker, the location of Docker volumes has now changed. See: https://stackoverflow.com/a/64418064

* add paths for older versions of Docker

* add newlines

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

---------

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

.all-contributorsrc

@@ -403,42 +403,6 @@
       "contributions": [
         "doc"
       ]
-    },
-    {
-      "login": "mobihen",
-      "name": "Nir Israel Hen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/35529491?v=4",
-      "profile": "https://mobihen.com",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "XDark187",
-      "name": "Baraa",
-      "avatar_url": "https://avatars.githubusercontent.com/u/39034192?v=4",
-      "profile": "https://github.com/XDark187",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "franciscofsales",
-      "name": "Francisco Sales",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7977645?v=4",
-      "profile": "https://github.com/franciscofsales",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "myselfolli",
-      "name": "Oliver Laing",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37535998?v=4",
-      "profile": "https://github.com/myselfolli",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Global code ownership
-*                               @Fallenbagel @gauthier-th
+*                               @Fallenbagel

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/docs-deploy.yml

@@ -58,7 +58,6 @@ jobs:
   deploy:
     name: Deploy to GitHub Pages
     needs: build
-    concurrency: build-deploy-pages
 
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
     permissions:

.prettierignore

@@ -8,4 +8,3 @@ pnpm-lock.yaml
 # assets
 src/assets/
 public/
-docs/

.prettierrc.js

@@ -3,12 +3,6 @@ module.exports = {
   singleQuote: true,
   trailingComma: 'es5',
   overrides: [
-    {
-      files: 'pnpm-lock.yaml',
-      options: {
-        rangeEnd: 0, // default: Infinity
-      },
-    },
     {
       files: 'gen-docs/pnpm-lock.yaml',
       options: {

CNAME

@@ -0,0 +1 @@
+docs.jellyseerr.dev

CONTRIBUTING.md

@@ -7,9 +7,9 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 ### Tools Required
 
 - HTML/Typescript/Javascript editor
-- [VSCode](https://code.visualstudio.com/) is recommended. Upon opening the project, a few extensions will be automatically recommended for install.
-- [NodeJS](https://nodejs.org/en/download/) (Node 20.x)
-- [Pnpm](https://pnpm.io/cli/install)
+  - [VSCode](https://code.visualstudio.com/) is recommended. Upon opening the project, a few extensions will be automatically recommended for install.
+- [NodeJS](https://nodejs.org/en/download/) (Node 14.x or higher)
+- [Yarn](https://yarnpkg.com/)
 - [Git](https://git-scm.com/downloads)
 
 ### Getting Started
@@ -18,7 +18,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 
    ```bash
    git clone https://github.com/YOUR_USERNAME/jellyseerr.git
-   cd jellyseerr/
+   cd overseerr/
    ```
 
 2. Add the remote `upstream`:
@@ -48,8 +48,8 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 4. Run the development environment:
 
    ```bash
-   pnpm
-   pnpm dev
+   yarn
+   yarn dev
    ```
 
    - Alternatively, you can use [Docker](https://www.docker.com/) with `docker-compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
@@ -93,7 +93,7 @@ When adding new UI text, please try to adhere to the following guidelines:
 8. If an additional description or "tip" is required for a form field, it should be styled using the global CSS class `label-tip`.
 9. In full sentences, abbreviations like "info" or "auto" should not be used in place of full words, unless referencing the name/label of a specific setting or option which has an abbreviation in its name.
 10. Do your best to check for spelling errors and grammatical mistakes.
-11. Do not misspell "Jellyseerr."
+11. Do not misspell "Overseerr."
 
 ## Translation
 
@@ -103,4 +103,4 @@ We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-f
 
 ## Attribution
 
-This contribution guide was inspired by the [Next.js](https://github.com/vercel/next.js), [Radarr](https://github.com/Radarr/Radarr), and [Overseerr](https://github.com/sct/Overseerr) contribution guides.
+This contribution guide was inspired by the [Next.js](https://github.com/vercel/next.js) and [Radarr](https://github.com/Radarr/Radarr) contribution guides.

README.md

@@ -11,7 +11,7 @@
 <a href="http://jellyseerr.borgcube.de/engage/jellyseerr/"><img src="http://jellyseerr.borgcube.de/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- 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-47-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -37,7 +37,6 @@ With more features on the way! Check out our [issue tracker](https://github.com/
 ## Getting Started
 
 Check out our documentation for instructions on how to install and run Jellyseerr:
-
 https://docs.jellyseerr.dev/getting-started/
 
 ### Packages:
@@ -137,15 +136,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://mobihen.com"><img src="https://avatars.githubusercontent.com/u/35529491?v=4?s=100" width="100px;" alt="Nir Israel Hen"/><br /><sub><b>Nir Israel Hen</b></sub></a><br /><a href="#translation-mobihen" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

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

@@ -1,5 +1,5 @@
 const testUser = {
-  username: 'Test User',
+  displayName: 'Test User',
   emailAddress: 'test@seeerr.dev',
   password: 'test1234',
 };
@@ -32,7 +32,7 @@ describe('User List', () => {
 
     cy.get('[data-testid=modal-title]').should('contain', 'Create Local User');
 
-    cy.get('#username').type(testUser.username);
+    cy.get('#displayName').type(testUser.displayName);
     cy.get('#email').type(testUser.emailAddress);
     cy.get('#password').type(testUser.password);
 

docs/CNAME

@@ -0,0 +1 @@
+docs.seerr.dev

docs/extending-jellyseerr/reverse-proxy.mdx

@@ -17,7 +17,7 @@ A Nginx subfolder workaround configuration is provided below, but it is not offi
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-<Tabs groupId="nginx-reverse-proxy" queryString>
+<Tabs groupId="nginx-reverse-proxy">
     <TabItem value="subdomain" label="Subdomain">
 Add the following configuration to a new file `/etc/nginx/sites-available/jellyseerr.example.com.conf`:
 
@@ -63,9 +63,9 @@ sudo ln -s /etc/nginx/sites-available/jellyseerr.example.com.conf /etc/nginx/sit
     <TabItem value="subfolder" label="Subfolder">
 
 :::warning
-This Nginx subfolder reverse proxy is an unsupported workaround, and only provided as an example. The filters may stop working when Jellyseerr is updated.
+This Nginx subfolder reverse proxy is an unsupported workaround, and only provided as an example. The filters may stop working when Overseerr is updated.
 
-If you encounter any issues with Jellyseerr while using this workaround, we may ask you to try to reproduce the problem without the Nginx proxy.
+If you encounter any issues with Overseerr while using this workaround, we may ask you to try to reproduce the problem without the Nginx proxy.
 :::
 
 Add the following location block to your existing `nginx.conf` file.
@@ -146,9 +146,9 @@ Add a new proxy host with the following settings:
 
 ### Details
 
-- **Domain Names:** Your desired external Jellyseerr hostname; e.g., `jellyseerr.example.com`
+- **Domain Names:** Your desired external Overseerr hostname; e.g., `overseerr.example.com`
 - **Scheme:** `http`
-- **Forward Hostname / IP:** Internal Jellyseerr hostname or IP
+- **Forward Hostname / IP:** Internal Overseerr hostname or IP
 - **Forward Port:** `5055`
 - **Cache Assets:** yes
 - **Block Common Exploits:** yes
@@ -190,18 +190,18 @@ Caddy will automatically obtain and renew SSL certificates for your domain.
 
 ## Traefik (v2)
 
-Add the following labels to the Jellyseerr service in your `docker-compose.yml` file:
+Add the following labels to the Overseerr service in your `docker-compose.yml` file:
 
 ```yaml
 labels:
   - 'traefik.enable=true'
   ## HTTP Routers
-  - 'traefik.http.routers.jellyseerr-rtr.entrypoints=https'
-  - 'traefik.http.routers.jellyseerr-rtr.rule=Host(`jellyseerr.domain.com`)'
-  - 'traefik.http.routers.jellyseerr-rtr.tls=true'
+  - '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.jellyseerr-rtr.service=jellyseerr-svc'
-  - 'traefik.http.services.jellyseerr-svc.loadbalancer.server.port=5055'
+  - 'traefik.http.routers.overseerr-rtr.service=overseerr-svc'
+  - 'traefik.http.services.overseerr-svc.loadbalancer.server.port=5055'
 ```
 
 For more information, please refer to the [Traefik documentation](https://doc.traefik.io/traefik/user-guides/docker-compose/basic-example/).

docs/getting-started/aur.mdx

@@ -17,7 +17,7 @@ To install Jellyseerr from the AUR, you can use an AUR helper like `yay` or `par
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-<Tabs groupId="aur-methods" queryString>
+<Tabs groupId="aur-methods">
   <TabItem value="yay" label="yay">
     ```bash
     yay -S jellyseerr

docs/getting-started/buildfromsource.mdx

@@ -12,7 +12,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 ### Prerequisites
-<Tabs groupId="versions" queryString>
+<Tabs groupId="versions">
   <TabItem value="latest" label="Latest">
     - [Node.js 18.x](https://nodejs.org/en/download/)
     - [Yarn 1.x](https://classic.yarnpkg.com/lang/en/docs/install)
@@ -29,7 +29,7 @@ import TabItem from '@theme/TabItem';
 
 ## Unix (Linux, macOS)
 ### Installation
-<Tabs groupId="versions" queryString>
+<Tabs groupId="versions">
   <TabItem value="latest" label="latest">
 1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
 ```bash
@@ -79,13 +79,13 @@ pnpm start
 ```
   </TabItem>
 </Tabs>
-
+  
 :::info
 You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
 :::
 
 #### Extending the installation
-<Tabs groupId="unix-extensions" queryString>
+<Tabs groupId="unix-extensions">
   <TabItem value="linux" label="Linux">
 To run jellyseerr as a systemd service:
 1. create the environment file at `/etc/jellyseerr/jellyseerr.conf`:
@@ -99,9 +99,6 @@ PORT=5055
 
 ## Uncomment if your media server is emby instead of jellyfin.
 # JELLYFIN_TYPE=emby
-
-## Uncomment if you want to force Node.js to resolve IPv4 before IPv6 (advanced users only)
-# FORCE_IPV4_FIRST=true
 ```
 2. Then run the following commands:
 ```bash
@@ -234,7 +231,7 @@ pm2 status jellyseerr
 
 ## Windows
 ### Installation
-<Tabs groupId="versions" queryString>
+<Tabs groupId="versions">
   <TabItem value="latest" label="latest">
 1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
 ```powershell
@@ -248,7 +245,6 @@ git checkout main
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && yarn install --frozen-lockfile --network-timeout 1000000
 ```
 4. Build the project:
@@ -273,7 +269,6 @@ git checkout develop # by default, you are on the develop branch so this step is
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
 ```
 4. Build the project:
@@ -296,7 +291,7 @@ You can now access Jellyseerr by visiting `http://localhost:5055` in your web br
 :::
 
 #### Extending the installation
-<Tabs groupId="windows-extensions" queryString>
+<Tabs groupId="windows-extensions">
   <TabItem value="task-scheduler" label="Task Scheduler">
 To run jellyseerr as a bat script:
 1. Create a file named `start-jellyseerr.bat` in the jellyseerr directory:
@@ -317,7 +312,7 @@ node dist/index.js
 
 Now, Jellyseerr will start when the computer boots up in the background.
   </TabItem>
-
+  
   <TabItem value="nssm" label="NSSM">
 To run jellyseerr as a service:
 1. Download the [Non-Sucking Service Manager](https://nssm.cc/download)

docs/getting-started/docker.mdx

@@ -20,7 +20,7 @@ Be sure to replace `/path/to/appdata/config` in the below examples with a valid
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-<Tabs groupId="docker-methods" queryString>
+<Tabs groupId="docker-methods">
   <TabItem value="docker-cli" label="Docker CLI">
 For details on the Docker CLI, please [review the official `docker run` documentation](https://docs.docker.com/engine/reference/run/).
 
@@ -37,11 +37,6 @@ docker run -d \
   --restart unless-stopped \
   fallenbagel/jellyseerr
 ```
-:::tip
-If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
-
-`-e JELLYFIN_TYPE=emby`
-:::
 
 To run the container as a specific user/group, you may optionally add `--user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]` to the above command.
 
@@ -88,10 +83,6 @@ services:
       - /path/to/appdata/config:/app/config
     restart: unless-stopped
 ```
-:::tip
-If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
-:::
-
 Then, start all services defined in the Compose file:
 ```bash
 docker-compose up -d
@@ -106,6 +97,7 @@ Then, restart all services defined in the Compose file:
 ```bash
 docker-compose up -d
 ```
+
 :::tip
 You may alternatively use a third-party mechanism like [dockge](https://github.com/louislam/dockge) to manage your docker compose files.
 :::
@@ -141,7 +133,7 @@ or the Docker Desktop app:
 4. Enter a name for the volume (example: `jellyseerr-data`) and hit "Create"
 
 Then, create and start the Jellyseerr container:
-<Tabs groupId="docker-methods" queryString>
+<Tabs groupId="docker-methods">
   <TabItem value="docker-cli" label="Docker CLI">
 ```bash
 docker run -d --name jellyseerr -e LOG_LEVEL=debug -e TZ=Asia/Tashkent -p 5055:5055 -v "jellyseerr-data:/app/config" --restart unless-stopped fallenbagel/jellyseerr:latest
@@ -169,15 +161,32 @@ volumes:
     external: true
 ```
   </TabItem>
+
+  <TabItem value="docker-desktop" label="Docker Desktop">
+1. Open the Docker Desktop app
+2. Head to the Containers/Apps tab
+3. Click on the "Add Container/App" button near the top right
+4. Fill in the container details:
+   - **Name**: `jellyseerr`
+   - **Image**: `fallenbagel/jellyseerr:latest`
+   - **Port**: `5055:5055`
+   - **Volume**: `jellyseerr-data:/app/config`
+   - **Environment Variables**:
+     - **LOG_LEVEL**: `debug`
+     - **TZ**: `Asia/Tashkent`
+   - **Restart Policy**: `unless-stopped`
+5. Click on the "Run" button
+  </TabItem>
 </Tabs>
 
-:::tip
-If you are using a named volume, then you can safely **ignore** the warning about the `/app/config` folder being incorrectly mounted.
+To access the files inside the volume created above, navigate to the following folder using File Explorer:
 
-If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
-:::
+For Docker v26.1.4 or higher: `\\wsl$\docker-desktop\mnt\docker-desktop-disk\data\docker\volumes\jellyseerr-data\_data`
 
-To access the files inside the volume created above, navigate to `\\wsl$\docker-desktop-data\version-pack-data\community\docker\volumes\jellyseerr-data\_data` using File Explorer.
+For older versions of Docker:
+`\\wsl$\docker-desktop-data\data\docker\volumes\jellyseerr-data\_data`
+or
+`\\wsl$\docker-desktop-data\version-pack-data\community\docker\volumes\jellyseerr-data\_data`
 
 :::info
 Docker on Windows works differently than it does on Linux; it runs Docker inside of a stripped-down Linux VM. Volume mounts are exposed to Docker inside 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.

docs/using-jellyseerr/settings/general.md

@@ -18,13 +18,13 @@ If you aren't a huge fan of the name "Jellyseerr" and would like to display some
 
 ## Application URL
 
-Set this to the externally-accessible URL of your Jellyseerr instance.
+Set this to the externally-accessible URL of your Overseerr instance.
 
 You must configure this setting in order to enable password reset and generation emails.
 
 ## Enable Proxy Support
 
-If you have Jellyseerr behind a reverse proxy, enable this setting to allow Jellyseerr to correctly register client IP addresses. For details, please see the [Express Documentation](https://expressjs.com/en/guide/behind-proxies.html).
+If you have Overseerr behind a reverse proxy, enable this setting to allow Overseerr to correctly register client IP addresses. For details, please see the [Express Documentation](https://expressjs.com/en/guide/behind-proxies.html).
 
 This setting is **disabled** by default.
 
@@ -40,7 +40,7 @@ If you do not use Jellyseerr integrations with third-party applications to add/m
 
 One caveat, however, is that HTTPS is required, meaning that once this setting is enabled, you will no longer be able to access your Jellyseerr instance over _HTTP_ (including using an IP address and port number).
 
-If you enable this setting and find yourself unable to access Jellyseerr, you can disable the setting by modifying `settings.json` in `/app/config`.
+If you enable this setting and find yourself unable to access Overseerr, you can disable the setting by modifying `settings.json` in `/app/config`.
 
 This setting is **disabled** by default.
 

docs/using-jellyseerr/settings/mediaserver.mdx

@@ -9,7 +9,7 @@ sidebar_position: 3
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-<Tabs groupId="media-server-type" queryString>
+<Tabs groupId="media-server-type">
     <TabItem value="jellyfin" label="Jellyfin">
 :::info
 To set up Jellyfin, make sure you log in using an account with administrative privileges.
@@ -32,7 +32,7 @@ Jellyseerr will perform a full scan of your Jellyfin libraries once every 24 hou
 
 This section is where you configure the connection to your Jellyfin server.
 
-    <Tabs groupId="versions" queryString>
+    <Tabs groupId="versions">
         <TabItem value="latest" label="Latest">
 
 #### Internal URL
@@ -126,7 +126,7 @@ Jellyseerr will perform a full scan of your Emby libraries once every 24 hours (
 
 This section is where you configure the connection to your Emby server.
 
-        <Tabs groupId="versions" queryString>
+        <Tabs groupId="versions">
             <TabItem value="latest" label="Latest">
 
 #### Internal URL

docs/using-jellyseerr/settings/users.md

@@ -16,7 +16,7 @@ This setting is **enabled** by default.
 
 ## Enable New Jellyfin/Emby/Plex Sign-In
 
-When enabled, users with access to your media server will be able to sign in to Jellyseerr even if they have not yet been imported. Users will be automatically assigned the permissions configured in the [Default Permissions](#default-permissions) setting upon first sign-in.
+When enabled, users with access to your media server will be able to sign in to Overseerr even if they have not yet been imported. Users will be automatically assigned the permissions configured in the [Default Permissions](#default-permissions) setting upon first sign-in.
 
 This setting is **enabled** by default.
 

docs/using-jellyseerr/users/adding-users.mdx

@@ -6,14 +6,14 @@ sidebar_position: 2
 
 # Adding Users
 
-There are currently two methods to add users to Jellyseerr: importing Mediaserver users and creating "local users." All new users are created with the [default permissions](/using-jellyseerr/settings/users#default-permissions) defined in **Settings → Users**.
+There are currently two methods to add users to Overseerr: importing Plex users and creating "local users." All new users are created with the [default permissions](/using-jellyseerr/settings/users#default-permissions) defined in **Settings → Users**.
 
 ### Importing Mediaserver Users
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-<Tabs groupId="media-server-type" queryString>
+<Tabs groupId="media-server-type">
   <TabItem value="jellyfin" label="Jellyfin">
     Clicking the **Import Jellyfin Users** button on the **User List** page will fetch the list of users with access to the Jellyfin server and add them to Jellyseerr automatically.
 
@@ -25,9 +25,9 @@ To disable new Jellyfin sign-ins, navigate to **Settings &rarr; Users** and unch
 
   </TabItem>
   <TabItem value="emby" label="Emby">
-    Clicking the **Import Emby Users** button on the **User List** page will fetch the list of users with access to the Emby server and add them to Jellyseerr automatically.
+    Clicking the **Import Emby Users** button on the **User List** page will fetch the list of users with access to the Emby server and add them to Overseerr automatically.
 
-    Importing Emby users is not required, however. Any user with access to the Emby server can log in to Jellyseerr even if they have not been imported, and will be assigned the configured [default permissions](/using-jellyseerr/settings/users#default-permissions) upon their first login.
+    Importing Emby users is not required, however. Any user with access to the Emby server can log in to Overseerr even if they have not been imported, and will be assigned the configured [default permissions](/using-jellyseerr/settings/users#default-permissions) upon their first login.
 
 :::tip
 To disable new Emby sign-ins, navigate to **Settings &rarr; Users** and uncheck the [**Enable New Emby Sign-In**](/using-jellyseerr/settings/users#enable-new-jellyfinembyplex-sign-in) box.
@@ -36,9 +36,9 @@ To disable new Emby sign-ins, navigate to **Settings &rarr; Users** and uncheck
   </TabItem>
   
   <TabItem value="plex" label="Plex">
-    Clicking the **Import Plex Users** button on the **User List** page will fetch the list of users with access to the Plex server from [plex.tv](https://www.plex.tv/), and add them to Jellyseerr automatically.
+    Clicking the **Import Plex Users** button on the **User List** page will fetch the list of users with access to the Plex server from [plex.tv](https://www.plex.tv/), and add them to Overseerr automatically.
 
-    Importing Plex users is not required, however. Any user with access to the Plex server can log in to Jellyseerr even if they have not been imported, and will be assigned the configured [default permissions](/using-jellyseerr/settings/users#default-permissions) upon their first login.
+    Importing Plex users is not required, however. Any user with access to the Plex server can log in to Overseerr even if they have not been imported, and will be assigned the configured [default permissions](/using-jellyseerr/settings/users#default-permissions) upon their first login.
 
 :::tip
 To disable new Plex sign-ins, navigate to **Settings &rarr; Users** and uncheck the [**Enable New Plex Sign-In**](/using-jellyseerr/settings/users#enable-new-jellyfinembyplex-sign-in) box.
@@ -49,7 +49,7 @@ To disable new Plex sign-ins, navigate to **Settings &rarr; Users** and uncheck
 
 ### Creating Local Users
 
-If you would like to grant Jellyseerr access to a user who doesn't have their own Plex account and/or access to the Plex server, you can manually add them by clicking the **Create Local User** button.
+If you would like to grant Overseerr access to a user who doesn't have their own Plex account and/or access to the Plex server, you can manually add them by clicking the **Create Local User** button.
 
 #### Email Address
 
@@ -57,7 +57,7 @@ Enter a valid email address at which the user can receive messages pertaining to
 
 #### Automatically Generate Password
 
-If an [application URL](/using-jellyseerr/settings/general#application-url) is set and [email notifications](/using-jellyseerr/notifications/email) have been configured and enabled, Jellyseerr can automatically generate a password for the new user.
+If an [application URL](/using-jellyseerr/settings/general#application-url) is set and [email notifications](/using-jellyseerr/notifications/email) have been configured and enabled, Overseerr can automatically generate a password for the new user.
 
 #### Password
 

gen-docs/README.md

@@ -2,7 +2,7 @@
 
 Jellyseerr docs is built using [Docusaurus](https://docusaurus.io/), a modern static website generator.
 
-Jellyseerr docs will be available at [docs.jellyseerr.dev](https://docs.jellyseerr.dev).
+Jellyseerr docs will be available at [docs.jellyseerr.com](https://docs.jellyseerr.dev).
 
 ### Installation
 

gen-docs/docusaurus.config.ts

@@ -13,7 +13,6 @@ const config: Config = {
 
   organizationName: 'Fallenbagel',
   projectName: 'Jellyseerr',
-  deploymentBranch: 'gh-pages',
 
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'warn',
@@ -58,6 +57,7 @@ const config: Config = {
   ],
 
   themeConfig: {
+    image: 'img/docusaurus-social-card.jpg',
     colorMode: {
       defaultMode: 'dark',
       disableSwitch: true,

next.config.js

@@ -4,7 +4,6 @@
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
-    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
   },
   publicRuntimeConfig: {
     // Will be available on both server and client
@@ -14,6 +13,7 @@ module.exports = {
     remotePatterns: [
       { hostname: 'gravatar.com' },
       { hostname: 'image.tmdb.org' },
+      { hostname: '*', protocol: 'https' },
     ],
   },
   webpack(config) {

overseerr-api.yml

@@ -2775,15 +2775,6 @@ paths:
                           imageCount:
                             type: number
                             example: 123
-                      avatar:
-                        type: object
-                        properties:
-                          size:
-                            type: number
-                            example: 123456
-                          imageCount:
-                            type: number
-                            example: 123
                   apiCaches:
                     type: array
                     items:

package.json

@@ -43,6 +43,8 @@
     "@svgr/webpack": "6.5.1",
     "@tanem/react-nprogress": "5.0.30",
     "ace-builds": "1.15.2",
+    "axios": "1.3.4",
+    "axios-rate-limit": "1.3.0",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
     "connect-typeorm": "1.1.4",
@@ -62,7 +64,6 @@
     "formik": "^2.4.6",
     "gravatar-url": "3.1.0",
     "lodash": "4.17.21",
-    "mime": "3",
     "next": "^14.2.4",
     "node-cache": "5.1.2",
     "node-gyp": "9.3.1",
@@ -120,8 +121,7 @@
     "@types/express": "4.17.17",
     "@types/express-session": "1.17.6",
     "@types/lodash": "4.14.191",
-    "@types/mime": "3",
-    "@types/node": "20.14.8",
+    "@types/node": "17.0.36",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
     "@types/react": "^18.3.3",

server/api/animelist.ts

@@ -1,8 +1,7 @@
 import logger from '@server/logger';
-import fs, { promises as fsp } from 'node:fs';
-import path from 'node:path';
-import { Readable } from 'node:stream';
-import type { ReadableStream } from 'node:stream/web';
+import axios from 'axios';
+import fs, { promises as fsp } from 'fs';
+import path from 'path';
 import xml2js from 'xml2js';
 
 const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
@@ -162,18 +161,13 @@ class AnimeListMapping {
       label: 'Anime-List Sync',
     });
     try {
-      const response = await fetch(MAPPING_URL);
-      if (!response.ok) {
-        throw new Error(`Failed to fetch: ${response.statusText}`);
-      }
-      await new Promise<void>((resolve, reject) => {
+      const response = await axios.get(MAPPING_URL, {
+        responseType: 'stream',
+      });
+      await new Promise<void>((resolve) => {
         const writer = fs.createWriteStream(LOCAL_PATH);
         writer.on('finish', resolve);
-        writer.on('error', reject);
-        if (!response.body) return reject();
-        Readable.fromWeb(response.body as ReadableStream<Uint8Array>).pipe(
-          writer
-        );
+        response.data.pipe(writer);
       });
     } catch (e) {
       throw new Error(`Failed to download Anime-List mapping: ${e.message}`);

server/api/externalapi.ts

@@ -1,5 +1,6 @@
-import type { RateLimitOptions } from '@server/utils/rateLimit';
-import rateLimit from '@server/utils/rateLimit';
+import type { AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+import rateLimit from 'axios-rate-limit';
 import type NodeCache from 'node-cache';
 
 // 5 minute default TTL (in seconds)
@@ -11,131 +12,71 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
   nodeCache?: NodeCache;
   headers?: Record<string, unknown>;
-  rateLimit?: RateLimitOptions;
+  rateLimit?: {
+    maxRPS: number;
+    maxRequests: number;
+  };
 }
 
 class ExternalAPI {
-  protected fetch: typeof fetch;
-  protected params: Record<string, string>;
-  protected defaultHeaders: { [key: string]: string };
+  protected axios: AxiosInstance;
   private baseUrl: string;
   private cache?: NodeCache;
 
   constructor(
     baseUrl: string,
-    params: Record<string, string> = {},
+    params: Record<string, unknown>,
     options: ExternalAPIOptions = {}
   ) {
+    this.axios = axios.create({
+      baseURL: baseUrl,
+      params,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+        ...options.headers,
+      },
+    });
+
     if (options.rateLimit) {
-      this.fetch = rateLimit(fetch, options.rateLimit);
-    } else {
-      this.fetch = fetch;
+      this.axios = rateLimit(this.axios, {
+        maxRequests: options.rateLimit.maxRequests,
+        maxRPS: options.rateLimit.maxRPS,
+      });
     }
 
     this.baseUrl = baseUrl;
-    this.params = params;
-    this.defaultHeaders = {
-      'Content-Type': 'application/json',
-      Accept: 'application/json',
-      ...options.headers,
-    };
     this.cache = options.nodeCache;
   }
 
   protected async get<T>(
     endpoint: string,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
   ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...params,
-    });
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const data = await this.getDataFromResponse(response);
+    const response = await this.axios.get<T>(endpoint, config);
 
     if (this.cache) {
-      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
     }
 
-    return data;
+    return response.data;
   }
 
   protected async post<T>(
-    endpoint: string,
-    data?: Record<string, unknown>,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
-  ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
-      data,
-    });
-    const cachedItem = this.cache?.get<T>(cacheKey);
-    if (cachedItem) {
-      return cachedItem;
-    }
-
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'POST',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-      body: data ? JSON.stringify(data) : undefined,
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const resData = await this.getDataFromResponse(response);
-
-    if (this.cache) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
-    }
-
-    return resData;
-  }
-
-  protected async put<T>(
     endpoint: string,
     data: Record<string, unknown>,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
   ): Promise<T> {
     const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
+      config: config?.params,
       data,
     });
     const cachedItem = this.cache?.get<T>(cacheKey);
@@ -143,73 +84,21 @@ class ExternalAPI {
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'PUT',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-      body: JSON.stringify(data),
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const resData = await this.getDataFromResponse(response);
+    const response = await this.axios.post<T>(endpoint, data, config);
 
     if (this.cache) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
     }
 
-    return resData;
-  }
-
-  protected async delete<T>(
-    endpoint: string,
-    params?: Record<string, string>,
-    config?: RequestInit
-  ): Promise<T> {
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'DELETE',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const data = await this.getDataFromResponse(response);
-
-    return data;
+    return response.data;
   }
 
   protected async getRolling<T>(
     endpoint: string,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit,
-    overwriteBaseUrl?: string
+    config?: AxiosRequestConfig,
+    ttl?: number
   ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...params,
-    });
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
     const cachedItem = this.cache?.get<T>(cacheKey);
 
     if (cachedItem) {
@@ -220,78 +109,20 @@ class ExternalAPI {
         keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
         Date.now() - DEFAULT_ROLLING_BUFFER
       ) {
-        const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
-        this.fetch(url, {
-          ...config,
-          headers: {
-            ...this.defaultHeaders,
-            ...config?.headers,
-          },
-        }).then(async (response) => {
-          if (!response.ok) {
-            const text = await response.text();
-            throw new Error(
-              `${response.status} ${response.statusText}${
-                text ? ': ' + text : ''
-              }`,
-              {
-                cause: response,
-              }
-            );
-          }
-          const data = await this.getDataFromResponse(response);
-          this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+        this.axios.get<T>(endpoint, config).then((response) => {
+          this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
         });
       }
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
-    const response = await this.fetch(url, {
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const data = await this.getDataFromResponse(response);
+    const response = await this.axios.get<T>(endpoint, config);
 
     if (this.cache) {
-      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
     }
 
-    return data;
-  }
-
-  private formatUrl(
-    endpoint: string,
-    params?: Record<string, string>,
-    overwriteBaseUrl?: string
-  ): string {
-    const baseUrl = overwriteBaseUrl || this.baseUrl;
-    const href =
-      baseUrl +
-      (baseUrl.endsWith('/') ? '' : '/') +
-      (endpoint.startsWith('/') ? endpoint.slice(1) : endpoint);
-    const searchParams = new URLSearchParams({
-      ...this.params,
-      ...params,
-    });
-    return (
-      href +
-      (searchParams.toString().length
-        ? '?' + searchParams.toString()
-        : searchParams.toString())
-    );
+    return response.data;
   }
 
   private serializeCacheKey(
@@ -304,29 +135,6 @@ class ExternalAPI {
 
     return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
   }
-
-  private async getDataFromResponse(response: Response) {
-    const contentType = response.headers.get('Content-Type');
-    if (contentType?.includes('application/json')) {
-      return await response.json();
-    } else if (
-      contentType?.includes('application/xml') ||
-      contentType?.includes('text/html') ||
-      contentType?.includes('text/plain')
-    ) {
-      return await response.text();
-    } else {
-      try {
-        return await response.json();
-      } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
-      }
-    }
-  }
 }
 
 export default ExternalAPI;

server/api/github.ts

@@ -1,6 +1,6 @@
-import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import logger from '@server/logger';
+import ExternalAPI from './externalapi';
 
 interface GitHubRelease {
   url: string;
@@ -67,6 +67,10 @@ class GithubAPI extends ExternalAPI {
       'https://api.github.com',
       {},
       {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
         nodeCache: cacheManager.getCache('github').data,
       }
     );
@@ -81,7 +85,9 @@ class GithubAPI extends ExternalAPI {
       const data = await this.get<GitHubRelease[]>(
         '/repos/fallenbagel/jellyseerr/releases',
         {
-          per_page: take.toString(),
+          params: {
+            per_page: take,
+          },
         }
       );
 
@@ -106,8 +112,10 @@ class GithubAPI extends ExternalAPI {
       const data = await this.get<GithubCommit[]>(
         '/repos/fallenbagel/jellyseerr/commits',
         {
-          per_page: take.toString(),
-          branch,
+          params: {
+            per_page: take,
+            branch,
+          },
         }
       );
 

server/api/jellyfin.ts

@@ -93,7 +93,9 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
 }
 
 class JellyfinAPI extends ExternalAPI {
+  private authToken?: string;
   private userId?: string;
+  private jellyfinHost: string;
 
   constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
     let authHeaderVal: string;
@@ -109,9 +111,14 @@ class JellyfinAPI extends ExternalAPI {
       {
         headers: {
           'X-Emby-Authorization': authHeaderVal,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
         },
       }
     );
+
+    this.jellyfinHost = jellyfinHost;
+    this.authToken = authToken;
   }
 
   public async login(
@@ -120,7 +127,7 @@ class JellyfinAPI extends ExternalAPI {
     ClientIP?: string
   ): Promise<JellyfinLoginResponse> {
     const authenticate = async (useHeaders: boolean) => {
-      const headers: { [key: string]: string } =
+      const headers =
         useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
 
       return this.post<JellyfinLoginResponse>(
@@ -129,8 +136,6 @@ class JellyfinAPI extends ExternalAPI {
           Username,
           Pw: Password,
         },
-        {},
-        undefined,
         { headers }
       );
     };
@@ -147,7 +152,7 @@ class JellyfinAPI extends ExternalAPI {
     try {
       return await authenticate(false);
     } catch (e) {
-      const status = e.cause?.status;
+      const status = e.response?.status;
 
       const networkErrorCodes = new Set([
         'ECONNREFUSED',
@@ -185,7 +190,7 @@ class JellyfinAPI extends ExternalAPI {
 
       return systemInfoResponse;
     } catch (e) {
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
@@ -202,7 +207,7 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
+      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
     }
   }
 
@@ -217,7 +222,7 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
@@ -233,7 +238,7 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
@@ -291,16 +296,7 @@ class JellyfinAPI extends ExternalAPI {
   public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const libraryItemsResponse = await this.get<any>(
-        `/Users/${this.userId}/Items`,
-        {
-          SortBy: 'SortName',
-          SortOrder: 'Ascending',
-          IncludeItemTypes: 'Series,Movie,Others',
-          Recursive: 'true',
-          StartIndex: '0',
-          ParentId: id,
-          collapseBoxSetItems: 'false',
-        }
+        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
       );
 
       return libraryItemsResponse.Items.filter(
@@ -312,18 +308,14 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
   public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const itemResponse = await this.get<any>(
-        `/Users/${this.userId}/Items/Latest`,
-        {
-          Limit: '12',
-          ParentId: id,
-        }
+        `/Users/${this.userId}/Items/Latest?Limit=12&ParentId=${id}`
       );
 
       return itemResponse;
@@ -333,7 +325,7 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
@@ -348,7 +340,7 @@ class JellyfinAPI extends ExternalAPI {
       return itemResponse;
     } catch (e) {
       if (availabilitySync.running) {
-        if (e.cause?.status === 500) {
+        if (e.response && e.response.status === 500) {
           return undefined;
         }
       }
@@ -357,7 +349,7 @@ class JellyfinAPI extends ExternalAPI {
         `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
@@ -372,7 +364,7 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
 
@@ -382,10 +374,7 @@ class JellyfinAPI extends ExternalAPI {
   ): Promise<JellyfinLibraryItem[]> {
     try {
       const episodeResponse = await this.get<any>(
-        `/Shows/${seriesID}/Episodes`,
-        {
-          seasonId: seasonID,
-        }
+        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
       );
 
       return episodeResponse.Items.filter(
@@ -397,23 +386,6 @@ class JellyfinAPI extends ExternalAPI {
         { label: 'Jellyfin API' }
       );
 
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
-    }
-  }
-
-  public async createApiToken(appName: string): Promise<string> {
-    try {
-      await this.post(`/Auth/Keys?App=${appName}`);
-      const apiKeys = await this.get<any>(`/Auth/Keys`);
-      return apiKeys.Items.reverse().find(
-        (item: any) => item.AppName === appName
-      ).AccessToken;
-    } catch (e) {
-      logger.error(
-        `Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
-      );
-
       throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
     }
   }

server/api/plextv.ts

@@ -1,9 +1,9 @@
-import ExternalAPI from '@server/api/externalapi';
 import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import xml2js from 'xml2js';
+import ExternalAPI from './externalapi';
 
 interface PlexAccountResponse {
   user: PlexUser;
@@ -137,6 +137,8 @@ class PlexTvAPI extends ExternalAPI {
       {
         headers: {
           'X-Plex-Token': authToken,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
         },
         nodeCache: cacheManager.getCache('plextv').data,
       }
@@ -147,11 +149,15 @@ class PlexTvAPI extends ExternalAPI {
 
   public async getDevices(): Promise<PlexDevice[]> {
     try {
-      const devicesResp = await this.get('/api/resources', {
-        includeHttps: '1',
-      });
+      const devicesResp = await this.axios.get(
+        '/api/resources?includeHttps=1',
+        {
+          transformResponse: [],
+          responseType: 'text',
+        }
+      );
       const parsedXml = await xml2js.parseStringPromise(
-        devicesResp as DeviceResponse
+        devicesResp.data as DeviceResponse
       );
       return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
         name: pxml.$.name,
@@ -199,11 +205,11 @@ class PlexTvAPI extends ExternalAPI {
 
   public async getUser(): Promise<PlexUser> {
     try {
-      const account = await this.get<PlexAccountResponse>(
+      const account = await this.axios.get<PlexAccountResponse>(
         '/users/account.json'
       );
 
-      return account.user;
+      return account.data.user;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the account from plex.tv: ${e.message}`,
@@ -243,10 +249,13 @@ class PlexTvAPI extends ExternalAPI {
   }
 
   public async getUsers(): Promise<UsersResponse> {
-    const data = await this.get('/api/users');
+    const response = await this.axios.get('/api/users', {
+      transformResponse: [],
+      responseType: 'text',
+    });
 
     const parsedXml = (await xml2js.parseStringPromise(
-      data as string
+      response.data
     )) as UsersResponse;
     return parsedXml;
   }
@@ -261,49 +270,49 @@ class PlexTvAPI extends ExternalAPI {
     items: PlexWatchlistItem[];
   }> {
     try {
-      const params = new URLSearchParams({
-        'X-Plex-Container-Start': offset.toString(),
-        'X-Plex-Container-Size': size.toString(),
-      });
-      const response = await this.fetch(
-        `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
+      const response = await this.axios.get<WatchlistResponse>(
+        '/library/sections/watchlist/all',
         {
-          headers: this.defaultHeaders,
+          params: {
+            'X-Plex-Container-Start': offset,
+            'X-Plex-Container-Size': size,
+          },
+          baseURL: 'https://metadata.provider.plex.tv',
         }
       );
-      const data = (await response.json()) as WatchlistResponse;
 
       const watchlistDetails = await Promise.all(
-        (data.MediaContainer.Metadata ?? []).map(async (watchlistItem) => {
-          const detailedResponse = await this.getRolling<MetadataResponse>(
-            `/library/metadata/${watchlistItem.ratingKey}`,
-            {},
-            undefined,
-            {},
-            'https://metadata.provider.plex.tv'
-          );
+        (response.data.MediaContainer.Metadata ?? []).map(
+          async (watchlistItem) => {
+            const detailedResponse = await this.getRolling<MetadataResponse>(
+              `/library/metadata/${watchlistItem.ratingKey}`,
+              {
+                baseURL: 'https://metadata.provider.plex.tv',
+              }
+            );
 
-          const metadata = detailedResponse.MediaContainer.Metadata[0];
+            const metadata = detailedResponse.MediaContainer.Metadata[0];
 
-          const tmdbString = metadata.Guid.find((guid) =>
-            guid.id.startsWith('tmdb')
-          );
-          const tvdbString = metadata.Guid.find((guid) =>
-            guid.id.startsWith('tvdb')
-          );
+            const tmdbString = metadata.Guid.find((guid) =>
+              guid.id.startsWith('tmdb')
+            );
+            const tvdbString = metadata.Guid.find((guid) =>
+              guid.id.startsWith('tvdb')
+            );
 
-          return {
-            ratingKey: metadata.ratingKey,
-            // This should always be set? But I guess it also cannot be?
-            // We will filter out the 0's afterwards
-            tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
-            tvdbId: tvdbString
-              ? Number(tvdbString.id.split('//')[1])
-              : undefined,
-            title: metadata.title,
-            type: metadata.type,
-          };
-        })
+            return {
+              ratingKey: metadata.ratingKey,
+              // This should always be set? But I guess it also cannot be?
+              // We will filter out the 0's afterwards
+              tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
+              tvdbId: tvdbString
+                ? Number(tvdbString.id.split('//')[1])
+                : undefined,
+              title: metadata.title,
+              type: metadata.type,
+            };
+          }
+        )
       );
 
       const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
@@ -311,7 +320,7 @@ class PlexTvAPI extends ExternalAPI {
       return {
         offset,
         size,
-        totalSize: data.MediaContainer.totalSize,
+        totalSize: response.data.MediaContainer.totalSize,
         items: filteredList,
       };
     } catch (e) {

server/api/pushover.ts

@@ -1,4 +1,4 @@
-import ExternalAPI from '@server/api/externalapi';
+import ExternalAPI from './externalapi';
 
 interface PushoverSoundsResponse {
   sounds: {
@@ -26,13 +26,24 @@ export const mapSounds = (sounds: {
 
 class PushoverAPI extends ExternalAPI {
   constructor() {
-    super('https://api.pushover.net/1');
+    super(
+      'https://api.pushover.net/1',
+      {},
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+      }
+    );
   }
 
   public async getSounds(appToken: string): Promise<PushoverSound[]> {
     try {
       const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
-        token: appToken,
+        params: {
+          token: appToken,
+        },
       });
 
       return mapSounds(data.sounds);

server/api/rating/imdbRadarrProxy.ts

@@ -155,13 +155,13 @@ export interface IMDBRating {
  */
 class IMDBRadarrProxy extends ExternalAPI {
   constructor() {
-    super(
-      'https://api.radarr.video/v1',
-      {},
-      {
-        nodeCache: cacheManager.getCache('imdb').data,
-      }
-    );
+    super('https://api.radarr.video/v1', {
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+      nodeCache: cacheManager.getCache('imdb').data,
+    });
   }
 
   /**
@@ -175,11 +175,7 @@ class IMDBRadarrProxy extends ExternalAPI {
         `/movie/imdb/${IMDBid}`
       );
 
-      if (
-        !data?.length ||
-        data[0].ImdbId !== IMDBid ||
-        !data[0].MovieRatings.Imdb
-      ) {
+      if (!data?.length || data[0].ImdbId !== IMDBid) {
         return null;
       }
 

server/api/rating/rottentomatoes.ts

@@ -63,12 +63,15 @@ class RottenTomatoes extends ExternalAPI {
     super(
       'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
       {
-        'x-algolia-agent': 'Algolia for JavaScript (4.14.3); Browser (lite)',
+        'x-algolia-agent':
+          'Algolia%20for%20JavaScript%20(4.14.3)%3B%20Browser%20(lite)',
         'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
         'x-algolia-application-id': '79FRDP12PN',
       },
       {
         headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
           'x-algolia-usertoken': settings.clientId,
         },
         nodeCache: cacheManager.getCache('rt').data,

server/api/servarr/base.ts

@@ -113,9 +113,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getSystemStatus = async (): Promise<SystemStatus> => {
     try {
-      const data = await this.get<SystemStatus>('/system/status');
+      const response = await this.axios.get<SystemStatus>('/system/status');
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve system status: ${e.message}`
@@ -157,11 +157,16 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
     try {
-      const data = await this.get<QueueResponse<QueueItemAppendT>>(`/queue`, {
-        includeEpisode: 'true',
-      });
+      const response = await this.axios.get<QueueResponse<QueueItemAppendT>>(
+        `/queue`,
+        {
+          params: {
+            includeEpisode: true,
+          },
+        }
+      );
 
-      return data.records;
+      return response.data.records;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve queue: ${e.message}`
@@ -171,9 +176,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getTags = async (): Promise<Tag[]> => {
     try {
-      const data = await this.get<Tag[]>(`/tag`);
+      const response = await this.axios.get<Tag[]>(`/tag`);
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve tags: ${e.message}`
@@ -183,11 +188,11 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public createTag = async ({ label }: { label: string }): Promise<Tag> => {
     try {
-      const data = await this.post<Tag>(`/tag`, {
+      const response = await this.axios.post<Tag>(`/tag`, {
         label,
       });
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
     }
@@ -198,7 +203,7 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
     options: Record<string, unknown>
   ): Promise<void> {
     try {
-      await this.post(`/command`, {
+      await this.axios.post(`/command`, {
         name: commandName,
         ...options,
       });

server/api/servarr/radarr.ts

@@ -37,9 +37,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public getMovies = async (): Promise<RadarrMovie[]> => {
     try {
-      const data = await this.get<RadarrMovie[]>('/movie');
+      const response = await this.axios.get<RadarrMovie[]>('/movie');
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
     }
@@ -47,9 +47,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
     try {
-      const data = await this.get<RadarrMovie>(`/movie/${id}`);
+      const response = await this.axios.get<RadarrMovie>(`/movie/${id}`);
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
     }
@@ -57,15 +57,17 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
     try {
-      const data = await this.get<RadarrMovie[]>('/movie/lookup', {
-        term: `tmdb:${id}`,
+      const response = await this.axios.get<RadarrMovie[]>('/movie/lookup', {
+        params: {
+          term: `tmdb:${id}`,
+        },
       });
 
-      if (!data[0]) {
+      if (!response.data[0]) {
         throw new Error('Movie not found');
       }
 
-      return data[0];
+      return response.data[0];
     } catch (e) {
       logger.error('Error retrieving movie by TMDB ID', {
         label: 'Radarr API',
@@ -95,7 +97,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
       // movie exists in Radarr but is neither downloaded nor monitored
       if (movie.id && !movie.monitored) {
-        const data = await this.put<RadarrMovie>(`/movie`, {
+        const response = await this.axios.put<RadarrMovie>(`/movie`, {
           ...movie,
           title: options.title,
           qualityProfileId: options.qualityProfileId,
@@ -112,25 +114,25 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
           },
         });
 
-        if (data.monitored) {
+        if (response.data.monitored) {
           logger.info(
             'Found existing title in Radarr and set it to monitored.',
             {
               label: 'Radarr',
-              movieId: data.id,
-              movieTitle: data.title,
+              movieId: response.data.id,
+              movieTitle: response.data.title,
             }
           );
           logger.debug('Radarr update details', {
             label: 'Radarr',
-            movie: data,
+            movie: response.data,
           });
 
           if (options.searchNow) {
-            this.searchMovie(data.id);
+            this.searchMovie(response.data.id);
           }
 
-          return data;
+          return response.data;
         } else {
           logger.error('Failed to update existing movie in Radarr.', {
             label: 'Radarr',
@@ -148,7 +150,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         return movie;
       }
 
-      const data = await this.post<RadarrMovie>(`/movie`, {
+      const response = await this.axios.post<RadarrMovie>(`/movie`, {
         title: options.title,
         qualityProfileId: options.qualityProfileId,
         profileId: options.profileId,
@@ -164,11 +166,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         },
       });
 
-      if (data.id) {
+      if (response.data.id) {
         logger.info('Radarr accepted request', { label: 'Radarr' });
         logger.debug('Radarr add details', {
           label: 'Radarr',
-          movie: data,
+          movie: response.data,
         });
       } else {
         logger.error('Failed to add movie to Radarr', {
@@ -177,22 +179,15 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         });
         throw new Error('Failed to add movie to Radarr');
       }
-      return data;
+      return response.data;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error(
         'Failed to add movie to Radarr. This might happen if the movie already exists, in which case you can safely ignore this error.',
         {
           label: 'Radarr',
           errorMessage: e.message,
           options,
-          response: errorData,
+          response: e?.response?.data,
         }
       );
       throw new Error('Failed to add movie to Radarr');
@@ -221,9 +216,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
   public removeMovie = async (movieId: number): Promise<void> => {
     try {
       const { id, title } = await this.getMovieByTmdbId(movieId);
-      await this.delete(`/movie/${id}`, {
-        deleteFiles: 'true',
-        addImportExclusion: 'false',
+      await this.axios.delete(`/movie/${id}`, {
+        params: {
+          deleteFiles: true,
+          addImportExclusion: false,
+        },
       });
       logger.info(`[Radarr] Removed movie ${title}`);
     } catch (e) {

server/api/servarr/sonarr.ts

@@ -117,9 +117,9 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeries(): Promise<SonarrSeries[]> {
     try {
-      const data = await this.get<SonarrSeries[]>('/series');
+      const response = await this.axios.get<SonarrSeries[]>('/series');
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
     }
@@ -127,9 +127,9 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesById(id: number): Promise<SonarrSeries> {
     try {
-      const data = await this.get<SonarrSeries>(`/series/${id}`);
+      const response = await this.axios.get<SonarrSeries>(`/series/${id}`);
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
     }
@@ -137,15 +137,17 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
     try {
-      const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: title,
+      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
+        params: {
+          term: title,
+        },
       });
 
-      if (!data[0]) {
+      if (!response.data[0]) {
         throw new Error('No series found');
       }
 
-      return data;
+      return response.data;
     } catch (e) {
       logger.error('Error retrieving series by series title', {
         label: 'Sonarr API',
@@ -158,15 +160,17 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
     try {
-      const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: `tvdb:${id}`,
+      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
+        params: {
+          term: `tvdb:${id}`,
+        },
       });
 
-      if (!data[0]) {
+      if (!response.data[0]) {
         throw new Error('Series not found');
       }
 
-      return data[0];
+      return response.data[0];
     } catch (e) {
       logger.error('Error retrieving series by tvdb ID', {
         label: 'Sonarr API',
@@ -187,27 +191,27 @@ class SonarrAPI extends ServarrBase<{
         series.tags = options.tags ?? series.tags;
         series.seasons = this.buildSeasonList(options.seasons, series.seasons);
 
-        const newSeriesData = await this.put<SonarrSeries>(
+        const newSeriesResponse = await this.axios.put<SonarrSeries>(
           '/series',
-          series as any
+          series
         );
 
-        if (newSeriesData.id) {
+        if (newSeriesResponse.data.id) {
           logger.info('Updated existing series in Sonarr.', {
             label: 'Sonarr',
-            seriesId: newSeriesData.id,
-            seriesTitle: newSeriesData.title,
+            seriesId: newSeriesResponse.data.id,
+            seriesTitle: newSeriesResponse.data.title,
           });
           logger.debug('Sonarr update details', {
             label: 'Sonarr',
-            movie: newSeriesData,
+            movie: newSeriesResponse.data,
           });
 
           if (options.searchNow) {
-            this.searchSeries(newSeriesData.id);
+            this.searchSeries(newSeriesResponse.data.id);
           }
 
-          return newSeriesData;
+          return newSeriesResponse.data;
         } else {
           logger.error('Failed to update series in Sonarr', {
             label: 'Sonarr',
@@ -217,35 +221,38 @@ class SonarrAPI extends ServarrBase<{
         }
       }
 
-      const createdSeriesData = await this.post<SonarrSeries>('/series', {
-        tvdbId: options.tvdbid,
-        title: options.title,
-        qualityProfileId: options.profileId,
-        languageProfileId: options.languageProfileId,
-        seasons: this.buildSeasonList(
-          options.seasons,
-          series.seasons.map((season) => ({
-            seasonNumber: season.seasonNumber,
-            // We force all seasons to false if its the first request
-            monitored: false,
-          }))
-        ),
-        tags: options.tags,
-        seasonFolder: options.seasonFolder,
-        monitored: options.monitored,
-        rootFolderPath: options.rootFolderPath,
-        seriesType: options.seriesType,
-        addOptions: {
-          ignoreEpisodesWithFiles: true,
-          searchForMissingEpisodes: options.searchNow,
-        },
-      } as Partial<SonarrSeries>);
+      const createdSeriesResponse = await this.axios.post<SonarrSeries>(
+        '/series',
+        {
+          tvdbId: options.tvdbid,
+          title: options.title,
+          qualityProfileId: options.profileId,
+          languageProfileId: options.languageProfileId,
+          seasons: this.buildSeasonList(
+            options.seasons,
+            series.seasons.map((season) => ({
+              seasonNumber: season.seasonNumber,
+              // We force all seasons to false if its the first request
+              monitored: false,
+            }))
+          ),
+          tags: options.tags,
+          seasonFolder: options.seasonFolder,
+          monitored: options.monitored,
+          rootFolderPath: options.rootFolderPath,
+          seriesType: options.seriesType,
+          addOptions: {
+            ignoreEpisodesWithFiles: true,
+            searchForMissingEpisodes: options.searchNow,
+          },
+        } as Partial<SonarrSeries>
+      );
 
-      if (createdSeriesData.id) {
+      if (createdSeriesResponse.data.id) {
         logger.info('Sonarr accepted request', { label: 'Sonarr' });
         logger.debug('Sonarr add details', {
           label: 'Sonarr',
-          movie: createdSeriesData,
+          movie: createdSeriesResponse.data,
         });
       } else {
         logger.error('Failed to add movie to Sonarr', {
@@ -255,20 +262,13 @@ class SonarrAPI extends ServarrBase<{
         throw new Error('Failed to add series to Sonarr');
       }
 
-      return createdSeriesData;
+      return createdSeriesResponse.data;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Something went wrong while adding a series to Sonarr.', {
         label: 'Sonarr API',
         errorMessage: e.message,
         options,
-        response: errorData,
+        response: e?.response?.data,
       });
       throw new Error('Failed to add series');
     }
@@ -340,13 +340,14 @@ class SonarrAPI extends ServarrBase<{
 
     return newSeasons;
   }
-
   public removeSerie = async (serieId: number): Promise<void> => {
     try {
       const { id, title } = await this.getSeriesByTvdbId(serieId);
-      await this.delete(`/series/${id}`, {
-        deleteFiles: 'true',
-        addImportExclusion: 'false',
+      await this.axios.delete(`/series/${id}`, {
+        params: {
+          deleteFiles: true,
+          addImportExclusion: false,
+        },
       });
       logger.info(`[Radarr] Removed serie ${title}`);
     } catch (e) {

server/api/tautulli.ts

@@ -1,7 +1,8 @@
-import ExternalAPI from '@server/api/externalapi';
 import type { User } from '@server/entity/User';
 import type { TautulliSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import type { AxiosInstance } from 'axios';
+import axios from 'axios';
 import { uniqWith } from 'lodash';
 
 export interface TautulliHistoryRecord {
@@ -112,25 +113,25 @@ interface TautulliInfoResponse {
   };
 }
 
-class TautulliAPI extends ExternalAPI {
+class TautulliAPI {
+  private axios: AxiosInstance;
+
   constructor(settings: TautulliSettings) {
-    super(
-      `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+    this.axios = axios.create({
+      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
         settings.port
       }${settings.urlBase ?? ''}`,
-      {
-        apikey: settings.apiKey || '',
-      }
-    );
+      params: { apikey: settings.apiKey },
+    });
   }
 
   public async getInfo(): Promise<TautulliInfo> {
     try {
       return (
-        await this.get<TautulliInfoResponse>('/api/v2', {
-          cmd: 'get_tautulli_info',
+        await this.axios.get<TautulliInfoResponse>('/api/v2', {
+          params: { cmd: 'get_tautulli_info' },
         })
-      ).response.data;
+      ).data.response.data;
     } catch (e) {
       logger.error('Something went wrong fetching Tautulli server info', {
         label: 'Tautulli API',
@@ -147,12 +148,14 @@ class TautulliAPI extends ExternalAPI {
   ): Promise<TautulliWatchStats[]> {
     try {
       return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_item_watch_time_stats',
-          rating_key: ratingKey,
-          grouping: '1',
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_watch_time_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
         })
-      ).response.data;
+      ).data.response.data;
     } catch (e) {
       logger.error(
         'Something went wrong fetching media watch stats from Tautulli',
@@ -173,12 +176,14 @@ class TautulliAPI extends ExternalAPI {
   ): Promise<TautulliWatchUser[]> {
     try {
       return (
-        await this.get<TautulliWatchUsersResponse>('/api/v2', {
-          cmd: 'get_item_user_stats',
-          rating_key: ratingKey,
-          grouping: '1',
+        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_user_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
         })
-      ).response.data;
+      ).data.response.data;
     } catch (e) {
       logger.error(
         'Something went wrong fetching media watch users from Tautulli',
@@ -201,13 +206,15 @@ class TautulliAPI extends ExternalAPI {
       }
 
       return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_user_watch_time_stats',
-          user_id: user.plexId.toString(),
-          query_days: '0',
-          grouping: '1',
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_user_watch_time_stats',
+            user_id: user.plexId,
+            query_days: 0,
+            grouping: 1,
+          },
         })
-      ).response.data[0];
+      ).data.response.data[0];
     } catch (e) {
       logger.error(
         'Something went wrong fetching user watch stats from Tautulli',
@@ -238,17 +245,19 @@ class TautulliAPI extends ExternalAPI {
 
       while (results.length < 20) {
         const tautulliData = (
-          await this.get<TautulliHistoryResponse>('/api/v2', {
-            cmd: 'get_history',
-            grouping: '1',
-            order_column: 'date',
-            order_dir: 'desc',
-            user_id: user.plexId.toString(),
-            media_type: 'movie,episode',
-            length: take.toString(),
-            start: start.toString(),
+          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
+            params: {
+              cmd: 'get_history',
+              grouping: 1,
+              order_column: 'date',
+              order_dir: 'desc',
+              user_id: user.plexId,
+              media_type: 'movie,episode',
+              length: take,
+              start,
+            },
           })
-        ).response.data.data;
+        ).data.response.data.data;
 
         if (!tautulliData.length) {
           return results;

server/api/themoviedb/index.ts

@@ -112,8 +112,8 @@ class TheMovieDb extends ExternalAPI {
       {
         nodeCache: cacheManager.getCache('tmdb').data,
         rateLimit: {
+          maxRequests: 20,
           maxRPS: 50,
-          id: 'tmdb',
         },
       }
     );
@@ -129,10 +129,7 @@ class TheMovieDb extends ExternalAPI {
   }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
     try {
       const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
+        params: { query, page, include_adult: includeAdult, language },
       });
 
       return data;
@@ -155,11 +152,13 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
     try {
       const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        primary_release_year: year?.toString() || '',
+        params: {
+          query,
+          page,
+          include_adult: includeAdult,
+          language,
+          primary_release_year: year,
+        },
       });
 
       return data;
@@ -182,11 +181,13 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
     try {
       const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        first_air_date_year: year?.toString() || '',
+        params: {
+          query,
+          page,
+          include_adult: includeAdult,
+          language,
+          first_air_date_year: year,
+        },
       });
 
       return data;
@@ -209,7 +210,7 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbPersonDetails> => {
     try {
       const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        language,
+        params: { language },
       });
 
       return data;
@@ -229,7 +230,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbPersonCombinedCredits>(
         `/person/${personId}/combined_credits`,
         {
-          language,
+          params: { language },
         }
       );
 
@@ -252,9 +253,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbMovieDetails>(
         `/movie/${movieId}`,
         {
-          language,
-          append_to_response:
-            'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          params: {
+            language,
+            append_to_response:
+              'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          },
         },
         43200
       );
@@ -276,9 +279,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbTvDetails>(
         `/tv/${tvId}`,
         {
-          language,
-          append_to_response:
-            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          params: {
+            language,
+            append_to_response:
+              'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          },
         },
         43200
       );
@@ -302,8 +307,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSeasonWithEpisodes>(
         `/tv/${tvId}/season/${seasonNumber}`,
         {
-          language: language || '',
-          append_to_response: 'external_ids',
+          params: {
+            language,
+            append_to_response: 'external_ids',
+          },
         }
       );
 
@@ -326,8 +333,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/recommendations`,
         {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
         }
       );
 
@@ -350,8 +359,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/similar`,
         {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
         }
       );
 
@@ -374,8 +385,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/keyword/${keywordId}/movies`,
         {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
         }
       );
 
@@ -398,8 +411,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/tv/${tvId}/recommendations`,
         {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
         }
       );
 
@@ -422,8 +437,10 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbSearchTvResponse> {
     try {
       const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        page: page.toString(),
-        language,
+        params: {
+          page,
+          language,
+        },
       });
 
       return data;
@@ -464,38 +481,40 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
-        sort_by: sortBy,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        region: this.region || '',
-        with_original_language:
-          originalLanguage && originalLanguage !== 'all'
-            ? originalLanguage
-            : originalLanguage === 'all'
-            ? ''
-            : this.originalLanguage || '',
-        // Set our release date values, but check if one is set and not the other,
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
-        'primary_release_date.gte':
-          !primaryReleaseDateGte && primaryReleaseDateLte
-            ? defaultPastDate
-            : primaryReleaseDateGte || '',
-        'primary_release_date.lte':
-          !primaryReleaseDateLte && primaryReleaseDateGte
-            ? defaultFutureDate
-            : primaryReleaseDateLte || '',
-        with_genres: genre || '',
-        with_companies: studio || '',
-        with_keywords: keywords || '',
-        'with_runtime.gte': withRuntimeGte || '',
-        'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.gte': voteAverageGte || '',
-        'vote_average.lte': voteAverageLte || '',
-        'vote_count.gte': voteCountGte || '',
-        'vote_count.lte': voteCountLte || '',
-        watch_region: watchRegion || '',
-        with_watch_providers: watchProviders || '',
+        params: {
+          sort_by: sortBy,
+          page,
+          include_adult: includeAdult,
+          language,
+          region: this.region,
+          with_original_language:
+            originalLanguage && originalLanguage !== 'all'
+              ? originalLanguage
+              : originalLanguage === 'all'
+              ? undefined
+              : this.originalLanguage,
+          // Set our release date values, but check if one is set and not the other,
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          'primary_release_date.gte':
+            !primaryReleaseDateGte && primaryReleaseDateLte
+              ? defaultPastDate
+              : primaryReleaseDateGte,
+          'primary_release_date.lte':
+            !primaryReleaseDateLte && primaryReleaseDateGte
+              ? defaultFutureDate
+              : primaryReleaseDateLte,
+          with_genres: genre,
+          with_companies: studio,
+          with_keywords: keywords,
+          'with_runtime.gte': withRuntimeGte,
+          'with_runtime.lte': withRuntimeLte,
+          'vote_average.gte': voteAverageGte,
+          'vote_average.lte': voteAverageLte,
+          'vote_count.gte': voteCountGte,
+          'vote_count.lte': voteCountLte,
+          watch_region: watchRegion,
+          with_watch_providers: watchProviders,
+        },
       });
 
       return data;
@@ -536,40 +555,40 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
-        sort_by: sortBy,
-        page: page.toString(),
-        language,
-        region: this.region || '',
-        // Set our release date values, but check if one is set and not the other,
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
-        'first_air_date.gte':
-          !firstAirDateGte && firstAirDateLte
-            ? defaultPastDate
-            : firstAirDateGte || '',
-        'first_air_date.lte':
-          !firstAirDateLte && firstAirDateGte
-            ? defaultFutureDate
-            : firstAirDateLte || '',
-        with_original_language:
-          originalLanguage && originalLanguage !== 'all'
-            ? originalLanguage
-            : originalLanguage === 'all'
-            ? ''
-            : this.originalLanguage || '',
-        include_null_first_air_dates: includeEmptyReleaseDate
-          ? 'true'
-          : 'false',
-        with_genres: genre || '',
-        with_networks: network?.toString() || '',
-        with_keywords: keywords || '',
-        'with_runtime.gte': withRuntimeGte || '',
-        'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.gte': voteAverageGte || '',
-        'vote_average.lte': voteAverageLte || '',
-        'vote_count.gte': voteCountGte || '',
-        'vote_count.lte': voteCountLte || '',
-        with_watch_providers: watchProviders || '',
-        watch_region: watchRegion || '',
+        params: {
+          sort_by: sortBy,
+          page,
+          language,
+          region: this.region,
+          // Set our release date values, but check if one is set and not the other,
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          'first_air_date.gte':
+            !firstAirDateGte && firstAirDateLte
+              ? defaultPastDate
+              : firstAirDateGte,
+          'first_air_date.lte':
+            !firstAirDateLte && firstAirDateGte
+              ? defaultFutureDate
+              : firstAirDateLte,
+          with_original_language:
+            originalLanguage && originalLanguage !== 'all'
+              ? originalLanguage
+              : originalLanguage === 'all'
+              ? undefined
+              : this.originalLanguage,
+          include_null_first_air_dates: includeEmptyReleaseDate,
+          with_genres: genre,
+          with_networks: network,
+          with_keywords: keywords,
+          'with_runtime.gte': withRuntimeGte,
+          'with_runtime.lte': withRuntimeLte,
+          'vote_average.gte': voteAverageGte,
+          'vote_average.lte': voteAverageLte,
+          'vote_count.gte': voteCountGte,
+          'vote_count.lte': voteCountLte,
+          with_watch_providers: watchProviders,
+          watch_region: watchRegion,
+        },
       });
 
       return data;
@@ -589,10 +608,12 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbUpcomingMoviesResponse>(
         '/movie/upcoming',
         {
-          page: page.toString(),
-          language,
-          region: this.region || '',
-          originalLanguage: this.originalLanguage || '',
+          params: {
+            page,
+            language,
+            region: this.region,
+            originalLanguage: this.originalLanguage,
+          },
         }
       );
 
@@ -615,9 +636,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMultiResponse>(
         `/trending/all/${timeWindow}`,
         {
-          page: page.toString(),
-          language,
-          region: this.region || '',
+          params: {
+            page,
+            language,
+            region: this.region,
+          },
         }
       );
 
@@ -638,7 +661,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/trending/movie/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page,
+          },
         }
       );
 
@@ -659,7 +684,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/trending/tv/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page,
+          },
         }
       );
 
@@ -688,8 +715,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbExternalIdResponse>(
         `/find/${externalId}`,
         {
-          external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
-          language,
+          params: {
+            external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+            language,
+          },
         }
       );
 
@@ -779,7 +808,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCollection>(
         `/collection/${collectionId}`,
         {
-          language,
+          params: {
+            language,
+          },
         }
       );
 
@@ -852,7 +883,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/movie/list',
         {
-          language,
+          params: {
+            language,
+          },
         },
         86400 // 24 hours
       );
@@ -864,7 +897,9 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/movie/list',
           {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
           },
           86400 // 24 hours
         );
@@ -899,7 +934,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/tv/list',
         {
-          language,
+          params: {
+            language,
+          },
         },
         86400 // 24 hours
       );
@@ -911,7 +948,9 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/tv/list',
           {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
           },
           86400 // 24 hours
         );
@@ -966,8 +1005,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbKeywordSearchResponse>(
         '/search/keyword',
         {
-          query,
-          page: page.toString(),
+          params: {
+            query,
+            page,
+          },
         },
         86400 // 24 hours
       );
@@ -989,8 +1030,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCompanySearchResponse>(
         '/search/company',
         {
-          query,
-          page: page.toString(),
+          params: {
+            query,
+            page,
+          },
         },
         86400 // 24 hours
       );
@@ -1010,7 +1053,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
         '/watch/providers/regions',
         {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
+            language: language ?? this.originalLanguage,
+          },
         },
         86400 // 24 hours
       );
@@ -1034,8 +1079,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/movie',
         {
-          language: language ? this.originalLanguage || '' : '',
-          watch_region: watchRegion,
+          params: {
+            language: language ?? this.originalLanguage,
+            watch_region: watchRegion,
+          },
         },
         86400 // 24 hours
       );
@@ -1059,8 +1106,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/tv',
         {
-          language: language ? this.originalLanguage || '' : '',
-          watch_region: watchRegion,
+          params: {
+            language: language ?? this.originalLanguage,
+            watch_region: watchRegion,
+          },
         },
         86400 // 24 hours
       );

server/index.ts

@@ -19,7 +19,6 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import clearCookies from '@server/middleware/clearcookies';
 import routes from '@server/routes';
-import avatarproxy from '@server/routes/avatarproxy';
 import imageproxy from '@server/routes/imageproxy';
 import { getAppVersion } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
@@ -33,17 +32,10 @@ import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
-import dns from 'node:dns';
-import net from 'node:net';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';
 
-if (process.env.forceIpv4First === 'true') {
-  dns.setDefaultResultOrder('ipv4first');
-  net.setDefaultAutoSelectFamily(false);
-}
-
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
 
 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -64,7 +56,7 @@ app
     }
 
     // Load Settings
-    const settings = await getSettings().load();
+    const settings = getSettings().load();
     restartFlag.initializeSettings(settings.main);
 
     // Migrate library types
@@ -203,7 +195,6 @@ app
 
     // Do not set cookies so CDNs can cache them
     server.use('/imageproxy', clearCookies, imageproxy);
-    server.use('/avatarproxy', clearCookies, avatarproxy);
 
     server.get('*', (req, res) => handle(req, res));
     server.use(

server/interfaces/api/common.ts

@@ -8,16 +8,3 @@ interface PageInfo {
 export interface PaginatedResponse {
   pageInfo: PageInfo;
 }
-
-/**
- * Get the keys of an object that are not functions
- */
-type NonFunctionPropertyNames<T> = {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  [K in keyof T]: T[K] extends Function ? never : K;
-}[keyof T];
-
-/**
- * Get the properties of an object that are not functions
- */
-export type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;

server/interfaces/api/requestInterfaces.ts

@@ -1,9 +1,9 @@
 import type { MediaType } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties, PaginatedResponse } from './common';
+import type { PaginatedResponse } from './common';
 
 export interface RequestResultsResponse extends PaginatedResponse {
-  results: NonFunctionProperties<MediaRequest>[];
+  results: MediaRequest[];
 }
 
 export type MediaRequestBody = {
@@ -14,7 +14,6 @@ export type MediaRequestBody = {
   is4k?: boolean;
   serverId?: number;
   profileId?: number;
-  profileName?: string;
   rootFolder?: string;
   languageProfileId?: number;
   userId?: number;

server/interfaces/api/settingsInterfaces.ts

@@ -58,7 +58,7 @@ export interface CacheItem {
 
 export interface CacheResponse {
   apiCaches: CacheItem[];
-  imageCache: Record<'tmdb' | 'avatar', { size: number; imageCount: number }>;
+  imageCache: Record<'tmdb', { size: number; imageCount: number }>;
 }
 
 export interface StatusResponse {

server/job/schedule.ts

@@ -227,9 +227,6 @@ export const startJobs = (): void => {
       });
       // Clean TMDB image cache
       ImageProxy.clearCache('tmdb');
-
-      // Clean users avatar image cache
-      ImageProxy.clearCache('avatar');
     }),
   });
 

server/lib/availabilitySync.ts

@@ -63,7 +63,12 @@ class AvailabilitySync {
       ) {
         admin = await userRepository.findOne({
           where: { id: 1 },
-          select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+          select: [
+            'id',
+            'jellyfinAuthToken',
+            'jellyfinUserId',
+            'jellyfinDeviceId',
+          ],
           order: { id: 'ASC' },
         });
       }
@@ -81,7 +86,7 @@ class AvailabilitySync {
           if (admin) {
             this.jellyfinClient = new JellyfinAPI(
               getHostname(),
-              settings.jellyfin.apiKey,
+              admin.jellyfinAuthToken,
               admin.jellyfinDeviceId
             );
 

server/lib/imageproxy.ts

@@ -1,9 +1,8 @@
 import logger from '@server/logger';
-import type { RateLimitOptions } from '@server/utils/rateLimit';
-import rateLimit from '@server/utils/rateLimit';
+import axios from 'axios';
+import rateLimit, { type rateLimitOptions } from 'axios-rate-limit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
-import mime from 'mime/lite';
 import path, { join } from 'path';
 
 type ImageResponse = {
@@ -12,7 +11,7 @@ type ImageResponse = {
     curRevalidate: number;
     isStale: boolean;
     etag: string;
-    extension: string | null;
+    extension: string;
     cacheKey: string;
     cacheMiss: boolean;
   };
@@ -28,45 +27,29 @@ class ImageProxy {
     let deletedImages = 0;
     const cacheDirectory = path.join(baseCacheDirectory, key);
 
-    try {
-      const files = await promises.readdir(cacheDirectory);
+    const files = await promises.readdir(cacheDirectory);
 
-      for (const file of files) {
-        const filePath = path.join(cacheDirectory, file);
-        const stat = await promises.lstat(filePath);
+    for (const file of files) {
+      const filePath = path.join(cacheDirectory, file);
+      const stat = await promises.lstat(filePath);
 
-        if (stat.isDirectory()) {
-          const imageFiles = await promises.readdir(filePath);
+      if (stat.isDirectory()) {
+        const imageFiles = await promises.readdir(filePath);
 
-          for (const imageFile of imageFiles) {
-            const [, expireAtSt] = imageFile.split('.');
-            const expireAt = Number(expireAtSt);
-            const now = Date.now();
+        for (const imageFile of imageFiles) {
+          const [, expireAtSt] = imageFile.split('.');
+          const expireAt = Number(expireAtSt);
+          const now = Date.now();
 
-            if (now > expireAt) {
-              await promises.rm(path.join(filePath), {
-                recursive: true,
-              });
-              deletedImages += 1;
-            }
+          if (now > expireAt) {
+            await promises.rm(path.join(filePath, imageFile));
+            deletedImages += 1;
           }
         }
       }
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        logger.error('Directory not found', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      } else {
-        logger.error('Failed to read directory', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      }
     }
 
-    logger.info(`Cleared ${deletedImages} stale image(s) from cache '${key}'`, {
+    logger.info(`Cleared ${deletedImages} stale image(s) from cache`, {
       label: 'Image Cache',
     });
   }
@@ -86,74 +69,55 @@ class ImageProxy {
   }
 
   private static async getDirectorySize(dir: string): Promise<number> {
-    try {
-      const files = await promises.readdir(dir, {
-        withFileTypes: true,
-      });
+    const files = await promises.readdir(dir, {
+      withFileTypes: true,
+    });
 
-      const paths = files.map(async (file) => {
-        const path = join(dir, file.name);
+    const paths = files.map(async (file) => {
+      const path = join(dir, file.name);
 
-        if (file.isDirectory()) return await ImageProxy.getDirectorySize(path);
+      if (file.isDirectory()) return await ImageProxy.getDirectorySize(path);
 
-        if (file.isFile()) {
-          const { size } = await promises.stat(path);
+      if (file.isFile()) {
+        const { size } = await promises.stat(path);
 
-          return size;
-        }
-
-        return 0;
-      });
-
-      return (await Promise.all(paths))
-        .flat(Infinity)
-        .reduce((i, size) => i + size, 0);
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return 0;
+        return size;
       }
-    }
 
-    return 0;
+      return 0;
+    });
+
+    return (await Promise.all(paths))
+      .flat(Infinity)
+      .reduce((i, size) => i + size, 0);
   }
 
   private static async getImageCount(dir: string) {
-    try {
-      const files = await promises.readdir(dir);
+    const files = await promises.readdir(dir);
 
-      return files.length;
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return 0;
-      }
-    }
-
-    return 0;
+    return files.length;
   }
 
-  private fetch: typeof fetch;
+  private axios;
   private cacheVersion;
   private key;
-  private baseUrl;
 
   constructor(
     key: string,
     baseUrl: string,
     options: {
       cacheVersion?: number;
-      rateLimitOptions?: RateLimitOptions;
+      rateLimitOptions?: rateLimitOptions;
     } = {}
   ) {
     this.cacheVersion = options.cacheVersion ?? 1;
-    this.baseUrl = baseUrl;
     this.key = key;
+    this.axios = axios.create({
+      baseURL: baseUrl,
+    });
 
     if (options.rateLimitOptions) {
-      this.fetch = rateLimit(fetch, {
-        ...options.rateLimitOptions,
-      });
-    } else {
-      this.fetch = fetch;
+      this.axios = rateLimit(this.axios, options.rateLimitOptions);
     }
   }
 
@@ -180,27 +144,6 @@ class ImageProxy {
     return imageResponse;
   }
 
-  public async clearCachedImage(path: string) {
-    // find cacheKey
-    const cacheKey = this.getCacheKey(path);
-
-    try {
-      const directory = join(this.getCacheDirectory(), cacheKey);
-      const files = await promises.readdir(directory);
-
-      await promises.rm(directory, { recursive: true });
-
-      logger.info(`Cleared ${files[0]} image from cache 'avatar'`, {
-        label: 'Image Cache',
-      });
-    } catch (e) {
-      logger.error('Failed to clear cached image', {
-        label: 'Image Cache',
-        message: e.message,
-      });
-    }
-  }
-
   private async get(cacheKey: string): Promise<ImageResponse | null> {
     try {
       const directory = join(this.getCacheDirectory(), cacheKey);
@@ -239,29 +182,17 @@ class ImageProxy {
   ): Promise<ImageResponse | null> {
     try {
       const directory = join(this.getCacheDirectory(), cacheKey);
-      const href =
-        this.baseUrl +
-        (this.baseUrl.length > 0
-          ? this.baseUrl.endsWith('/')
-            ? ''
-            : '/'
-          : '') +
-        (path.startsWith('/') ? path.slice(1) : path);
-      const response = await this.fetch(href);
-      const arrayBuffer = await response.arrayBuffer();
-      const buffer = Buffer.from(arrayBuffer);
+      const response = await this.axios.get(path, {
+        responseType: 'arraybuffer',
+      });
 
-      const extension = mime.getExtension(
-        response.headers.get('content-type') ?? ''
+      const buffer = Buffer.from(response.data, 'binary');
+      const extension = path.split('.').pop() ?? '';
+      const maxAge = Number(
+        (response.headers['cache-control'] ?? '0').split('=')[1]
       );
-
-      let maxAge = Number(
-        (response.headers.get('cache-control') ?? '0').split('=')[1]
-      );
-
-      if (!maxAge) maxAge = 86400;
       const expireAt = Date.now() + maxAge * 1000;
-      const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');
+      const etag = (response.headers.etag ?? '').replace(/"/g, '');
 
       await this.writeToCacheDir(
         directory,
@@ -295,7 +226,7 @@ class ImageProxy {
 
   private async writeToCacheDir(
     dir: string,
-    extension: string | null,
+    extension: string,
     maxAge: number,
     expireAt: number,
     buffer: Buffer,

server/lib/notifications/agents/discord.ts

@@ -4,6 +4,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentDiscord } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -291,39 +292,23 @@ class DiscordAgent
         }
       }
 
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          username: settings.options.botUsername
-            ? settings.options.botUsername
-            : getSettings().main.applicationTitle,
-          avatar_url: settings.options.botAvatarUrl,
-          embeds: [this.buildEmbed(type, payload)],
-          content: userMentions.join(' '),
-        } as DiscordWebhookPayload),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(settings.options.webhookUrl, {
+        username: settings.options.botUsername
+          ? settings.options.botUsername
+          : getSettings().main.applicationTitle,
+        avatar_url: settings.options.botAvatarUrl,
+        embeds: [this.buildEmbed(type, payload)],
+        content: userMentions.join(' '),
+      } as DiscordWebhookPayload);
 
       return true;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Error sending Discord notification', {
         label: 'Notifications',
         type: Notification[type],
         subject: payload.subject,
         errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
       });
 
       return false;

server/lib/notifications/agents/gotify.ts

@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentGotify } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -132,32 +133,16 @@ class GotifyAgent
       const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
       const notificationPayload = this.getNotificationPayload(type, payload);
 
-      const response = await fetch(endpoint, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(notificationPayload),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(endpoint, notificationPayload);
 
       return true;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Error sending Gotify notification', {
         label: 'Notifications',
         type: Notification[type],
         subject: payload.subject,
         errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
       });
 
       return false;

server/lib/notifications/agents/lunasea.ts

@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentLunaSea } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -100,39 +101,28 @@ class LunaSeaAgent
     });
 
     try {
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: settings.options.profileName
+      await axios.post(
+        settings.options.webhookUrl,
+        this.buildPayload(type, payload),
+        settings.options.profileName
           ? {
-              'Content-Type': 'application/json',
+              headers: {
+                Authorization: `Basic ${Buffer.from(
+                  `${settings.options.profileName}:`
+                ).toString('base64')}`,
+              },
             }
-          : {
-              'Content-Type': 'application/json',
-              Authorization: `Basic ${Buffer.from(
-                `${settings.options.profileName}:`
-              ).toString('base64')}`,
-            },
-        body: JSON.stringify(this.buildPayload(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+          : undefined
+      );
 
       return true;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Error sending LunaSea notification', {
         label: 'Notifications',
         type: Notification[type],
         subject: payload.subject,
         errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
       });
 
       return false;

server/lib/notifications/agents/pushbullet.ts

@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushbullet } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -122,34 +123,22 @@ class PushbulletAgent
       });
 
       try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'Access-Token': settings.options.accessToken,
-          },
-          body: JSON.stringify({
-            ...notificationPayload,
-            channel_tag: settings.options.channelTag,
-          }),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
+        await axios.post(
+          endpoint,
+          { ...notificationPayload, channel_tag: settings.options.channelTag },
+          {
+            headers: {
+              'Access-Token': settings.options.accessToken,
+            },
+          }
+        );
       } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
         logger.error('Error sending Pushbullet notification', {
           label: 'Notifications',
           type: Notification[type],
           subject: payload.subject,
           errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
         });
 
         return false;
@@ -174,32 +163,19 @@ class PushbulletAgent
         });
 
         try {
-          const response = await fetch(endpoint, {
-            method: 'POST',
+          await axios.post(endpoint, notificationPayload, {
             headers: {
-              'Content-Type': 'application/json',
               'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
             },
-            body: JSON.stringify(notificationPayload),
           });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
         } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
           logger.error('Error sending Pushbullet notification', {
             label: 'Notifications',
             recipient: payload.notifyUser.displayName,
             type: Notification[type],
             subject: payload.subject,
             errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
           });
 
           return false;
@@ -235,32 +211,19 @@ class PushbulletAgent
               });
 
               try {
-                const response = await fetch(endpoint, {
-                  method: 'POST',
+                await axios.post(endpoint, notificationPayload, {
                   headers: {
-                    'Content-Type': 'application/json',
                     'Access-Token': user.settings.pushbulletAccessToken,
                   },
-                  body: JSON.stringify(notificationPayload),
                 });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
               } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                 logger.error('Error sending Pushbullet notification', {
                   label: 'Notifications',
                   recipient: user.displayName,
                   type: Notification[type],
                   subject: payload.subject,
                   errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                 });
 
                 return false;

server/lib/notifications/agents/pushover.ts

@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushover } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -51,15 +52,12 @@ class PushoverAgent
     imageUrl: string
   ): Promise<Partial<PushoverImagePayload>> {
     try {
-      const response = await fetch(imageUrl);
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
-      const arrayBuffer = await response.arrayBuffer();
-      const base64 = Buffer.from(arrayBuffer).toString('base64');
+      const response = await axios.get(imageUrl, {
+        responseType: 'arraybuffer',
+      });
+      const base64 = Buffer.from(response.data, 'binary').toString('base64');
       const contentType = (
-        response.headers.get('Content-Type') ||
-        response.headers.get('content-type')
+        response.headers['Content-Type'] || response.headers['content-type']
       )?.toString();
 
       return {
@@ -67,17 +65,10 @@ class PushoverAgent
         attachment_type: contentType,
       };
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Error getting image payload', {
         label: 'Notifications',
         errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
       });
       return {};
     }
@@ -210,35 +201,19 @@ class PushoverAgent
       });
 
       try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            ...notificationPayload,
-            token: settings.options.accessToken,
-            user: settings.options.userToken,
-            sound: settings.options.sound,
-          } as PushoverPayload),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
+        await axios.post(endpoint, {
+          ...notificationPayload,
+          token: settings.options.accessToken,
+          user: settings.options.userToken,
+          sound: settings.options.sound,
+        } as PushoverPayload);
       } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
         logger.error('Error sending Pushover notification', {
           label: 'Notifications',
           type: Notification[type],
           subject: payload.subject,
           errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
         });
 
         return false;
@@ -266,36 +241,20 @@ class PushoverAgent
         });
 
         try {
-          const response = await fetch(endpoint, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              ...notificationPayload,
-              token: payload.notifyUser.settings.pushoverApplicationToken,
-              user: payload.notifyUser.settings.pushoverUserKey,
-              sound: payload.notifyUser.settings.pushoverSound,
-            } as PushoverPayload),
-          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
+          await axios.post(endpoint, {
+            ...notificationPayload,
+            token: payload.notifyUser.settings.pushoverApplicationToken,
+            user: payload.notifyUser.settings.pushoverUserKey,
+            sound: payload.notifyUser.settings.pushoverSound,
+          } as PushoverPayload);
         } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
           logger.error('Error sending Pushover notification', {
             label: 'Notifications',
             recipient: payload.notifyUser.displayName,
             type: Notification[type],
             subject: payload.subject,
             errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
           });
 
           return false;
@@ -332,35 +291,19 @@ class PushoverAgent
               });
 
               try {
-                const response = await fetch(endpoint, {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
-                    ...notificationPayload,
-                    token: user.settings.pushoverApplicationToken,
-                    user: user.settings.pushoverUserKey,
-                  } as PushoverPayload),
-                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
+                await axios.post(endpoint, {
+                  ...notificationPayload,
+                  token: user.settings.pushoverApplicationToken,
+                  user: user.settings.pushoverUserKey,
+                } as PushoverPayload);
               } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                 logger.error('Error sending Pushover notification', {
                   label: 'Notifications',
                   recipient: user.displayName,
                   type: Notification[type],
                   subject: payload.subject,
                   errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                 });
 
                 return false;

server/lib/notifications/agents/slack.ts

@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentSlack } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -237,32 +238,19 @@ class SlackAgent
       subject: payload.subject,
     });
     try {
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(this.buildEmbed(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(
+        settings.options.webhookUrl,
+        this.buildEmbed(type, payload)
+      );
 
       return true;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Error sending Slack notification', {
         label: 'Notifications',
         type: Notification[type],
         subject: payload.subject,
         errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
       });
 
       return false;

server/lib/notifications/agents/telegram.ts

@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentTelegram } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -174,34 +175,18 @@ class TelegramAgent
       });
 
       try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            ...notificationPayload,
-            chat_id: settings.options.chatId,
-            disable_notification: !!settings.options.sendSilently,
-          } as TelegramMessagePayload | TelegramPhotoPayload),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
+        await axios.post(endpoint, {
+          ...notificationPayload,
+          chat_id: settings.options.chatId,
+          disable_notification: !!settings.options.sendSilently,
+        } as TelegramMessagePayload | TelegramPhotoPayload);
       } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
         logger.error('Error sending Telegram notification', {
           label: 'Notifications',
           type: Notification[type],
           subject: payload.subject,
           errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
         });
 
         return false;
@@ -225,36 +210,20 @@ class TelegramAgent
         });
 
         try {
-          const response = await fetch(endpoint, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              ...notificationPayload,
-              chat_id: payload.notifyUser.settings.telegramChatId,
-              disable_notification:
-                !!payload.notifyUser.settings.telegramSendSilently,
-            } as TelegramMessagePayload | TelegramPhotoPayload),
-          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
+          await axios.post(endpoint, {
+            ...notificationPayload,
+            chat_id: payload.notifyUser.settings.telegramChatId,
+            disable_notification:
+              !!payload.notifyUser.settings.telegramSendSilently,
+          } as TelegramMessagePayload | TelegramPhotoPayload);
         } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
           logger.error('Error sending Telegram notification', {
             label: 'Notifications',
             recipient: payload.notifyUser.displayName,
             type: Notification[type],
             subject: payload.subject,
             errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
           });
 
           return false;
@@ -288,35 +257,19 @@ class TelegramAgent
               });
 
               try {
-                const response = await fetch(endpoint, {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
-                    ...notificationPayload,
-                    chat_id: user.settings.telegramChatId,
-                    disable_notification: !!user.settings?.telegramSendSilently,
-                  } as TelegramMessagePayload | TelegramPhotoPayload),
-                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
+                await axios.post(endpoint, {
+                  ...notificationPayload,
+                  chat_id: user.settings.telegramChatId,
+                  disable_notification: !!user.settings?.telegramSendSilently,
+                } as TelegramMessagePayload | TelegramPhotoPayload);
               } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                 logger.error('Error sending Telegram notification', {
                   label: 'Notifications',
                   recipient: user.displayName,
                   type: Notification[type],
                   subject: payload.subject,
                   errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                 });
 
                 return false;

server/lib/notifications/agents/webhook.ts

@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentWebhook } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { get } from 'lodash';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
@@ -177,35 +178,26 @@ class WebhookAgent
     });
 
     try {
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          ...(settings.options.authHeader
-            ? { Authorization: settings.options.authHeader }
-            : {}),
-        },
-        body: JSON.stringify(this.buildPayload(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(
+        settings.options.webhookUrl,
+        this.buildPayload(type, payload),
+        settings.options.authHeader
+          ? {
+              headers: {
+                Authorization: settings.options.authHeader,
+              },
+            }
+          : undefined
+      );
 
       return true;
     } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
       logger.error('Error sending webhook notification', {
         label: 'Notifications',
         type: Notification[type],
         subject: payload.subject,
         errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
       });
 
       return false;

server/lib/scanners/jellyfin/index.ts

@@ -582,7 +582,12 @@ class JellyfinScanner {
       const userRepository = getRepository(User);
       const admin = await userRepository.findOne({
         where: { id: 1 },
-        select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinUserId',
+          'jellyfinDeviceId',
+        ],
         order: { id: 'ASC' },
       });
 
@@ -590,9 +595,11 @@ class JellyfinScanner {
         return this.log('No admin configured. Jellyfin sync skipped.', 'warn');
       }
 
+      const hostname = getHostname();
+
       this.jfClient = new JellyfinAPI(
-        getHostname(),
-        settings.jellyfin.apiKey,
+        hostname,
+        admin.jellyfinAuthToken,
         admin.jellyfinDeviceId
       );
 

server/lib/settings/index.ts

@@ -47,7 +47,6 @@ export interface JellyfinSettings {
   jellyfinForgotPasswordUrl?: string;
   libraries: Library[];
   serverId: string;
-  apiKey: string;
 }
 export interface TautulliSettings {
   hostname?: string;
@@ -343,7 +342,6 @@ class Settings {
         jellyfinForgotPasswordUrl: '',
         libraries: [],
         serverId: '',
-        apiKey: '',
       },
       tautulli: {},
       radarr: [],
@@ -631,7 +629,7 @@ class Settings {
    * @param overrideSettings If passed in, will override all existing settings with these
    * values
    */
-  public async load(overrideSettings?: AllSettings): Promise<Settings> {
+  public load(overrideSettings?: AllSettings): Settings {
     if (overrideSettings) {
       this.data = overrideSettings;
       return this;
@@ -644,7 +642,7 @@ class Settings {
 
     if (data) {
       const parsedJson = JSON.parse(data);
-      this.data = await runMigrations(parsedJson);
+      this.data = runMigrations(parsedJson);
 
       this.data = merge(this.data, parsedJson);
 

server/lib/settings/migrations/0002_migrate_apitokens.ts

@@ -1,36 +0,0 @@
-import JellyfinAPI from '@server/api/jellyfin';
-import { MediaServerType } from '@server/constants/server';
-import { getRepository } from '@server/datasource';
-import { User } from '@server/entity/User';
-import type { AllSettings } from '@server/lib/settings';
-import { getHostname } from '@server/utils/getHostname';
-
-const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
-  const mediaServerType = settings.main.mediaServerType;
-  if (
-    !settings.jellyfin.apiKey &&
-    (mediaServerType === MediaServerType.JELLYFIN ||
-      mediaServerType === MediaServerType.EMBY)
-  ) {
-    const userRepository = getRepository(User);
-    const admin = await userRepository.findOne({
-      where: { id: 1 },
-      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-    if (!admin) {
-      return settings;
-    }
-    const jellyfinClient = new JellyfinAPI(
-      getHostname(settings.jellyfin),
-      admin.jellyfinAuthToken,
-      admin.jellyfinDeviceId
-    );
-    jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-    settings.jellyfin.apiKey = apiKey;
-  }
-  return settings;
-};
-
-export default migrateApiTokens;

server/lib/settings/migrator.ts

@@ -1,13 +1,10 @@
 import type { AllSettings } from '@server/lib/settings';
-import logger from '@server/logger';
 import fs from 'fs';
 import path from 'path';
 
 const migrationsDir = path.join(__dirname, 'migrations');
 
-export const runMigrations = async (
-  settings: AllSettings
-): Promise<AllSettings> => {
+export const runMigrations = (settings: AllSettings): AllSettings => {
   const migrations = fs
     .readdirSync(migrationsDir)
     .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
@@ -16,15 +13,8 @@ export const runMigrations = async (
 
   let migrated = settings;
 
-  try {
-    for (const migration of migrations) {
-      migrated = await migration(migrated);
-    }
-  } catch (e) {
-    logger.error(
-      `Something went wrong while running settings migrations: ${e.message}`,
-      { label: 'Settings Migrator' }
-    );
+  for (const migration of migrations) {
+    migrated = migration(migrated);
   }
 
   return migrated;

server/models/Movie.ts

@@ -85,7 +85,6 @@ export interface MovieDetails {
   mediaUrl?: string;
   watchProviders?: WatchProviders[];
   keywords: Keyword[];
-  onUserWatchlist?: boolean;
 }
 
 export const mapProductionCompany = (
@@ -102,8 +101,7 @@ export const mapProductionCompany = (
 
 export const mapMovieDetails = (
   movie: TmdbMovieDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): MovieDetails => ({
   id: movie.id,
   adult: movie.adult,
@@ -150,5 +148,4 @@ export const mapMovieDetails = (
     id: keyword.id,
     name: keyword.name,
   })),
-  onUserWatchlist: userWatchlist,
 });

server/models/Tv.ts

@@ -111,7 +111,6 @@ export interface TvDetails {
   keywords: Keyword[];
   mediaInfo?: Media;
   watchProviders?: WatchProviders[];
-  onUserWatchlist?: boolean;
 }
 
 const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
@@ -162,8 +161,7 @@ export const mapNetwork = (network: TmdbNetwork): TvNetwork => ({
 
 export const mapTvDetails = (
   show: TmdbTvDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): TvDetails => ({
   createdBy: show.created_by,
   episodeRunTime: show.episode_run_time,
@@ -225,5 +223,4 @@ export const mapTvDetails = (
   })),
   mediaInfo: media,
   watchProviders: mapWatchProviders(show['watch/providers']?.results ?? {}),
-  onUserWatchlist: userWatchlist,
 });

server/routes/auth.ts

@@ -6,7 +6,6 @@ import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
 import { startJobs } from '@server/job/schedule';
-import ImageProxy from '@server/lib/imageproxy';
 import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
@@ -321,28 +320,18 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
       // with admin permission
       settings.main.mediaServerType = MediaServerType.JELLYFIN;
       user = new User({
-        email: body.email || account.User.Name,
+        email: body.email,
         jellyfinUsername: account.User.Name,
         jellyfinUserId: account.User.Id,
         jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
         permissions: Permission.ADMIN,
         avatar: account.User.PrimaryImageTag
           ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-          : gravatarUrl(body.email || account.User.Name, {
-              default: 'mm',
-              size: 200,
-            }),
+          : gravatarUrl(body.email ?? '', { default: 'mm', size: 200 }),
         userType: UserType.JELLYFIN,
       });
 
-      // Create an API key on Jellyfin from this admin user
-      const jellyfinClient = new JellyfinAPI(
-        hostname,
-        account.AccessToken,
-        deviceId
-      );
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-
       const serverName = await jellyfinserver.getServerName();
 
       settings.jellyfin.name = serverName;
@@ -351,7 +340,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
       settings.jellyfin.port = body.port ?? 8096;
       settings.jellyfin.urlBase = body.urlBase ?? '';
       settings.jellyfin.useSsl = body.useSsl ?? false;
-      settings.jellyfin.apiKey = apiKey;
       settings.save();
       startJobs();
 
@@ -375,25 +363,18 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
           jellyfinUsername: account.User.Name,
         }
       );
+      // Let's check if their authtoken is up to date
+      if (user.jellyfinAuthToken !== account.AccessToken) {
+        user.jellyfinAuthToken = account.AccessToken;
+      }
       // Update the users avatar with their jellyfin profile pic (incase it changed)
       if (account.User.PrimaryImageTag) {
-        const avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
-        if (avatar !== user.avatar) {
-          const avatarProxy = new ImageProxy('avatar', '');
-          avatarProxy.clearCachedImage(user.avatar);
-        }
-        user.avatar = avatar;
+        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
       } else {
-        const avatar = gravatarUrl(user.email || account.User.Name, {
+        user.avatar = gravatarUrl(user.email, {
           default: 'mm',
           size: 200,
         });
-
-        if (avatar !== user.avatar) {
-          const avatarProxy = new ImageProxy('avatar', '');
-          avatarProxy.clearCachedImage(user.avatar);
-        }
-        user.avatar = avatar;
       }
       user.jellyfinUsername = account.User.Name;
 
@@ -432,18 +413,20 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         }
       );
 
+      if (!body.email) {
+        throw new Error('add_email');
+      }
+
       user = new User({
         email: body.email,
         jellyfinUsername: account.User.Name,
         jellyfinUserId: account.User.Id,
         jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
         permissions: settings.main.defaultPermissions,
         avatar: account.User.PrimaryImageTag
           ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-          : gravatarUrl(body.email || account.User.Name, {
-              default: 'mm',
-              size: 200,
-            }),
+          : gravatarUrl(body.email, { default: 'mm', size: 200 }),
         userType: UserType.JELLYFIN,
       });
       //initialize Jellyfin/Emby users with local login
@@ -747,7 +730,6 @@ authRoutes.post('/reset-password/:guid', async (req, res, next) => {
     });
   }
   user.recoveryLinkExpirationDate = null;
-  await user.setPassword(req.body.password);
   userRepository.save(user);
   logger.info('Successfully reset password', {
     label: 'API',

server/routes/avatarproxy.ts

@@ -1,31 +0,0 @@
-import ImageProxy from '@server/lib/imageproxy';
-import logger from '@server/logger';
-import { Router } from 'express';
-
-const router = Router();
-
-const avatarImageProxy = new ImageProxy('avatar', '');
-// Proxy avatar images
-router.get('/*', async (req, res) => {
-  const imagePath = req.url.startsWith('/') ? req.url.slice(1) : req.url;
-  try {
-    const imageData = await avatarImageProxy.getImage(imagePath);
-
-    res.writeHead(200, {
-      'Content-Type': `image/${imageData.meta.extension}`,
-      'Content-Length': imageData.imageBuffer.length,
-      'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
-      'OS-Cache-Key': imageData.meta.cacheKey,
-      'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
-    });
-
-    res.end(imageData.imageBuffer);
-  } catch (e) {
-    logger.error('Failed to proxy avatar image', {
-      imagePath,
-      errorMessage: e.message,
-    });
-  }
-});
-
-export default router;

server/routes/imageproxy.ts

@@ -5,6 +5,7 @@ import { Router } from 'express';
 const router = Router();
 const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
   rateLimitOptions: {
+    maxRequests: 20,
     maxRPS: 50,
   },
 });

server/routes/movie.ts

@@ -3,9 +3,7 @@ import RottenTomatoes from '@server/api/rating/rottentomatoes';
 import { type RatingResponse } from '@server/api/ratings';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import { Watchlist } from '@server/entity/Watchlist';
 import logger from '@server/logger';
 import { mapMovieDetails } from '@server/models/Movie';
 import { mapMovieResult } from '@server/models/Search';
@@ -24,24 +22,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
 
     const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
 
-    const onUserWatchlist = await getRepository(Watchlist).exist({
-      where: {
-        tmdbId: Number(req.params.id),
-        requestedBy: {
-          id: req.user?.id,
-        },
-      },
-    });
-
-    const data = mapMovieDetails(tmdbMovie, media, onUserWatchlist);
-
-    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
-    if (!data.overview) {
-      const tvEnglish = await tmdb.getMovie({ movieId: Number(req.params.id) });
-      data.overview = tvEnglish.overview;
-    }
-
-    return res.status(200).json(data);
+    return res.status(200).json(mapMovieDetails(tmdbMovie, media));
   } catch (e) {
     logger.debug('Something went wrong retrieving movie', {
       label: 'API',

server/routes/request.ts

@@ -1,5 +1,3 @@
-import RadarrAPI from '@server/api/servarr/radarr';
-import SonarrAPI from '@server/api/servarr/sonarr';
 import {
   MediaRequestStatus,
   MediaStatus,
@@ -21,7 +19,6 @@ import type {
   RequestResultsResponse,
 } from '@server/interfaces/api/requestInterfaces';
 import { Permission } from '@server/lib/permissions';
-import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { Router } from 'express';
@@ -146,62 +143,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
         .skip(skip)
         .getManyAndCount();
 
-      const settings = getSettings();
-
-      // get all quality profiles for every configured sonarr server
-      const sonarrServers = await Promise.all(
-        settings.sonarr.map(async (sonarrSetting) => {
-          const sonarr = new SonarrAPI({
-            apiKey: sonarrSetting.apiKey,
-            url: SonarrAPI.buildUrl(sonarrSetting, '/api/v3'),
-          });
-
-          return {
-            id: sonarrSetting.id,
-            profiles: await sonarr.getProfiles(),
-          };
-        })
-      );
-
-      // get all quality profiles for every configured radarr server
-      const radarrServers = await Promise.all(
-        settings.radarr.map(async (radarrSetting) => {
-          const radarr = new RadarrAPI({
-            apiKey: radarrSetting.apiKey,
-            url: RadarrAPI.buildUrl(radarrSetting, '/api/v3'),
-          });
-
-          return {
-            id: radarrSetting.id,
-            profiles: await radarr.getProfiles(),
-          };
-        })
-      );
-
-      // add profile names to the media requests, with undefined if not found
-      const requestsWithProfileNames = requests.map((r) => {
-        switch (r.type) {
-          case MediaType.MOVIE: {
-            const profileName = radarrServers
-              .find((serverr) => serverr.id === r.serverId)
-              ?.profiles.find((profile) => profile.id === r.profileId)?.name;
-
-            return {
-              ...r,
-              profileName,
-            };
-          }
-          case MediaType.TV: {
-            return {
-              ...r,
-              profileName: sonarrServers
-                .find((serverr) => serverr.id === r.serverId)
-                ?.profiles.find((profile) => profile.id === r.profileId)?.name,
-            };
-          }
-        }
-      });
-
       return res.status(200).json({
         pageInfo: {
           pages: Math.ceil(requestCount / pageSize),
@@ -209,7 +150,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
           results: requestCount,
           page: Math.ceil(skip / pageSize) + 1,
         },
-        results: requestsWithProfileNames,
+        results: requests,
       });
     } catch (e) {
       next({ status: 500, message: e.message });

server/routes/settings/index.ts

@@ -262,7 +262,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
   try {
     const admin = await userRepository.findOneOrFail({
       where: { id: 1 },
-      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
       order: { id: 'ASC' },
     });
 
@@ -270,7 +270,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
 
     const jellyfinClient = new JellyfinAPI(
       getHostname(tempJellyfinSettings),
-      tempJellyfinSettings.apiKey,
+      admin.jellyfinAuthToken ?? '',
       admin.jellyfinDeviceId ?? ''
     );
 
@@ -318,13 +318,13 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
   if (req.query.sync) {
     const userRepository = getRepository(User);
     const admin = await userRepository.findOneOrFail({
-      select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+      select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
       where: { id: 1 },
       order: { id: 'ASC' },
     });
     const jellyfinClient = new JellyfinAPI(
       getHostname(),
-      settings.jellyfin.apiKey,
+      admin.jellyfinAuthToken ?? '',
       admin.jellyfinDeviceId ?? ''
     );
 
@@ -376,8 +376,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
 });
 
 settingsRoutes.get('/jellyfin/users', async (req, res) => {
-  const settings = getSettings();
-  const { externalHostname } = settings.jellyfin;
+  const { externalHostname } = getSettings().jellyfin;
   const jellyfinHost =
     externalHostname && externalHostname.length > 0
       ? externalHostname
@@ -385,13 +384,12 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
 
   const userRepository = getRepository(User);
   const admin = await userRepository.findOneOrFail({
-    select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+    select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
     where: { id: 1 },
     order: { id: 'ASC' },
   });
   const jellyfinClient = new JellyfinAPI(
-    getHostname(),
-    settings.jellyfin.apiKey,
+    admin.jellyfinAuthToken ?? '',
     admin.jellyfinDeviceId ?? ''
   );
 
@@ -746,13 +744,11 @@ settingsRoutes.get('/cache', async (_req, res) => {
   }));
 
   const tmdbImageCache = await ImageProxy.getImageStats('tmdb');
-  const avatarImageCache = await ImageProxy.getImageStats('avatar');
 
   return res.status(200).json({
     apiCaches,
     imageCache: {
       tmdb: tmdbImageCache,
-      avatar: avatarImageCache,
     },
   });
 });

server/routes/tv.ts

@@ -1,9 +1,7 @@
 import RottenTomatoes from '@server/api/rating/rottentomatoes';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import { Watchlist } from '@server/entity/Watchlist';
 import logger from '@server/logger';
 import { mapTvResult } from '@server/models/Search';
 import { mapSeasonWithEpisodes, mapTvDetails } from '@server/models/Tv';
@@ -21,24 +19,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
 
     const media = await Media.getMedia(tv.id, MediaType.TV);
 
-    const onUserWatchlist = await getRepository(Watchlist).exist({
-      where: {
-        tmdbId: Number(req.params.id),
-        requestedBy: {
-          id: req.user?.id,
-        },
-      },
-    });
-
-    const data = mapTvDetails(tv, media, onUserWatchlist);
-
-    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
-    if (!data.overview) {
-      const tvEnglish = await tmdb.getTvShow({ tvId: Number(req.params.id) });
-      data.overview = tvEnglish.overview;
-    }
-
-    return res.status(200).json(data);
+    return res.status(200).json(mapTvDetails(tv, media));
   } catch (e) {
     logger.debug('Something went wrong retrieving series', {
       label: 'API',

server/routes/user/index.ts

@@ -41,19 +41,7 @@ router.get('/', async (req, res, next) => {
         break;
       case 'displayname':
         query = query.orderBy(
-          `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
-             CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
-               CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
-                 user.email
-               ELSE
-                 LOWER(user.jellyfinUsername)
-               END)
-             ELSE
-               LOWER(user.jellyfinUsername)
-             END)
-           ELSE
-             LOWER(user.username)
-           END`,
+          "(CASE WHEN (user.username IS NULL OR user.username = '') THEN (CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN user.email ELSE LOWER(user.plexUsername) END) ELSE LOWER(user.username) END)",
           'ASC'
         );
         break;
@@ -102,13 +90,12 @@ router.post(
       const settings = getSettings();
 
       const body = req.body;
-      const email = body.email || body.username;
       const userRepository = getRepository(User);
 
       const existingUser = await userRepository
         .createQueryBuilder('user')
         .where('user.email = :email', {
-          email: email.toLowerCase(),
+          email: body.email.toLowerCase(),
         })
         .getOne();
 
@@ -121,7 +108,7 @@ router.post(
       }
 
       const passedExplicitPassword = body.password && body.password.length > 0;
-      const avatar = gravatarUrl(email, { default: 'mm', size: 200 });
+      const avatar = gravatarUrl(body.email, { default: 'mm', size: 200 });
 
       if (
         !passedExplicitPassword &&
@@ -131,9 +118,9 @@ router.post(
       }
 
       const user = new User({
-        email,
         avatar: body.avatar ?? avatar,
         username: body.username,
+        email: body.email,
         password: body.password,
         permissions: settings.main.defaultPermissions,
         plexToken: '',
@@ -501,14 +488,16 @@ router.post(
       // taken from auth.ts
       const admin = await userRepository.findOneOrFail({
         where: { id: 1 },
-        select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinDeviceId',
+          'jellyfinUserId',
+        ],
         order: { id: 'ASC' },
       });
-
-      const hostname = getHostname();
       const jellyfinClient = new JellyfinAPI(
-        hostname,
-        settings.jellyfin.apiKey,
+        admin.jellyfinAuthToken ?? '',
         admin.jellyfinDeviceId ?? ''
       );
       jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
@@ -516,6 +505,7 @@ router.post(
       //const jellyfinUsersResponse = await jellyfinClient.getUsers();
       const createdUsers: User[] = [];
       const { externalHostname } = getSettings().jellyfin;
+      const hostname = getHostname();
 
       const jellyfinHost =
         externalHostname && externalHostname.length > 0

server/routes/user/usersettings.ts

@@ -98,9 +98,7 @@ userSettingsRoutes.post<
     }
 
     user.username = req.body.username;
-    if (user.jellyfinUsername) {
-      user.email = req.body.email || user.jellyfinUsername || user.email;
-    }
+    user.email = req.body.email ?? user.email;
 
     // Update quota values only if the user has the correct permissions
     if (

server/utils/rateLimit.ts

@@ -1,68 +0,0 @@
-export type RateLimitOptions = {
-  maxRPS: number;
-  id?: string;
-};
-
-type RateLimiteState<T extends (...args: Parameters<T>) => Promise<U>, U> = {
-  queue: {
-    args: Parameters<T>;
-    resolve: (value: U) => void;
-    reject: (reason?: unknown) => void;
-  }[];
-  lastTimestamps: number[];
-  timeout: ReturnType<typeof setTimeout>;
-};
-
-const rateLimitById: Record<string, unknown> = {};
-
-/**
- * Add a rate limit to a function so it doesn't exceed a maximum number of requests per second. Function calls exceeding the rate will be delayed.
- * @param fn The function to rate limit
- * @param options.maxRPS Maximum number of Requests Per Second
- * @param options.id An ID to share between rate limits, so it uses the same request queue.
- * @returns The function with a rate limit
- */
-export default function rateLimit<
-  T extends (...args: Parameters<T>) => Promise<U>,
-  U
->(fn: T, options: RateLimitOptions): (...args: Parameters<T>) => Promise<U> {
-  const state: RateLimiteState<T, U> = (rateLimitById[
-    options.id || ''
-  ] as RateLimiteState<T, U>) || { queue: [], lastTimestamps: [] };
-  if (options.id) {
-    rateLimitById[options.id] = state;
-  }
-
-  const processQueue = () => {
-    // remove old timestamps
-    state.lastTimestamps = state.lastTimestamps.filter(
-      (timestamp) => Date.now() - timestamp < 1000
-    );
-
-    if (state.lastTimestamps.length < options.maxRPS) {
-      // process requests if RPS not exceeded
-      const item = state.queue.shift();
-      if (!item) return;
-      state.lastTimestamps.push(Date.now());
-      const { args, resolve, reject } = item;
-      fn(...args)
-        .then(resolve)
-        .catch(reject);
-      processQueue();
-    } else {
-      // rerun once the oldest item in queue is older than 1s
-      if (state.timeout) clearTimeout(state.timeout);
-      state.timeout = setTimeout(
-        processQueue,
-        1000 - (Date.now() - state.lastTimestamps[0])
-      );
-    }
-  };
-
-  return (...args: Parameters<T>): Promise<U> => {
-    return new Promise<U>((resolve, reject) => {
-      state.queue.push({ args, resolve, reject });
-      processQueue();
-    });
-  };
-}

src/assets/services/plex.svg

@@ -1,85 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:cc="http://creativecommons.org/ns#"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:svg="http://www.w3.org/2000/svg"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  version="1.1"
-  id="plex-logo"
-  x="0px"
-  y="0px"
-  viewBox="0 0 1000 460.89727"
-  xml:space="preserve"
-  sodipodi:docname="plex-logo.svg"
-  inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
-   id="metadata25"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs23">
-	</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#111111"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1017"
-   id="namedview21"
-   showgrid="false"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:zoom="0.27956081"
-   inkscape:cx="783.06912"
-   inkscape:cy="-132.85701"
-   inkscape:window-x="1912"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="plex-logo" />
-<style
-   type="text/css"
-   id="style2">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#EBAF00;}
-</style>
-<path
-   class="st0"
-   d="m 164.18919,82.43243 c -39.86487,0 -65.540543,11.48648 -87.162163,38.51351 V 91.21621 H 0 v 366.21621 c 0,0 1.3513514,0.67567 5.4054053,1.35135 5.4054057,1.35135 33.7837827,7.43243 54.7297287,-10.13514 18.243244,-15.54054 22.297295,-33.78378 22.297295,-54.05405 v -52.7027 c 22.297301,23.64864 47.297301,33.78378 82.432431,33.78378 75.67567,0 133.78378,-61.48648 133.78378,-143.24323 0,-88.51352 -56.08108,-150 -134.45945,-150 z m -14.86487,223.64864 c -42.56756,0 -76.351351,-35.13513 -76.351351,-77.7027 0,-41.89189 39.864871,-75.67567 76.351351,-75.67567 43.24324,0 76.35135,33.1081 76.35135,76.35135 0,43.24324 -33.78378,77.02702 -76.35135,77.02702 z"
-   id="path4"
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;stroke-width:6.75675678" /><path
-   class="st0"
-   d="m 408.1081,223.64864 c 0,31.75676 3.37838,70.27027 34.45946,112.16216 0.67567,0.67567 2.02702,2.7027 2.02702,2.7027 -12.83783,21.62162 -28.37837,36.48648 -49.32432,36.48648 -16.21622,0 -32.43243,-8.78378 -45.94595,-23.64864 -14.18918,-16.21622 -20.94594,-37.16216 -20.94594,-59.45946 V 0 h 79.05405 z"
-   id="path6"
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;stroke-width:6.75675678" /><polygon
-   class="st1"
-   points="117.9,33.9 104.1,13.5 118.3,13.5 132,33.9 118.3,54.2 104.1,54.2 "
-   id="polygon8"
-   style="fill:#ebaf00"
-   transform="scale(6.7567568)" /><polygon
-   class="st0"
-   points="135.7,31.6 148,13.5 133.8,13.5 128.7,21 "
-   id="polygon10"
-   style="fill:#ffffff"
-   transform="scale(6.7567568)" /><path
-   class="st0"
-   d="m 869.59458,316.2162 c 0,0 16.2162,22.2973 16.2162,22.2973 15.54058,24.32432 35.8108,36.48648 59.45949,36.48648 25,-0.67567 42.56752,-22.29729 49.3243,-30.4054 0,0 -12.16218,-10.81081 -27.7027,-29.05405 -20.94598,-24.32432 -48.64868,-68.91892 -49.3243,-70.94594 z"
-   id="path12"
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;stroke-width:6.75675678" /><path
-   style="fill:#ffffff;stroke-width:6.75675678"
-   inkscape:connector-curvature="0"
-   id="path16"
-   d="m 632.43242,287.16215 c -16.21622,14.86486 -27.02703,22.97297 -49.32432,22.97297 -39.86487,0 -62.83784,-28.37837 -66.21622,-59.45945 h 211.4865 c 1.35131,-4.05406 2.027,-9.45946 2.027,-18.24324 0,-85.81082 -62.83783,-150 -145.27026,-150 -78.37837,0 -142.56756,65.54054 -142.56756,147.29729 0,81.08108 64.18919,145.27026 144.59459,145.27026 56.08108,0 104.72973,-31.75675 131.08105,-87.83783 z M 585.8108,147.29729 c 35.13513,0 61.48648,22.97297 67.56756,53.37838 H 519.59458 c 6.75676,-31.75676 31.75676,-53.37838 66.21622,-53.37838 z"
-   class="st0" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320.03 103.61"><defs><style>.cls-1{fill:#fff}.cls-2{fill:url(#a)}.cls-3{fill:#e5a00d}</style><radialGradient id="a" cx="258.33" cy="51.76" r="42.95" gradientUnits="userSpaceOnUse"><stop offset=".17" stop-color="#f9be03"/><stop offset=".51" stop-color="#e8a50b"/><stop offset="1" stop-color="#cc7c19"/></radialGradient></defs><polygon points="320.03 -.09 289.96 -.09 259.88 51.76 289.96 103.61 320.01 103.61 289.96 51.79" class="cls-1"/><polygon points="226.7 -.09 256.78 -.09 289.96 51.76 256.78 103.61 226.7 103.61 259.88 51.76" class="cls-2"/><polygon points="226.7 -.09 256.78 -.09 289.96 51.76 256.78 103.61 226.7 103.61 259.88 51.76" class="cls-3"/><path d="M216.32,103.61H156.49V-.09h59.83v18h-37.8V40.69H213.7v18H178.52V85.45h37.8Z" class="cls-1"/><path d="M82.07,103.61V-.09h22V85.45h42.07v18.16Z" class="cls-1"/><path d="M71.66,32.25Q71.66,49,61.2,57.87T31.44,66.73H22v36.88H0V-.09H33.14Q52-.09,61.83,8T71.66,32.25ZM22,48.71h7.24q10.15,0,15.18-4c3.37-2.66,5-6.56,5-11.67s-1.41-9-4.22-11.42S38,17.93,32,17.93H22Z" class="cls-1"/></svg>

src/components/Discover/CreateSlider/index.tsx

@@ -14,6 +14,7 @@ import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import type { Keyword, ProductionCompany } from '@server/models/common';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -76,9 +77,11 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
 
         const keywords = await Promise.all(
           slider.data.split(',').map(async (keywordId) => {
-            const res = await fetch(`/api/v1/keyword/${keywordId}`);
-            const keyword: Keyword = await res.json();
-            return keyword;
+            const keyword = await axios.get<Keyword>(
+              `/api/v1/keyword/${keywordId}`
+            );
+
+            return keyword.data;
           })
         );
 
@@ -95,13 +98,15 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
           return;
         }
 
-        const res = await fetch(
+        const response = await axios.get<TmdbGenre[]>(
           `/api/v1/genres/${
             slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE ? 'movie' : 'tv'
           }`
         );
-        const genres: TmdbGenre[] = await res.json();
-        const genre = genres.find((genre) => genre.id === Number(slider.data));
+
+        const genre = response.data.find(
+          (genre) => genre.id === Number(slider.data)
+        );
 
         setDefaultDataValue([
           {
@@ -116,8 +121,11 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
           return;
         }
 
-        const res = await fetch(`/api/v1/studio/${slider.data}`);
-        const studio: ProductionCompany = await res.json();
+        const response = await axios.get<ProductionCompany>(
+          `/api/v1/studio/${slider.data}`
+        );
+
+        const studio = response.data;
 
         setDefaultDataValue([
           {
@@ -160,17 +168,16 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
   );
 
   const loadKeywordOptions = async (inputValue: string) => {
-    const res = await fetch(
-      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`,
+    const results = await axios.get<TmdbKeywordSearchResponse>(
+      '/api/v1/search/keyword',
       {
-        headers: {
-          'Content-Type': 'application/json',
+        params: {
+          query: encodeURIExtraParams(inputValue),
         },
       }
     );
-    const results: TmdbKeywordSearchResponse = await res.json();
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));
@@ -181,37 +188,38 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
       return [];
     }
 
-    const res = await fetch(
-      `/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`,
+    const results = await axios.get<TmdbCompanySearchResponse>(
+      '/api/v1/search/company',
       {
-        headers: {
-          'Content-Type': 'application/json',
+        params: {
+          query: encodeURIExtraParams(inputValue),
         },
       }
     );
-    const results: TmdbCompanySearchResponse = await res.json();
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));
   };
 
   const loadMovieGenreOptions = async () => {
-    const res = await fetch('/api/v1/discover/genreslider/movie');
-    const results: GenreSliderItem[] = await res.json();
+    const results = await axios.get<GenreSliderItem[]>(
+      '/api/v1/discover/genreslider/movie'
+    );
 
-    return results.map((result) => ({
+    return results.data.map((result) => ({
       label: result.name,
       value: result.id,
     }));
   };
 
   const loadTvGenreOptions = async () => {
-    const res = await fetch('/api/v1/discover/genreslider/tv');
-    const results: GenreSliderItem[] = await res.json();
+    const results = await axios.get<GenreSliderItem[]>(
+      '/api/v1/discover/genreslider/tv'
+    );
 
-    return results.map((result) => ({
+    return results.data.map((result) => ({
       label: result.name,
       value: result.id,
     }));
@@ -306,31 +314,17 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
       onSubmit={async (values, { resetForm }) => {
         try {
           if (slider) {
-            const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
-              method: 'PUT',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                type: Number(values.sliderType),
-                title: values.title,
-                data: values.data,
-              }),
+            await axios.put(`/api/v1/settings/discover/${slider.id}`, {
+              type: Number(values.sliderType),
+              title: values.title,
+              data: values.data,
             });
-            if (!res.ok) throw new Error();
           } else {
-            const res = await fetch('/api/v1/settings/discover/add', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                type: Number(values.sliderType),
-                title: values.title,
-                data: values.data,
-              }),
+            await axios.post('/api/v1/settings/discover/add', {
+              type: Number(values.sliderType),
+              title: values.title,
+              data: values.data,
             });
-            if (!res.ok) throw new Error();
           }
 
           addToast(

src/components/Discover/DiscoverNetwork/index.tsx

@@ -48,11 +48,11 @@ const DiscoverTvNetwork = () => {
       <div className="mt-1 mb-5">
         <Header>
           {firstResultData?.network.logoPath ? (
-            <div className="relative mb-6 flex h-24 justify-center sm:h-32">
+            <div className="mb-6 flex justify-center">
               <Image
-                src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
+                src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
                 alt={firstResultData.network.name}
-                className="object-contain"
+                className="max-h-24 sm:max-h-32"
                 fill
               />
             </div>

src/components/Discover/DiscoverSliderEdit/index.tsx

@@ -20,6 +20,7 @@ import {
 } from '@heroicons/react/24/solid';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
+import axios from 'axios';
 import { useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-aria';
 import { useIntl } from 'react-intl';
@@ -77,10 +78,7 @@ const DiscoverSliderEdit = ({
 
   const deleteSlider = async () => {
     try {
-      const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
+      await axios.delete(`/api/v1/settings/discover/${slider.id}`);
       addToast(intl.formatMessage(messages.deletesuccess), {
         appearance: 'success',
         autoDismiss: true,

src/components/Discover/DiscoverStudio/index.tsx

@@ -48,11 +48,11 @@ const DiscoverMovieStudio = () => {
       <div className="mt-1 mb-5">
         <Header>
           {firstResultData?.studio.logoPath ? (
-            <div className="relative mb-6 flex h-24 justify-center sm:h-32">
+            <div className="mb-6 flex justify-center">
               <Image
-                src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
+                src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
                 alt={firstResultData.studio.name}
-                className="object-contain"
+                className="max-h-24 sm:max-h-32"
                 fill
               />
             </div>

src/components/Discover/index.tsx

@@ -28,6 +28,7 @@ import {
 } from '@heroicons/react/24/solid';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
+import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -75,14 +76,7 @@ const Discover = () => {
 
   const updateSliders = async () => {
     try {
-      const res = await fetch('/api/v1/settings/discover', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(sliders),
-      });
-      if (!res.ok) throw new Error();
+      await axios.post('/api/v1/settings/discover', sliders);
 
       addToast(intl.formatMessage(messages.updatesuccess), {
         appearance: 'success',
@@ -100,10 +94,7 @@ const Discover = () => {
 
   const resetSliders = async () => {
     try {
-      const res = await fetch('/api/v1/settings/discover/reset', {
-        method: 'GET',
-      });
-      if (!res.ok) throw new Error();
+      await axios.get('/api/v1/settings/discover/reset');
 
       addToast(intl.formatMessage(messages.resetsuccess), {
         appearance: 'success',

src/components/IssueDetails/IssueComment/index.tsx

@@ -1,12 +1,13 @@
 import Button from '@app/components/Common/Button';
-import CachedImage from '@app/components/Common/CachedImage';
 import Modal from '@app/components/Common/Modal';
 import { Permission, useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
 import type { default as IssueCommentType } from '@server/entity/IssueComment';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
+import Image from 'next/image';
 import Link from 'next/link';
 import { Fragment, useState } from 'react';
 import { FormattedRelativeTime, useIntl } from 'react-intl';
@@ -48,10 +49,7 @@ const IssueComment = ({
 
   const deleteComment = async () => {
     try {
-      const res = await fetch(`/api/v1/issueComment/${comment.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
+      await axios.delete(`/api/v1/issueComment/${comment.id}`);
     } catch (e) {
       // something went wrong deleting the comment
     } finally {
@@ -88,8 +86,8 @@ const IssueComment = ({
         </Modal>
       </Transition>
       <Link href={isActiveUser ? '/profile' : `/users/${comment.user.id}`}>
-        <CachedImage
-          src={`/avatarproxy/${comment.user.avatar}`}
+        <Image
+          src={comment.user.avatar}
           alt=""
           className="h-10 w-10 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
           width={40}
@@ -177,17 +175,9 @@ const IssueComment = ({
               <Formik
                 initialValues={{ newMessage: comment.message }}
                 onSubmit={async (values) => {
-                  const res = await fetch(
-                    `/api/v1/issueComment/${comment.id}`,
-                    {
-                      method: 'PUT',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
-                      body: JSON.stringify({ message: values.newMessage }),
-                    }
-                  );
-                  if (!res.ok) throw new Error();
+                  await axios.put(`/api/v1/issueComment/${comment.id}`, {
+                    message: values.newMessage,
+                  });
 
                   if (onUpdate) {
                     onUpdate();

src/components/IssueDetails/index.tsx

@@ -11,7 +11,7 @@ import useDeepLinks from '@app/hooks/useDeepLinks';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import ErrorPage from '@app/pages/_error';
+import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import {
@@ -27,8 +27,10 @@ import { MediaServerType } from '@server/constants/server';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import getConfig from 'next/config';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
@@ -114,7 +116,7 @@ const IssueDetails = () => {
   }
 
   if (!data || !issueData) {
-    return <ErrorPage statusCode={404} />;
+    return <Error statusCode={404} />;
   }
 
   const belongsToUser = issueData.createdBy.id === currentUser?.id;
@@ -123,14 +125,9 @@ const IssueDetails = () => {
 
   const editFirstComment = async (newMessage: string) => {
     try {
-      const res = await fetch(`/api/v1/issueComment/${firstComment.id}`, {
-        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ message: newMessage }),
+      await axios.put(`/api/v1/issueComment/${firstComment.id}`, {
+        message: newMessage,
       });
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.toasteditdescriptionsuccess), {
         appearance: 'success',
@@ -147,10 +144,7 @@ const IssueDetails = () => {
 
   const updateIssueStatus = async (newStatus: 'open' | 'resolved') => {
     try {
-      const res = await fetch(`/api/v1/issue/${issueData.id}/${newStatus}`, {
-        method: 'POST',
-      });
-      if (!res.ok) throw new Error();
+      await axios.post(`/api/v1/issue/${issueData.id}/${newStatus}`);
 
       addToast(intl.formatMessage(messages.toaststatusupdated), {
         appearance: 'success',
@@ -167,10 +161,7 @@ const IssueDetails = () => {
 
   const deleteIssue = async () => {
     try {
-      const res = await fetch(`/api/v1/issue/${issueData.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
+      await axios.delete(`/api/v1/issue/${issueData.id}`);
 
       addToast(intl.formatMessage(messages.toastissuedeleted), {
         appearance: 'success',
@@ -288,10 +279,10 @@ const IssueDetails = () => {
                   }
                   className="group ml-1 inline-flex h-full items-center xl:ml-1.5"
                 >
-                  <CachedImage
-                    src={`/avatarproxy/${issueData.createdBy.avatar}`}
-                    alt=""
+                  <Image
                     className="mr-0.5 h-5 w-5 scale-100 transform-gpu rounded-full object-cover transition duration-300 group-hover:scale-105 xl:mr-1 xl:h-6 xl:w-6"
+                    src={issueData.createdBy.avatar}
+                    alt=""
                     width={20}
                     height={20}
                   />
@@ -499,17 +490,9 @@ const IssueDetails = () => {
                 }}
                 validationSchema={CommentSchema}
                 onSubmit={async (values, { resetForm }) => {
-                  const res = await fetch(
-                    `/api/v1/issue/${issueData?.id}/comment`,
-                    {
-                      method: 'POST',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
-                      body: JSON.stringify({ message: values.message }),
-                    }
-                  );
-                  if (!res.ok) throw new Error();
+                  await axios.post(`/api/v1/issue/${issueData?.id}/comment`, {
+                    message: values.message,
+                  });
                   revalidateIssue();
                   resetForm();
                 }}

src/components/IssueModal/CreateIssueModal/index.tsx

@@ -11,6 +11,7 @@ import { MediaStatus } from '@server/constants/media';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { Field, Formik } from 'formik';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
@@ -100,22 +101,14 @@ const CreateIssueModal = ({
       validationSchema={CreateIssueModalSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/issue', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              issueType: values.selectedIssue.issueType,
-              message: values.message,
-              mediaId: data?.mediaInfo?.id,
-              problemSeason: values.problemSeason,
-              problemEpisode:
-                values.problemSeason > 0 ? values.problemEpisode : 0,
-            }),
+          const newIssue = await axios.post<Issue>('/api/v1/issue', {
+            issueType: values.selectedIssue.issueType,
+            message: values.message,
+            mediaId: data?.mediaInfo?.id,
+            problemSeason: values.problemSeason,
+            problemEpisode:
+              values.problemSeason > 0 ? values.problemEpisode : 0,
           });
-          if (!res.ok) throw new Error();
-          const newIssue: Issue = await res.json();
 
           if (data) {
             addToast(
@@ -126,7 +119,7 @@ const CreateIssueModal = ({
                     strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
                   })}
                 </div>
-                <Link href={`/issues/${newIssue.id}`} legacyBehavior>
+                <Link href={`/issues/${newIssue.data.id}`} legacyBehavior>
                   <Button as="a" className="mt-4">
                     <span>{intl.formatMessage(messages.toastviewissue)}</span>
                     <ArrowRightCircleIcon />

src/components/Layout/UserDropdown/index.tsx

@@ -1,4 +1,3 @@
-import CachedImage from '@app/components/Common/CachedImage';
 import MiniQuotaDisplay from '@app/components/Layout/UserDropdown/MiniQuotaDisplay';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
@@ -8,6 +7,8 @@ import {
   ClockIcon,
 } from '@heroicons/react/24/outline';
 import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
+import axios from 'axios';
+import Image from 'next/image';
 import type { LinkProps } from 'next/link';
 import Link from 'next/link';
 import { forwardRef, Fragment } from 'react';
@@ -38,13 +39,9 @@ const UserDropdown = () => {
   const { user, revalidate } = useUser();
 
   const logout = async () => {
-    const res = await fetch('/api/v1/auth/logout', {
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
+    const response = await axios.post('/api/v1/auth/logout');
 
-    if (data?.status === 'ok') {
+    if (response.data?.status === 'ok') {
       revalidate();
     }
   };
@@ -56,9 +53,9 @@ const UserDropdown = () => {
           className="flex max-w-xs items-center rounded-full text-sm ring-1 ring-gray-700 hover:ring-gray-500 focus:outline-none focus:ring-gray-500"
           data-testid="user-menu"
         >
-          <CachedImage
+          <Image
             className="h-8 w-8 rounded-full object-cover sm:h-10 sm:w-10"
-            src={user && user.avatar ? `/avatarproxy/${user.avatar}` : ''}
+            src={user?.avatar || ''}
             alt=""
             width={40}
             height={40}
@@ -79,9 +76,9 @@ const UserDropdown = () => {
           <div className="divide-y divide-gray-700 rounded-md bg-gray-800 bg-opacity-80 ring-1 ring-gray-700 backdrop-blur">
             <div className="flex flex-col space-y-4 px-4 py-4">
               <div className="flex items-center space-x-2">
-                <CachedImage
+                <Image
                   className="h-8 w-8 rounded-full object-cover sm:h-10 sm:w-10"
-                  src={user && user.avatar ? `/avatarproxy/${user.avatar}` : ''}
+                  src={user?.avatar || ''}
                   alt=""
                   width={40}
                   height={40}
@@ -90,11 +87,9 @@ const UserDropdown = () => {
                   <span className="truncate text-xl font-semibold text-gray-200">
                     {user?.displayName}
                   </span>
-                  {user?.displayName?.toLowerCase() !== user?.email && (
-                    <span className="truncate text-sm text-gray-400">
-                      {user?.email}
-                    </span>
-                  )}
+                  <span className="truncate text-sm text-gray-400">
+                    {user?.email}
+                  </span>
                 </div>
               </div>
               {user && <MiniQuotaDisplay userId={user?.id} />}

src/components/Layout/UserWarnings/index.tsx

@@ -17,45 +17,47 @@ interface UserWarningsProps {
 const UserWarnings: React.FC<UserWarningsProps> = ({ onClick }) => {
   const intl = useIntl();
   const { user } = useUser();
-  //check if a user has warnings
-  if (!user || !user.warnings || user.warnings.length === 0) {
+  if (!user) {
     return null;
   }
 
   let res = null;
 
-  user.warnings.forEach((warning) => {
-    let link = '';
-    let warningText = '';
-    let warningTitle = '';
-    switch (warning) {
-      case 'userEmailRequired':
-        link = '/profile/settings/';
-        warningTitle = 'Profile is incomplete';
-        warningText = intl.formatMessage(messages.emailRequired);
-    }
+  //check if a user has warnings
+  if (user.warnings.length > 0) {
+    user.warnings.forEach((warning) => {
+      let link = '';
+      let warningText = '';
+      let warningTitle = '';
+      switch (warning) {
+        case 'userEmailRequired':
+          link = '/profile/settings/';
+          warningTitle = 'Profile is incomplete';
+          warningText = intl.formatMessage(messages.emailRequired);
+      }
 
-    res = (
-      <Link
-        href={link}
-        onClick={onClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' && onClick) {
-            onClick();
-          }
-        }}
-        role="button"
-        tabIndex={0}
-        className="mx-2 mb-2 flex items-center rounded-lg bg-yellow-500 p-2 text-xs text-white ring-1 ring-gray-700 transition duration-300 hover:bg-yellow-400"
-      >
-        <ExclamationTriangleIcon className="h-6 w-6" />
-        <div className="flex min-w-0 flex-1 flex-col truncate px-2 last:pr-0">
-          <span className="font-bold">{warningTitle}</span>
-          <span className="truncate">{warningText}</span>
-        </div>
-      </Link>
-    );
-  });
+      res = (
+        <Link
+          href={link}
+          onClick={onClick}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' && onClick) {
+              onClick();
+            }
+          }}
+          role="button"
+          tabIndex={0}
+          className="mx-2 mb-2 flex items-center rounded-lg bg-yellow-500 p-2 text-xs text-white ring-1 ring-gray-700 transition duration-300 hover:bg-yellow-400"
+        >
+          <ExclamationTriangleIcon className="h-6 w-6" />
+          <div className="flex min-w-0 flex-1 flex-col truncate px-2 last:pr-0">
+            <span className="font-bold">{warningTitle}</span>
+            <span className="truncate">{warningText}</span>
+          </div>
+        </Link>
+      );
+    });
+  }
 
   return res;
 };

src/components/Login/AddEmailModal.tsx

@@ -2,6 +2,7 @@ import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
+import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import * as Yup from 'yup';
@@ -57,18 +58,11 @@ const AddEmailModal: React.FC<AddEmailModalProps> = ({
         validationSchema={EmailSettingsSchema}
         onSubmit={async (values) => {
           try {
-            const res = await fetch('/api/v1/auth/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                username: username,
-                password: password,
-                email: values.email,
-              }),
+            await axios.post('/api/v1/auth/jellyfin', {
+              username: username,
+              password: password,
+              email: values.email,
             });
-            if (!res.ok) throw new Error();
 
             onSave();
           } catch (e) {

src/components/Login/JellyfinLogin.tsx

@@ -4,6 +4,7 @@ import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { InformationCircleIcon } from '@heroicons/react/24/solid';
 import { ApiErrorCode } from '@server/constants/error';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import getConfig from 'next/config';
 import { useIntl } from 'react-intl';
@@ -104,32 +105,18 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
         validationSchema={LoginSchema}
         onSubmit={async (values) => {
           try {
-            const res = await fetch('/api/v1/auth/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                username: values.username,
-                password: values.password,
-                hostname: values.hostname,
-                port: values.port,
-                useSsl: values.useSsl,
-                urlBase: values.urlBase,
-                email: values.email,
-              }),
+            await axios.post('/api/v1/auth/jellyfin', {
+              username: values.username,
+              password: values.password,
+              hostname: values.hostname,
+              port: values.port,
+              useSsl: values.useSsl,
+              urlBase: values.urlBase,
+              email: values.email,
             });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
           } catch (e) {
-            let errorData;
-            try {
-              errorData = await e.cause?.text();
-              errorData = JSON.parse(errorData);
-            } catch {
-              /* empty */
-            }
             let errorMessage = null;
-            switch (errorData?.message) {
+            switch (e.response?.data?.message) {
               case ApiErrorCode.InvalidUrl:
                 errorMessage = messages.invalidurlerror;
                 break;
@@ -352,18 +339,11 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
           validationSchema={LoginSchema}
           onSubmit={async (values) => {
             try {
-              const res = await fetch('/api/v1/auth/jellyfin', {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                  username: values.username,
-                  password: values.password,
-                  email: values.username,
-                }),
+              await axios.post('/api/v1/auth/jellyfin', {
+                username: values.username,
+                password: values.password,
+                email: values.username,
               });
-              if (!res.ok) throw new Error();
             } catch (e) {
               toasts.addToast(
                 intl.formatMessage(

src/components/Login/LocalLogin.tsx

@@ -6,6 +6,7 @@ import {
   ArrowLeftOnRectangleIcon,
   LifebuoyIcon,
 } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useState } from 'react';
@@ -55,17 +56,10 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
       validationSchema={LoginSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/auth/local', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              email: values.email,
-              password: values.password,
-            }),
+          await axios.post('/api/v1/auth/local', {
+            email: values.email,
+            password: values.password,
           });
-          if (!res.ok) throw new Error();
         } catch (e) {
           setLoginError(intl.formatMessage(messages.loginerror));
         } finally {

src/components/Login/index.tsx

@@ -10,6 +10,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
+import axios from 'axios';
 import getConfig from 'next/config';
 import { useRouter } from 'next/dist/client/router';
 import Image from 'next/image';
@@ -43,28 +44,13 @@ const Login = () => {
     const login = async () => {
       setProcessing(true);
       try {
-        const res = await fetch('/api/v1/auth/plex', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({ authToken }),
-        });
-        if (!res.ok) throw new Error(res.statusText, { cause: res });
-        const data = await res.json();
+        const response = await axios.post('/api/v1/auth/plex', { authToken });
 
-        if (data?.id) {
+        if (response.data?.id) {
           revalidate();
         }
       } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
-        setError(errorData?.message);
+        setError(e.response.data.message);
         setAuthToken(undefined);
         setProcessing(false);
       }

src/components/ManageSlideOver/index.tsx

@@ -1,5 +1,4 @@
 import Button from '@app/components/Common/Button';
-import CachedImage from '@app/components/Common/CachedImage';
 import ConfirmButton from '@app/components/Common/ConfirmButton';
 import SlideOver from '@app/components/Common/SlideOver';
 import Tooltip from '@app/components/Common/Tooltip';
@@ -27,7 +26,9 @@ import type { MediaWatchDataResponse } from '@server/interfaces/api/mediaInterfa
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import getConfig from 'next/config';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
 import useSWR from 'swr';
@@ -112,29 +113,16 @@ const ManageSlideOver = ({
 
   const deleteMedia = async () => {
     if (data.mediaInfo) {
-      const res = await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
+      await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
       revalidate();
-      onClose();
     }
   };
 
   const deleteMediaFile = async () => {
     if (data.mediaInfo) {
-      const res1 = await fetch(`/api/v1/media/${data.mediaInfo.id}/file`, {
-        method: 'DELETE',
-      });
-      if (!res1.ok) throw new Error();
-
-      const res2 = await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
-        method: 'DELETE',
-      });
-      if (!res2.ok) throw new Error();
-
+      await axios.delete(`/api/v1/media/${data.mediaInfo.id}/file`);
+      await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
       revalidate();
-      onClose();
     }
   };
 
@@ -161,16 +149,9 @@ const ManageSlideOver = ({
 
   const markAvailable = async (is4k = false) => {
     if (data.mediaInfo) {
-      const res = await fetch(`/api/v1/media/${data.mediaInfo?.id}/available`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          is4k,
-        }),
+      await axios.post(`/api/v1/media/${data.mediaInfo?.id}/available`, {
+        is4k,
       });
-      if (!res.ok) throw new Error();
       revalidate();
     }
   };
@@ -355,8 +336,8 @@ const ManageSlideOver = ({
                                     key={`watch-user-${user.id}`}
                                     content={user.displayName}
                                   >
-                                    <CachedImage
-                                      src={`/avatarproxy/${user.avatar}`}
+                                    <Image
+                                      src={user.avatar}
                                       alt={user.displayName}
                                       className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
                                       width={32}
@@ -516,8 +497,8 @@ const ManageSlideOver = ({
                                     key={`watch-user-${user.id}`}
                                     content={user.displayName}
                                   >
-                                    <CachedImage
-                                      src={`/avatarproxy/${user.avatar}`}
+                                    <Image
+                                      src={user.avatar}
                                       alt={user.displayName}
                                       className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
                                       width={32}

src/components/MediaSlider/ShowMoreCard/index.tsx

@@ -57,48 +57,44 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
       >
         <div style={{ paddingBottom: '150%' }}>
           <div className="absolute inset-0 flex h-full w-full flex-col items-center p-2">
-            <div className="relative z-10 grid h-full w-full grid-cols-2 items-center justify-center gap-2 opacity-30">
+            <div className="relative z-10 flex h-full flex-wrap items-center justify-center opacity-30">
               {posters[0] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                   <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
                     alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                   />
                 </div>
               )}
               {posters[1] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                   <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
                     alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                   />
                 </div>
               )}
               {posters[2] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                   <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
                     alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                   />
                 </div>
               )}
               {posters[3] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                   <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
                     alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                   />
                 </div>
               )}

src/components/MovieDetails/index.tsx

@@ -3,7 +3,6 @@ import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
 import ImdbLogo from '@app/assets/services/imdb.svg';
-import Spinner from '@app/assets/spinner.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -26,7 +25,7 @@ import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import ErrorPage from '@app/pages/_error';
+import Error from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
 import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
@@ -42,12 +41,10 @@ import {
 import {
   ChevronDoubleDownIcon,
   ChevronDoubleUpIcon,
-  MinusCircleIcon,
-  StarIcon,
 } from '@heroicons/react/24/solid';
 import { type RatingResponse } from '@server/api/ratings';
 import { IssueStatus } from '@server/constants/issue';
-import { MediaStatus, MediaType } from '@server/constants/media';
+import { MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
 import { countries } from 'country-flag-icons';
@@ -58,7 +55,6 @@ import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
 const messages = defineMessages('components.MovieDetails', {
@@ -98,12 +94,6 @@ const messages = defineMessages('components.MovieDetails', {
   rtaudiencescore: 'Rotten Tomatoes Audience Score',
   tmdbuserscore: 'TMDB User Score',
   imdbuserscore: 'IMDB User Score',
-  watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
-  watchlistDeleted:
-    '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong try again.',
-  removefromwatchlist: 'Remove From Watchlist',
-  addtowatchlist: 'Add To Watchlist',
 });
 
 interface MovieDetailsProps {
@@ -122,12 +112,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   const minStudios = 3;
   const [showMoreStudios, setShowMoreStudios] = useState(false);
   const [showIssueModal, setShowIssueModal] = useState(false);
-  const [isUpdating, setIsUpdating] = useState<boolean>(false);
-  const [toggleWatchlist, setToggleWatchlist] = useState<boolean>(
-    !movie?.onUserWatchlist
-  );
   const { publicRuntimeConfig } = getConfig();
-  const { addToast } = useToasts();
 
   const {
     data,
@@ -169,7 +154,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   }
 
   if (!data) {
-    return <ErrorPage statusCode={404} />;
+    return <Error statusCode={404} />;
   }
 
   const showAllStudios = data.productionCompanies.length <= minStudios + 1;
@@ -302,80 +287,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
     return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' });
   }
 
-  const onClickWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: movie?.id,
-        mediaType: MediaType.MOVIE,
-        title: movie?.title,
-      }),
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    const data = await res.json();
-
-    if (data) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistSuccess, {
-            title: movie?.title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-
-    setIsUpdating(false);
-    setToggleWatchlist((prevState) => !prevState);
-  };
-
-  const onClickDeleteWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-    try {
-      const res = await fetch(`/api/v1/watchlist/${movie?.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
-
-      if (res.status === 204) {
-        addToast(
-          <span>
-            {intl.formatMessage(messages.watchlistDeleted, {
-              title: movie?.title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'info', autoDismiss: true }
-        );
-      }
-    } catch (e) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    } finally {
-      setIsUpdating(false);
-      setToggleWatchlist((prevState) => !prevState);
-    }
-  };
-
   return (
     <div
       className="media-page"
@@ -497,40 +408,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           </span>
         </div>
         <div className="media-actions">
-          <>
-            {toggleWatchlist ? (
-              <Tooltip content={intl.formatMessage(messages.addtowatchlist)}>
-                <Button
-                  buttonType={'ghost'}
-                  className="z-40 mr-2"
-                  buttonSize={'md'}
-                  onClick={onClickWatchlistBtn}
-                >
-                  {isUpdating ? (
-                    <Spinner className="h-3" />
-                  ) : (
-                    <StarIcon className={'h-3 text-amber-300'} />
-                  )}
-                </Button>
-              </Tooltip>
-            ) : (
-              <Tooltip
-                content={intl.formatMessage(messages.removefromwatchlist)}
-              >
-                <Button
-                  className="z-40 mr-2"
-                  buttonSize={'md'}
-                  onClick={onClickDeleteWatchlistBtn}
-                >
-                  {isUpdating ? (
-                    <Spinner className="h-3" />
-                  ) : (
-                    <MinusCircleIcon className={'h-3'} />
-                  )}
-                </Button>
-              </Tooltip>
-            )}
-          </>
           <PlayButton links={mediaLinks} />
           <RequestButton
             mediaType="movie"

src/components/RequestBlock/index.tsx

@@ -17,6 +17,7 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
+import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -52,10 +53,7 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
 
   const updateRequest = async (type: 'approve' | 'decline'): Promise<void> => {
     setIsUpdating(true);
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
+    await axios.post(`/api/v1/request/${request.id}/${type}`);
 
     if (onUpdate) {
       onUpdate();
@@ -65,10 +63,7 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
 
   const deleteRequest = async () => {
     setIsUpdating(true);
-    const res = await fetch(`/api/v1/request/${request.id}`, {
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
+    await axios.delete(`/api/v1/request/${request.id}`);
 
     if (onUpdate) {
       onUpdate();

src/components/RequestButton/index.tsx

@@ -13,6 +13,7 @@ import {
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type Media from '@server/entity/Media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
+import axios from 'axios';
 import { useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 
@@ -93,13 +94,9 @@ const RequestButton = ({
     request: MediaRequest,
     type: 'approve' | 'decline'
   ) => {
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
+    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
 
-    if (data) {
+    if (response) {
       onUpdate();
     }
   };
@@ -114,11 +111,7 @@ const RequestButton = ({
 
     await Promise.all(
       requests.map(async (request) => {
-        const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
-          method: 'POST',
-        });
-        if (!res.ok) throw new Error();
-        return res.json();
+        return axios.post(`/api/v1/request/${request.id}/${type}`);
       })
     );
 

src/components/RequestCard/index.tsx

@@ -19,9 +19,10 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -58,7 +59,7 @@ const RequestCardPlaceholder = () => {
 };
 
 interface RequestCardErrorProps {
-  requestData?: NonFunctionProperties<MediaRequest>;
+  requestData?: MediaRequest;
 }
 
 const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
@@ -73,10 +74,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
   });
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/media/${requestData?.media.id}`, {
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
+    await axios.delete(`/api/v1/media/${requestData?.media.id}`);
     mutate('/api/v1/media?filter=allavailable&take=20&sort=mediaAdded');
     mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
   };
@@ -115,8 +113,8 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
                       className="group flex items-center"
                     >
                       <span className="avatar-sm">
-                        <CachedImage
-                          src={`/avatarproxy/${requestData.requestedBy.avatar}`}
+                        <Image
+                          src={requestData.requestedBy.avatar}
                           alt=""
                           className="avatar-sm object-cover"
                           width={20}
@@ -213,7 +211,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
 };
 
 interface RequestCardProps {
-  request: NonFunctionProperties<MediaRequest>;
+  request: MediaRequest;
   onTitleData?: (requestId: number, title: MovieDetails | TvDetails) => void;
 }
 
@@ -238,19 +236,16 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
     data: requestData,
     error: requestError,
     mutate: revalidate,
-  } = useSWR<NonFunctionProperties<MediaRequest>>(
-    `/api/v1/request/${request.id}`,
-    {
-      fallbackData: request,
-      refreshInterval: refreshIntervalHelper(
-        {
-          downloadStatus: request.media.downloadStatus,
-          downloadStatus4k: request.media.downloadStatus4k,
-        },
-        15000
-      ),
-    }
-  );
+  } = useSWR<MediaRequest>(`/api/v1/request/${request.id}`, {
+    fallbackData: request,
+    refreshInterval: refreshIntervalHelper(
+      {
+        downloadStatus: request.media.downloadStatus,
+        downloadStatus4k: request.media.downloadStatus4k,
+      },
+      15000
+    ),
+  });
 
   const { mediaUrl: plexUrl, mediaUrl4k: plexUrl4k } = useDeepLinks({
     mediaUrl: requestData?.media?.mediaUrl,
@@ -260,22 +255,15 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
   });
 
   const modifyRequest = async (type: 'approve' | 'decline') => {
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
+    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
 
-    if (data) {
+    if (response) {
       revalidate();
     }
   };
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/request/${request.id}`, {
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
+    await axios.delete(`/api/v1/request/${request.id}`);
     mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
   };
 
@@ -283,13 +271,9 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
     setRetrying(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${request.id}/retry`, {
-        method: 'POST',
-      });
-      if (!res.ok) throw new Error();
-      const data = await res.json();
+      const response = await axios.post(`/api/v1/request/${request.id}/retry`);
 
-      if (data) {
+      if (response) {
         revalidate();
       }
     } catch (e) {
@@ -389,8 +373,8 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
                 className="group flex items-center"
               >
                 <span className="avatar-sm">
-                  <CachedImage
-                    src={`/avatarproxy/${requestData.requestedBy.avatar}`}
+                  <Image
+                    src={requestData.requestedBy.avatar}
                     alt=""
                     className="avatar-sm object-cover"
                     width={20}

src/components/RequestList/RequestItem/index.tsx

@@ -18,9 +18,10 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -42,7 +43,6 @@ const messages = defineMessages('components.RequestList.RequestItem', {
   tmdbid: 'TMDB ID',
   tvdbid: 'TheTVDB ID',
   unknowntitle: 'Unknown Title',
-  profileName: 'Profile',
 });
 
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -50,7 +50,7 @@ const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
 };
 
 interface RequestItemErrorProps {
-  requestData?: NonFunctionProperties<MediaRequest>;
+  requestData?: MediaRequest;
   revalidateList: () => void;
 }
 
@@ -62,10 +62,7 @@ const RequestItemError = ({
   const { hasPermission } = useUser();
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/media/${requestData?.media.id}`, {
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
+    await axios.delete(`/api/v1/media/${requestData?.media.id}`);
     revalidateList();
   };
 
@@ -189,8 +186,8 @@ const RequestItemError = ({
                             className="group flex items-center truncate"
                           >
                             <span className="avatar-sm ml-1.5">
-                              <CachedImage
-                                src={`/avatarproxy/${requestData.requestedBy.avatar}`}
+                              <Image
+                                src={requestData.requestedBy.avatar}
                                 alt=""
                                 className="avatar-sm object-cover"
                                 width={20}
@@ -248,8 +245,8 @@ const RequestItemError = ({
                           className="group flex items-center truncate"
                         >
                           <span className="avatar-sm ml-1.5">
-                            <CachedImage
-                              src={`/avatarproxy/${requestData.modifiedBy.avatar}`}
+                            <Image
+                              src={requestData.modifiedBy.avatar}
                               alt=""
                               className="avatar-sm object-cover"
                               width={20}
@@ -286,7 +283,7 @@ const RequestItemError = ({
 };
 
 interface RequestItemProps {
-  request: NonFunctionProperties<MediaRequest> & { profileName?: string };
+  request: MediaRequest;
   revalidateList: () => void;
 }
 
@@ -305,38 +302,32 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
   const { data: title, error } = useSWR<MovieDetails | TvDetails>(
     inView ? url : null
   );
-  const { data: requestData, mutate: revalidate } = useSWR<
-    NonFunctionProperties<MediaRequest>
-  >(`/api/v1/request/${request.id}`, {
-    fallbackData: request,
-    refreshInterval: refreshIntervalHelper(
-      {
-        downloadStatus: request.media.downloadStatus,
-        downloadStatus4k: request.media.downloadStatus4k,
-      },
-      15000
-    ),
-  });
+  const { data: requestData, mutate: revalidate } = useSWR<MediaRequest>(
+    `/api/v1/request/${request.id}`,
+    {
+      fallbackData: request,
+      refreshInterval: refreshIntervalHelper(
+        {
+          downloadStatus: request.media.downloadStatus,
+          downloadStatus4k: request.media.downloadStatus4k,
+        },
+        15000
+      ),
+    }
+  );
 
   const [isRetrying, setRetrying] = useState(false);
 
   const modifyRequest = async (type: 'approve' | 'decline') => {
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
+    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
 
-    if (data) {
+    if (response) {
       revalidate();
     }
   };
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/request/${request.id}`, {
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
+    await axios.delete(`/api/v1/request/${request.id}`);
 
     revalidateList();
   };
@@ -345,12 +336,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
     setRetrying(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${request.id}/retry`, {
-        method: 'POST',
-      });
-      if (!res.ok) throw new Error();
-      const result = await res.json();
-
+      const result = await axios.post(`/api/v1/request/${request.id}/retry`);
       revalidate(result.data);
     } catch (e) {
       addToast(intl.formatMessage(messages.failedretry), {
@@ -401,7 +387,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
           setShowEditModal(false);
         }}
       />
-      <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-2 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
+      <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
         {title.backdropPath && (
           <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
             <CachedImage
@@ -482,7 +468,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
               )}
             </div>
           </div>
-          <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center gap-1 overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
+          <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
             <div className="card-field">
               <span className="card-field-name">
                 {intl.formatMessage(globalMessages.status)}
@@ -556,8 +542,8 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                           className="group flex items-center truncate"
                         >
                           <span className="avatar-sm ml-1.5">
-                            <CachedImage
-                              src={`/avatarproxy/${requestData.requestedBy.avatar}`}
+                            <Image
+                              src={requestData.requestedBy.avatar}
                               alt=""
                               className="avatar-sm object-cover"
                               width={20}
@@ -615,8 +601,8 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                         className="group flex items-center truncate"
                       >
                         <span className="avatar-sm ml-1.5">
-                          <CachedImage
-                            src={`/avatarproxy/${requestData.requestedBy.avatar}`}
+                          <Image
+                            src={requestData.requestedBy.avatar}
                             alt=""
                             className="avatar-sm object-cover"
                             width={20}
@@ -632,16 +618,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                 </span>
               </div>
             )}
-            {request.profileName && (
-              <div className="card-field">
-                <span className="card-field-name">
-                  {intl.formatMessage(messages.profileName)}
-                </span>
-                <span className="flex truncate text-sm text-gray-300">
-                  {request.profileName}
-                </span>
-              </div>
-            )}
           </div>
         </div>
         <div className="z-10 mt-4 flex w-full flex-col justify-center space-y-2 pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">

src/components/RequestModal/AdvancedRequester/index.tsx

@@ -1,5 +1,4 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import CachedImage from '@app/components/Common/CachedImage';
 import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
 import type { User } from '@app/hooks/useUser';
 import { Permission, useUser } from '@app/hooks/useUser';
@@ -15,6 +14,7 @@ import type {
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
 import { hasPermission } from '@server/lib/permissions';
 import { isEqual } from 'lodash';
+import Image from 'next/image';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 import Select from 'react-select';
@@ -561,8 +561,8 @@ const AdvancedRequester = ({
                     <span className="inline-block w-full rounded-md shadow-sm">
                       <Listbox.Button className="focus:shadow-outline-blue relative w-full cursor-default rounded-md border border-gray-700 bg-gray-800 py-2 pl-3 pr-10 text-left text-white transition duration-150 ease-in-out focus:border-blue-300 focus:outline-none sm:text-sm sm:leading-5">
                         <span className="flex items-center">
-                          <CachedImage
-                            src={`/avatarproxy/${selectedUser.avatar}`}
+                          <Image
+                            src={selectedUser.avatar}
                             alt=""
                             className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
                             width={24}
@@ -613,8 +613,8 @@ const AdvancedRequester = ({
                                     selected ? 'font-semibold' : 'font-normal'
                                   } flex items-center`}
                                 >
-                                  <CachedImage
-                                    src={`/avatarproxy/${user.avatar}`}
+                                  <Image
+                                    src={user.avatar}
                                     alt=""
                                     className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
                                     width={24}

src/components/RequestModal/CollectionRequestModal.tsx

@@ -13,6 +13,7 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { Collection } from '@server/models/Collection';
+import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -196,19 +197,12 @@ const CollectionRequestModal = ({
         (
           data?.parts.filter((part) => selectedParts.includes(part.id)) ?? []
         ).map(async (part) => {
-          const res = await fetch('/api/v1/request', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              mediaId: part.id,
-              mediaType: 'movie',
-              is4k,
-              ...overrideParams,
-            }),
+          await axios.post<MediaRequest>('/api/v1/request', {
+            mediaId: part.id,
+            mediaType: 'movie',
+            is4k,
+            ...overrideParams,
           });
-          if (!res.ok) throw new Error();
         })
       );
 

src/components/RequestModal/MovieRequestModal.tsx

@@ -8,10 +8,10 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { MovieDetails } from '@server/models/Movie';
+import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -39,7 +39,7 @@ const messages = defineMessages('components.RequestModal', {
 interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
   tmdbId: number;
   is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
   onCancel?: () => void;
   onComplete?: (newStatus: MediaStatus) => void;
   onUpdating?: (isUpdating: boolean) => void;
@@ -89,23 +89,15 @@ const MovieRequestModal = ({
           tags: requestOverrides.tags,
         };
       }
-      const res = await fetch('/api/v1/request', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          mediaId: data?.id,
-          mediaType: 'movie',
-          is4k,
-          ...overrideParams,
-        }),
+      const response = await axios.post<MediaRequest>('/api/v1/request', {
+        mediaId: data?.id,
+        mediaType: 'movie',
+        is4k,
+        ...overrideParams,
       });
-      if (!res.ok) throw new Error();
-      const mediaRequest: MediaRequest = await res.json();
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
-      if (mediaRequest) {
+      if (response.data) {
         if (onComplete) {
           onComplete(
             hasPermission(
@@ -144,14 +136,12 @@ const MovieRequestModal = ({
     setIsUpdating(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
-
+      const response = await axios.delete<MediaRequest>(
+        `/api/v1/request/${editRequest?.id}`
+      );
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
-      if (res.status === 204) {
+      if (response.status === 204) {
         if (onComplete) {
           onComplete(MediaStatus.UNKNOWN);
         }
@@ -174,27 +164,17 @@ const MovieRequestModal = ({
     setIsUpdating(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
-        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          mediaType: 'movie',
-          serverId: requestOverrides?.server,
-          profileId: requestOverrides?.profile,
-          rootFolder: requestOverrides?.folder,
-          userId: requestOverrides?.user?.id,
-          tags: requestOverrides?.tags,
-        }),
+      await axios.put(`/api/v1/request/${editRequest?.id}`, {
+        mediaType: 'movie',
+        serverId: requestOverrides?.server,
+        profileId: requestOverrides?.profile,
+        rootFolder: requestOverrides?.folder,
+        userId: requestOverrides?.user?.id,
+        tags: requestOverrides?.tags,
       });
-      if (!res.ok) throw new Error();
 
       if (alsoApproveRequest) {
-        const res = await fetch(`/api/v1/request/${editRequest?.id}/approve`, {
-          method: 'POST',
-        });
-        if (!res.ok) throw new Error();
+        await axios.post(`/api/v1/request/${editRequest?.id}/approve`);
       }
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 

src/components/RequestModal/TvRequestModal.tsx

@@ -13,10 +13,10 @@ import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type SeasonRequest from '@server/entity/SeasonRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -58,7 +58,7 @@ interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
   onComplete?: (newStatus: MediaStatus) => void;
   onUpdating?: (isUpdating: boolean) => void;
   is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
 }
 
 const TvRequestModal = ({
@@ -111,35 +111,22 @@ const TvRequestModal = ({
 
     try {
       if (selectedSeasons.length > 0) {
-        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
-          method: 'PUT',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            mediaType: 'tv',
-            serverId: requestOverrides?.server,
-            profileId: requestOverrides?.profile,
-            rootFolder: requestOverrides?.folder,
-            languageProfileId: requestOverrides?.language,
-            userId: requestOverrides?.user?.id,
-            tags: requestOverrides?.tags,
-            seasons: selectedSeasons,
-          }),
+        await axios.put(`/api/v1/request/${editRequest.id}`, {
+          mediaType: 'tv',
+          serverId: requestOverrides?.server,
+          profileId: requestOverrides?.profile,
+          rootFolder: requestOverrides?.folder,
+          languageProfileId: requestOverrides?.language,
+          userId: requestOverrides?.user?.id,
+          tags: requestOverrides?.tags,
+          seasons: selectedSeasons,
         });
-        if (!res.ok) throw new Error();
 
         if (alsoApproveRequest) {
-          const res = await fetch(`/api/v1/request/${editRequest.id}/approve`, {
-            method: 'POST',
-          });
-          if (!res.ok) throw new Error();
+          await axios.post(`/api/v1/request/${editRequest.id}/approve`);
         }
       } else {
-        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
-          method: 'DELETE',
-        });
-        if (!res.ok) throw new Error();
+        await axios.delete(`/api/v1/request/${editRequest.id}`);
       }
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
@@ -204,32 +191,23 @@ const TvRequestModal = ({
           tags: requestOverrides.tags,
         };
       }
-      const res = await fetch('/api/v1/request', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          mediaId: data?.id,
-          tvdbId: tvdbId ?? data?.externalIds.tvdbId,
-          mediaType: 'tv',
-          is4k,
-          seasons: settings.currentSettings.partialRequestsEnabled
-            ? selectedSeasons
-            : getAllSeasons().filter(
-                (season) => !getAllRequestedSeasons().includes(season)
-              ),
-          ...overrideParams,
-        }),
+      const response = await axios.post<MediaRequest>('/api/v1/request', {
+        mediaId: data?.id,
+        tvdbId: tvdbId ?? data?.externalIds.tvdbId,
+        mediaType: 'tv',
+        is4k,
+        seasons: settings.currentSettings.partialRequestsEnabled
+          ? selectedSeasons
+          : getAllSeasons().filter(
+              (season) => !getAllRequestedSeasons().includes(season)
+            ),
+        ...overrideParams,
       });
-      if (!res.ok) throw new Error();
-      const mediaRequest: MediaRequest = await res.json();
-
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
-      if (mediaRequest) {
+      if (response.data) {
         if (onComplete) {
-          onComplete(mediaRequest.media.status);
+          onComplete(response.data.media.status);
         }
         addToast(
           <span>

src/components/RequestModal/index.tsx

@@ -4,14 +4,13 @@ import TvRequestModal from '@app/components/RequestModal/TvRequestModal';
 import { Transition } from '@headlessui/react';
 import type { MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 
 interface RequestModalProps {
   show: boolean;
   type: 'movie' | 'tv' | 'collection';
   tmdbId: number;
   is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
   onComplete?: (newStatus: MediaStatus) => void;
   onCancel?: () => void;
   onUpdating?: (isUpdating: boolean) => void;

src/components/ResetPassword/RequestResetLink.tsx

@@ -4,6 +4,7 @@ import PageTitle from '@app/components/Common/PageTitle';
 import LanguagePicker from '@app/components/Layout/LanguagePicker';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowLeftIcon, EnvelopeIcon } from '@heroicons/react/24/solid';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -84,18 +85,14 @@ const ResetPassword = () => {
                 }}
                 validationSchema={ResetSchema}
                 onSubmit={async (values) => {
-                  const res = await fetch(`/api/v1/auth/reset-password`, {
-                    method: 'POST',
-                    headers: {
-                      'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
+                  const response = await axios.post(
+                    `/api/v1/auth/reset-password`,
+                    {
                       email: values.email,
-                    }),
-                  });
-                  if (!res.ok) throw new Error();
+                    }
+                  );
 
-                  if (res.status === 200) {
+                  if (response.status === 200) {
                     setSubmitted(true);
                   }
                 }}

src/components/ResetPassword/index.tsx

@@ -5,6 +5,7 @@ import LanguagePicker from '@app/components/Layout/LanguagePicker';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { LifebuoyIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Form, Formik } from 'formik';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -99,21 +100,14 @@ const ResetPassword = () => {
                 }}
                 validationSchema={ResetSchema}
                 onSubmit={async (values) => {
-                  const res = await fetch(
+                  const response = await axios.post(
                     `/api/v1/auth/reset-password/${guid}`,
                     {
-                      method: 'POST',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
-                      body: JSON.stringify({
-                        password: values.password,
-                      }),
+                      password: values.password,
                     }
                   );
-                  if (!res.ok) throw new Error();
 
-                  if (res.status === 200) {
+                  if (response.status === 200) {
                     setSubmitted(true);
                   }
                 }}

src/components/Selector/index.tsx

@@ -18,6 +18,7 @@ import type {
   ProductionCompany,
   WatchProviderDetails,
 } from '@server/models/common';
+import axios from 'axios';
 import { orderBy } from 'lodash';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -68,9 +69,11 @@ export const CompanySelector = ({
         return;
       }
 
-      const res = await fetch(`/api/v1/studio/${defaultValue}`);
-      if (!res.ok) throw new Error();
-      const studio: ProductionCompany = await res.json();
+      const response = await axios.get<ProductionCompany>(
+        `/api/v1/studio/${defaultValue}`
+      );
+
+      const studio = response.data;
 
       setDefaultDataValue([
         {
@@ -88,15 +91,16 @@ export const CompanySelector = ({
       return [];
     }
 
-    const res = await fetch(
-      `/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`
+    const results = await axios.get<TmdbCompanySearchResponse>(
+      '/api/v1/search/company',
+      {
+        params: {
+          query: encodeURIExtraParams(inputValue),
+        },
+      }
     );
-    if (!res.ok) {
-      throw new Error('Network response was not ok');
-    }
-    const results: TmdbCompanySearchResponse = await res.json();
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));
@@ -150,15 +154,11 @@ export const GenreSelector = ({
 
       const genres = defaultValue.split(',');
 
-      const res = await fetch(`/api/v1/genres/${type}`);
-      if (!res.ok) {
-        throw new Error('Network response was not ok');
-      }
-      const response: TmdbGenre[] = await res.json();
+      const response = await axios.get<TmdbGenre[]>(`/api/v1/genres/${type}`);
 
       const genreData = genres
-        .filter((genre) => response.find((gd) => gd.id === Number(genre)))
-        .map((g) => response.find((gd) => gd.id === Number(g)))
+        .filter((genre) => response.data.find((gd) => gd.id === Number(genre)))
+        .map((g) => response.data.find((gd) => gd.id === Number(g)))
         .map((g) => ({
           label: g?.name ?? '',
           value: g?.id ?? 0,
@@ -171,11 +171,11 @@ export const GenreSelector = ({
   }, [defaultValue, type]);
 
   const loadGenreOptions = async (inputValue: string) => {
-    const res = await fetch(`/api/v1/discover/genreslider/${type}`);
-    if (!res.ok) throw new Error();
-    const results: GenreSliderItem[] = await res.json();
+    const results = await axios.get<GenreSliderItem[]>(
+      `/api/v1/discover/genreslider/${type}`
+    );
 
-    return results
+    return results.data
       .map((result) => ({
         label: result.name,
         value: result.id,
@@ -222,13 +222,11 @@ export const KeywordSelector = ({
 
       const keywords = await Promise.all(
         defaultValue.split(',').map(async (keywordId) => {
-          const res = await fetch(`/api/v1/keyword/${keywordId}`);
-          if (!res.ok) {
-            throw new Error('Network response was not ok');
-          }
-          const keyword: Keyword = await res.json();
+          const keyword = await axios.get<Keyword>(
+            `/api/v1/keyword/${keywordId}`
+          );
 
-          return keyword;
+          return keyword.data;
         })
       );
 
@@ -244,15 +242,16 @@ export const KeywordSelector = ({
   }, [defaultValue]);
 
   const loadKeywordOptions = async (inputValue: string) => {
-    const res = await fetch(
-      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`
+    const results = await axios.get<TmdbKeywordSearchResponse>(
+      '/api/v1/search/keyword',
+      {
+        params: {
+          query: encodeURIExtraParams(inputValue),
+        },
+      }
     );
-    if (!res.ok) {
-      throw new Error('Network response was not ok');
-    }
-    const results: TmdbKeywordSearchResponse = await res.json();
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));

src/components/ServiceWorkerSetup/index.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
+import axios from 'axios';
 import { useEffect } from 'react';
 
 const ServiceWorkerSetup = () => {
@@ -25,18 +26,11 @@ const ServiceWorkerSetup = () => {
             const parsedSub = JSON.parse(JSON.stringify(sub));
 
             if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
-              const res = await fetch('/api/v1/user/registerPushSubscription', {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                  endpoint: parsedSub.endpoint,
-                  p256dh: parsedSub.keys.p256dh,
-                  auth: parsedSub.keys.auth,
-                }),
+              await axios.post('/api/v1/user/registerPushSubscription', {
+                endpoint: parsedSub.endpoint,
+                p256dh: parsedSub.keys.p256dh,
+                auth: parsedSub.keys.auth,
               });
-              if (!res.ok) throw new Error();
             }
           }
         })