fix(requests): remove unnecessary margin between avatar and username

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>

charts/jellyseerr-chart/Chart.yaml

@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
 name: jellyseerr-chart
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 2.4.0
-appVersion: "2.5.2"
+version: 2.6.0
+appVersion: "2.7.0"
 maintainers:
   - name: Jellyseerr
     url: https://github.com/Fallenbagel/jellyseerr

charts/jellyseerr-chart/README.md

@@ -1,6 +1,6 @@
 # jellyseerr-chart
 
-![Version: 2.4.0](https://img.shields.io/badge/Version-2.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.2](https://img.shields.io/badge/AppVersion-2.5.2-informational?style=flat-square)
+![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
 
 Jellyseerr helm chart for Kubernetes
 

docs/troubleshooting.mdx

@@ -105,6 +105,12 @@ In some places (like China), the ISP blocks not only the DNS resolution but also
 
 You can configure Jellyseerr to use a proxy with the [HTTP(S) Proxy](/using-jellyseerr/settings/general#https-proxy) setting.
 
+### Option 3: Force IPV4 resolution first
+
+Sometimes there are configuration issues with IPV6 that prevent the hostname resolution from working correctly.
+
+You can try to force the resolution to use IPV4 first by going to `Settings > Networking > Advanced Networking` and enabling `Force IPv4 Resolution First` setting and restarting Jellyseerr.
+
 ### Option 4: Check that your server can reach TMDB API
 
 Make sure that your server can reach the TMDB API by running the following command:

jellyseerr-api.yml

@@ -4107,7 +4107,7 @@ paths:
                     type: string
                   userAgent:
                     type: string
-  /user/{userId}/pushSubscription/{key}:
+  /user/{userId}/pushSubscription/{endpoint}:
     get:
       summary: Get web push notification settings for a user
       description: |
@@ -4121,7 +4121,7 @@ paths:
           schema:
             type: number
         - in: path
-          name: key
+          name: endpoint
           required: true
           schema:
             type: string
@@ -4153,7 +4153,7 @@ paths:
           schema:
             type: number
         - in: path
-          name: key
+          name: endpoint
           required: true
           schema:
             type: string

next.config.js

@@ -1,15 +1,9 @@
 /**
  * @type {import('next').NextConfig}
  */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
-
 module.exports = {
-  basePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
-  assetPrefix: process.env.NEXT_PUBLIC_BASE_PATH || '',
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
-    basePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
   },
   images: {
     remotePatterns: [
@@ -25,9 +19,6 @@ module.exports = {
       issuer: /\.(js|ts)x?$/,
       use: ['@svgr/webpack'],
     });
-    config.resolve.alias['next/image'] = path.resolve(
-      './src/components/Common/BaseImage/index.ts'
-    );
 
     return config;
   },

package.json

@@ -43,8 +43,8 @@
     "@supercharge/request-ip": "1.2.0",
     "@svgr/webpack": "6.5.1",
     "@tanem/react-nprogress": "5.0.30",
-    "@types/wink-jaro-distance": "^2.0.2",
     "@types/ua-parser-js": "^0.7.36",
+    "@types/wink-jaro-distance": "^2.0.2",
     "ace-builds": "1.15.2",
     "axios": "1.3.4",
     "axios-rate-limit": "1.3.0",
@@ -65,6 +65,8 @@
     "express-session": "1.17.3",
     "formik": "^2.4.6",
     "gravatar-url": "3.1.0",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
     "lodash": "4.17.21",
     "mime": "3",
     "next": "^14.2.25",
@@ -101,8 +103,8 @@
     "swr": "2.2.5",
     "tailwind-merge": "^2.6.0",
     "typeorm": "0.3.12",
-    "undici": "^7.3.0",
     "ua-parser-js": "^1.0.35",
+    "undici": "^7.3.0",
     "web-push": "3.5.0",
     "wink-jaro-distance": "^2.0.0",
     "winston": "3.8.2",

pnpm-lock.yaml

@@ -107,6 +107,12 @@ importers:
       gravatar-url:
         specifier: 3.1.0
         version: 3.1.0
+      http-proxy-agent:
+        specifier: ^7.0.2
+        version: 7.0.2
+      https-proxy-agent:
+        specifier: ^7.0.6
+        version: 7.0.6
       lodash:
         specifier: 4.17.21
         version: 4.17.21
@@ -3626,6 +3632,10 @@ packages:
     resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==}
     engines: {node: '>= 14'}
 
+  agent-base@7.1.3:
+    resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==}
+    engines: {node: '>= 14'}
+
   agentkeepalive@4.5.0:
     resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
     engines: {node: '>= 8.0.0'}
@@ -5788,8 +5798,8 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
-  https-proxy-agent@7.0.5:
-    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
 
   human-signals@1.1.1:
@@ -11122,7 +11132,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.24.7
       '@babel/parser': 7.24.7
       '@babel/types': 7.24.7
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -13339,7 +13349,7 @@ snapshots:
       fs-extra: 11.2.0
       globby: 11.1.0
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
+      https-proxy-agent: 7.0.6
       issue-parser: 6.0.0
       lodash: 4.17.21
       mime: 3.0.0
@@ -13961,7 +13971,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -14052,10 +14062,12 @@ snapshots:
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
+  agent-base@7.1.3: {}
+
   agentkeepalive@4.5.0:
     dependencies:
       humanize-ms: 1.2.1
@@ -15799,7 +15811,7 @@ snapshots:
       debug: 4.3.5
       enhanced-resolve: 5.17.0
       eslint: 8.35.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.35.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.35.0))(eslint@8.35.0)
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.54.0(eslint@8.35.0)(typescript@4.9.5))(eslint@8.35.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.7.5
@@ -15821,7 +15833,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.35.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.35.0))(eslint@8.35.0):
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
     optionalDependencies:
@@ -16821,7 +16833,7 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -16848,10 +16860,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@7.0.5:
+  https-proxy-agent@7.0.6:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.3.5
+      agent-base: 7.1.3
+      debug: 4.4.0(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 

server/api/externalapi.ts

@@ -37,6 +37,8 @@ class ExternalAPI {
         ...options.headers,
       },
     });
+    this.axios.interceptors.request = axios.interceptors.request;
+    this.axios.interceptors.response = axios.interceptors.response;
 
     if (options.rateLimit) {
       this.axios = rateLimit(this.axios, {

server/api/jellyfin.ts

@@ -130,9 +130,7 @@ class JellyfinAPI extends ExternalAPI {
     const safeDeviceId =
       deviceId && deviceId.length > 0
         ? deviceId
-        : Buffer.from(`BOT_jellyseerr_fallback_${Date.now()}`).toString(
-            'base64'
-          );
+        : Buffer.from('BOT_jellyseerr').toString('base64');
 
     let authHeaderVal: string;
     if (authToken) {

server/api/tautulli.ts

@@ -123,6 +123,8 @@ class TautulliAPI {
       }${settings.urlBase ?? ''}`,
       params: { apikey: settings.apiKey },
     });
+    this.axios.interceptors.request = axios.interceptors.request;
+    this.axios.interceptors.response = axios.interceptors.response;
   }
 
   public async getInfo(): Promise<TautulliInfo> {

server/entity/MediaRequest.ts

@@ -17,6 +17,7 @@ import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import { truncate } from 'lodash';
 import {
   AfterInsert,
+  AfterLoad,
   AfterUpdate,
   Column,
   Entity,
@@ -701,6 +702,13 @@ export class MediaRequest {
     }
   }
 
+  @AfterLoad()
+  private sortSeasons() {
+    if (Array.isArray(this.seasons)) {
+      this.seasons.sort((a, b) => a.id - b.id);
+    }
+  }
+
   static async sendNotification(
     entity: MediaRequest,
     media: Media,

server/index.ts

@@ -28,6 +28,7 @@ import { getAppVersion } from '@server/utils/appVersion';
 import createCustomProxyAgent from '@server/utils/customProxyAgent';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
+import axios from 'axios';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
 import type { NextFunction, Request, Response } from 'express';
@@ -35,6 +36,8 @@ import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
+import http from 'http';
+import https from 'https';
 import next from 'next';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
@@ -73,6 +76,11 @@ app
     const settings = await getSettings().load();
     restartFlag.initializeSettings(settings);
 
+    if (settings.network.forceIpv4First) {
+      axios.defaults.httpAgent = new http.Agent({ family: 4 });
+      axios.defaults.httpsAgent = new https.Agent({ family: 4 });
+    }
+
     // Register HTTP proxy
     if (settings.network.proxy.enabled) {
       await createCustomProxyAgent(settings.network.proxy);
@@ -154,13 +162,11 @@ app
     });
     if (settings.network.csrfProtection) {
       server.use(
-        `${process.env.NEXT_PUBLIC_BASE_PATH || ''}`,
         csurf({
           cookie: {
             httpOnly: true,
             sameSite: true,
             secure: !dev,
-            path: `${process.env.NEXT_PUBLIC_BASE_PATH || ''}` || '/',
           },
         })
       );
@@ -176,7 +182,7 @@ app
     // Set up sessions
     const sessionRespository = getRepository(Session);
     server.use(
-      `${process.env.NEXT_PUBLIC_BASE_PATH || ''}/api`,
+      '/api',
       session({
         secret: settings.clientId,
         resave: false,
@@ -186,7 +192,6 @@ app
           httpOnly: true,
           sameSite: settings.network.csrfProtection ? 'strict' : 'lax',
           secure: 'auto',
-          path: `${process.env.NEXT_PUBLIC_BASE_PATH || ''}` || '/',
         },
         store: new TypeormStore({
           cleanupLimit: 2,
@@ -195,13 +200,8 @@ app
       })
     );
     const apiDocs = YAML.load(API_SPEC_PATH);
+    server.use('/api-docs', swaggerUi.serve, swaggerUi.setup(apiDocs));
     server.use(
-      `${process.env.NEXT_PUBLIC_BASE_PATH || ''}/api-docs`,
-      swaggerUi.serve,
-      swaggerUi.setup(apiDocs)
-    );
-    server.use(
-      `${process.env.NEXT_PUBLIC_BASE_PATH || ''}`,
       OpenApiValidator.middleware({
         apiSpec: API_SPEC_PATH,
         validateRequests: true,
@@ -219,12 +219,11 @@ app
       };
       next();
     });
-    const basePath = process.env.NEXT_PUBLIC_BASE_PATH || '';
-    server.use(`${basePath}/api/v1`, routes);
+    server.use('/api/v1', routes);
 
     // Do not set cookies so CDNs can cache them
-    server.use(`${basePath}/imageproxy`, clearCookies, imageproxy);
-    server.use(`${basePath}/avatarproxy`, clearCookies, avatarproxy);
+    server.use('/imageproxy', clearCookies, imageproxy);
+    server.use('/avatarproxy', clearCookies, avatarproxy);
 
     server.get('*', (req, res) => handle(req, res));
     server.use(

server/lib/imageproxy.ts

@@ -150,6 +150,8 @@ class ImageProxy {
       baseURL: baseUrl,
       headers: options.headers,
     });
+    this.axios.interceptors.request = axios.interceptors.request;
+    this.axios.interceptors.response = axios.interceptors.response;
 
     if (options.rateLimitOptions) {
       this.axios = rateLimit(this.axios, options.rateLimitOptions);

server/lib/settings/index.ts

@@ -140,6 +140,7 @@ export interface MainSettings {
 
 export interface NetworkSettings {
   csrfProtection: boolean;
+  forceIpv4First: boolean;
   trustProxy: boolean;
   proxy: ProxySettings;
 }
@@ -544,6 +545,7 @@ class Settings {
       },
       network: {
         csrfProtection: false,
+        forceIpv4First: false,
         trustProxy: false,
         proxy: {
           enabled: false,

server/routes/auth.ts

@@ -277,11 +277,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
       select: { id: true, jellyfinDeviceId: true },
     });
 
-    let deviceId = '';
-    if (user) {
-      deviceId = user.jellyfinDeviceId ?? '';
-    } else {
-      deviceId = Buffer.from(`BOT_jellyseerr_${body.username ?? ''}`).toString(
+    let deviceId = 'BOT_jellyseerr';
+    if (user && user.id === 1) {
+      // Admin is always BOT_jellyseerr
+      deviceId = 'BOT_jellyseerr';
+    } else if (user && user.jellyfinDeviceId) {
+      deviceId = user.jellyfinDeviceId;
+    } else if (body.username) {
+      deviceId = Buffer.from(`BOT_jellyseerr_${body.username}`).toString(
         'base64'
       );
     }

server/routes/avatarproxy.ts

@@ -23,7 +23,7 @@ async function initAvatarImageProxy() {
       select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
       order: { id: 'ASC' },
     });
-    const deviceId = admin?.jellyfinDeviceId;
+    const deviceId = admin?.jellyfinDeviceId || 'BOT_jellyseerr';
     const authToken = getSettings().jellyfin.apiKey;
     _avatarImageProxy = new ImageProxy('avatar', '', {
       headers: {

server/routes/user/index.ts

@@ -240,8 +240,8 @@ router.get<{ userId: number }>(
   }
 );
 
-router.get<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
+router.get<{ userId: number; endpoint: string }>(
+  '/:userId/pushSubscription/:endpoint',
   async (req, res, next) => {
     try {
       const userPushSubRepository = getRepository(UserPushSubscription);
@@ -252,7 +252,7 @@ router.get<{ userId: number; key: string }>(
         },
         where: {
           user: { id: req.params.userId },
-          p256dh: req.params.key,
+          endpoint: req.params.endpoint,
         },
       });
 
@@ -263,8 +263,8 @@ router.get<{ userId: number; key: string }>(
   }
 );
 
-router.delete<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
+router.delete<{ userId: number; endpoint: string }>(
+  '/:userId/pushSubscription/:endpoint',
   async (req, res, next) => {
     try {
       const userPushSubRepository = getRepository(UserPushSubscription);
@@ -275,7 +275,7 @@ router.delete<{ userId: number; key: string }>(
         },
         where: {
           user: { id: req.params.userId },
-          p256dh: req.params.key,
+          endpoint: req.params.endpoint,
         },
       });
 
@@ -284,7 +284,7 @@ router.delete<{ userId: number; key: string }>(
     } catch (e) {
       logger.error('Something went wrong deleting the user push subcription', {
         label: 'API',
-        key: req.params.key,
+        endpoint: req.params.endpoint,
         errorMessage: e.message,
       });
       return next({

server/routes/user/usersettings.ts

@@ -18,6 +18,7 @@ import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
 import net from 'net';
+import { Not } from 'typeorm';
 import { canMakePermissionsChange } from '.';
 
 const isOwnProfile = (): Middleware => {
@@ -125,8 +126,9 @@ userSettingsRoutes.post<
     }
 
     const existingUser = await userRepository.findOne({
-      where: { email: user.email },
+      where: { email: user.email, id: Not(user.id) },
     });
+
     if (oldEmail !== user.email && existingUser) {
       throw new ApiError(400, ApiErrorCode.InvalidEmail);
     }
@@ -419,7 +421,9 @@ userSettingsRoutes.post<{ username: string; password: string }>(
 
     const hostname = getHostname();
     const deviceId = Buffer.from(
-      `BOT_jellyseerr_${req.user.username ?? ''}`
+      req.user?.id === 1
+        ? 'BOT_jellyseerr'
+        : `BOT_jellyseerr_${req.user.username ?? ''}`
     ).toString('base64');
 
     const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);

server/utils/customProxyAgent.ts

@@ -1,6 +1,8 @@
 import type { ProxySettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import axios from 'axios';
+import { HttpProxyAgent } from 'http-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import type { Dispatcher } from 'undici';
 import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';
 
@@ -54,17 +56,33 @@ export default async function createCustomProxyAgent(
       : undefined;
 
   try {
+    const proxyUrl = `${proxySettings.useSsl ? 'https' : 'http'}://${
+      proxySettings.hostname
+    }:${proxySettings.port}`;
     const proxyAgent = new ProxyAgent({
-      uri:
-        (proxySettings.useSsl ? 'https://' : 'http://') +
-        proxySettings.hostname +
-        ':' +
-        proxySettings.port,
+      uri: proxyUrl,
       token,
       keepAliveTimeout: 5000,
     });
 
     setGlobalDispatcher(proxyAgent.compose(noProxyInterceptor));
+
+    axios.defaults.httpAgent = new HttpProxyAgent(proxyUrl, {
+      headers: token ? { 'proxy-authorization': token } : undefined,
+    });
+    axios.defaults.httpsAgent = new HttpsProxyAgent(proxyUrl, {
+      headers: token ? { 'proxy-authorization': token } : undefined,
+    });
+    axios.interceptors.request.use((config) => {
+      const url = config.baseURL
+        ? new URL(config.baseURL + (config.url || ''))
+        : config.url;
+      if (url && skipUrl(url)) {
+        config.httpAgent = false;
+        config.httpsAgent = false;
+      }
+      return config;
+    });
   } catch (e) {
     logger.error('Failed to connect to the proxy: ' + e.message, {
       label: 'Proxy',

src/components/Blacklist/index.tsx

@@ -12,7 +12,6 @@ import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import {
   ChevronLeftIcon,
   ChevronRightIcon,
@@ -123,7 +122,7 @@ const Blacklist = () => {
               onChange={(e) => {
                 setCurrentFilter(e.target.value as Filter);
                 router.push({
-                  pathname: getBasedPath(router.pathname),
+                  pathname: router.pathname,
                   query: router.query.userId
                     ? { userId: router.query.userId }
                     : {},

src/components/Common/BaseImage/index.ts

@@ -1,32 +0,0 @@
-// src/components/Common/BaseImage/index.ts
-import type { ImageProps } from 'next/image';
-import NextImage from 'next/image';
-import React from 'react';
-
-// Instead of defining our own props, extend from Next's ImageProps
-const BaseImage = React.forwardRef<HTMLImageElement, ImageProps>(
-  (props, ref) => {
-    const basePath = process.env.NEXT_PUBLIC_BASE_PATH || '';
-
-    const modifiedSrc =
-      typeof props.src === 'string' && props.src.startsWith('/')
-        ? `${basePath}${props.src}`
-        : props.src;
-
-    const shouldUnoptimize =
-      typeof props.src === 'string' && props.src.endsWith('.svg');
-
-    return React.createElement(NextImage, {
-      ...props,
-      ref,
-      src: modifiedSrc,
-      unoptimized: shouldUnoptimize || props.unoptimized,
-    });
-  }
-);
-
-BaseImage.displayName = 'Image';
-
-export default BaseImage;
-// Re-export ImageProps type for consumers
-export type { ImageProps };

src/components/Common/CachedImage/index.tsx

@@ -1,6 +1,6 @@
-import Image from '@app/components/Common/BaseImage';
 import useSettings from '@app/hooks/useSettings';
 import type { ImageLoader, ImageProps } from 'next/image';
+import Image from 'next/image';
 
 const imageLoader: ImageLoader = ({ src }) => src;
 

src/components/Common/SettingsTabs/index.tsx

@@ -1,5 +1,4 @@
 import { useUser } from '@app/hooks/useUser';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import type { Permission } from '@server/lib/permissions';
 import { hasPermission } from '@server/lib/permissions';
 import Link from 'next/link';
@@ -86,10 +85,10 @@ const SettingsTabs = ({
         </label>
         <select
           onChange={(e) => {
-            router.push(getBasedPath(e.target.value));
+            router.push(e.target.value);
           }}
           onBlur={(e) => {
-            router.push(getBasedPath(e.target.value));
+            router.push(e.target.value);
           }}
           defaultValue={
             settingsRoutes.find((route) => !!router.pathname.match(route.regex))

src/components/Discover/DiscoverMovies/index.tsx

@@ -85,7 +85,7 @@ const DiscoverMovies = () => {
               id="sortBy"
               name="sortBy"
               className="rounded-r-only"
-              value={preparedFilters.sortBy}
+              value={preparedFilters.sortBy || SortOptions.PopularityDesc}
               onChange={(e) => updateQueryParams('sortBy', e.target.value)}
             >
               <option value={SortOptions.PopularityDesc}>

src/components/Discover/DiscoverTv/index.tsx

@@ -83,7 +83,7 @@ const DiscoverTv = () => {
               id="sortBy"
               name="sortBy"
               className="rounded-r-only"
-              value={preparedFilters.sortBy}
+              value={preparedFilters.sortBy || SortOptions.PopularityDesc}
               onChange={(e) => updateQueryParams('sortBy', e.target.value)}
             >
               <option value={SortOptions.PopularityDesc}>

src/components/IssueDetails/index.tsx

@@ -13,7 +13,6 @@ import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import ErrorPage from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { Transition } from '@headlessui/react';
 import {
   ChatBubbleOvalLeftEllipsisIcon,
@@ -167,7 +166,7 @@ const IssueDetails = () => {
         appearance: 'success',
         autoDismiss: true,
       });
-      router.push(getBasedPath('/issues'));
+      router.push('/issues');
     } catch (e) {
       addToast(intl.formatMessage(messages.toastissuedeletefailed), {
         appearance: 'error',

src/components/IssueList/index.tsx

@@ -6,7 +6,6 @@ import IssueItem from '@app/components/IssueList/IssueItem';
 import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import {
   BarsArrowDownIcon,
   ChevronLeftIcon,
@@ -108,7 +107,7 @@ const IssueList = () => {
               onChange={(e) => {
                 setCurrentFilter(e.target.value as Filter);
                 router.push({
-                  pathname: getBasedPath(router.pathname),
+                  pathname: router.pathname,
                   query: router.query.userId
                     ? { userId: router.query.userId }
                     : {},
@@ -138,7 +137,7 @@ const IssueList = () => {
               onChange={(e) => {
                 setCurrentSort(e.target.value as Sort);
                 router.push({
-                  pathname: getBasedPath(router.pathname),
+                  pathname: router.pathname,
                   query: router.query.userId
                     ? { userId: router.query.userId }
                     : {},

src/components/Layout/Sidebar/index.tsx

@@ -1,5 +1,4 @@
 import Badge from '@app/components/Common/Badge';
-import Image from '@app/components/Common/BaseImage';
 import UserWarnings from '@app/components/Layout/UserWarnings';
 import VersionStatus from '@app/components/Layout/VersionStatus';
 import useClickOutside from '@app/hooks/useClickOutside';
@@ -17,6 +16,7 @@ import {
   UsersIcon,
   XMarkIcon,
 } from '@heroicons/react/24/outline';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { Fragment, useEffect, useRef } from 'react';

src/components/Layout/UserDropdown/index.tsx

@@ -1,6 +1,6 @@
 import CachedImage from '@app/components/Common/CachedImage';
 import MiniQuotaDisplay from '@app/components/Layout/UserDropdown/MiniQuotaDisplay';
-import { useUser } from '@app/hooks/useUser';
+import { Permission, useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import {
@@ -36,7 +36,7 @@ ForwardedLink.displayName = 'ForwardedLink';
 
 const UserDropdown = () => {
   const intl = useIntl();
-  const { user, revalidate } = useUser();
+  const { user, revalidate, hasPermission } = useUser();
 
   const logout = async () => {
     const response = await axios.post('/api/v1/auth/logout');
@@ -118,7 +118,14 @@ const UserDropdown = () => {
               <Menu.Item>
                 {({ active }) => (
                   <ForwardedLink
-                    href={`/users/${user?.id}/requests?filter=all`}
+                    href={
+                      hasPermission(
+                        [Permission.MANAGE_REQUESTS, Permission.REQUEST_VIEW],
+                        { type: 'or' }
+                      )
+                        ? `/users/${user?.id}/requests?filter=all`
+                        : '/requests'
+                    }
                     className={`flex items-center rounded px-4 py-2 text-sm font-medium text-gray-200 transition duration-150 ease-in-out ${
                       active
                         ? 'bg-gradient-to-br from-indigo-600 to-purple-600 text-white'

src/components/Login/index.tsx

@@ -1,7 +1,6 @@
 import EmbyLogo from '@app/assets/services/emby-icon-only.svg';
 import JellyfinLogo from '@app/assets/services/jellyfin-icon.svg';
 import PlexLogo from '@app/assets/services/plex.svg';
-import Image from '@app/components/Common/BaseImage';
 import Button from '@app/components/Common/Button';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -12,12 +11,12 @@ import PlexLoginButton from '@app/components/Login/PlexLoginButton';
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { Transition } from '@headlessui/react';
 import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
 import axios from 'axios';
 import { useRouter } from 'next/dist/client/router';
+import Image from 'next/image';
 import { useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { CSSTransition, SwitchTransition } from 'react-transition-group';
@@ -45,8 +44,6 @@ const Login = () => {
     settings.currentSettings.mediaServerLogin
   );
 
-  const basePath = process.env.NEXT_PUBLIC_BASE_PATH || '';
-
   // Effect that is triggered when the `authToken` comes back from the Plex OAuth
   // We take the token and attempt to sign in. If we get a success message, we will
   // ask swr to revalidate the user which _should_ come back with a valid user.
@@ -74,7 +71,7 @@ const Login = () => {
   // valid user, we redirect the user to the home page as the login was successful.
   useEffect(() => {
     if (user) {
-      router.push(getBasedPath('/'));
+      router.push('/');
     }
   }, [user, router]);
 
@@ -132,7 +129,7 @@ const Login = () => {
           >
             {/* eslint-disable-next-line @next/next/no-img-element */}
             <img
-              src={basePath + '/os_icon.svg'}
+              src="/os_icon.svg"
               alt={settings.currentSettings.applicationTitle}
               className="mr-2 h-5"
             />

src/components/MediaSlider/index.tsx

@@ -74,6 +74,14 @@ const MediaSlider = ({
     );
   }
 
+  if (settings.currentSettings.hideBlacklisted) {
+    titles = titles.filter(
+      (i) =>
+        (i.mediaType === 'movie' || i.mediaType === 'tv') &&
+        i.mediaInfo?.status !== MediaStatus.BLACKLISTED
+    );
+  }
+
   useEffect(() => {
     if (
       titles.length < 24 &&

src/components/MovieDetails/index.tsx

@@ -30,7 +30,6 @@ import globalMessages from '@app/i18n/globalMessages';
 import ErrorPage from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import {
   ArrowRightCircleIcon,
@@ -469,7 +468,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
         onClose={() => {
           setShowManager(false);
           router.push({
-            pathname: getBasedPath(router.pathname),
+            pathname: router.pathname,
             query: { movieId: router.query.movieId },
           });
         }}

src/components/PWAHeader/index.tsx

@@ -3,154 +3,153 @@ interface PWAHeaderProps {
 }
 
 const PWAHeader = ({ applicationTitle = 'Jellyseerr' }: PWAHeaderProps) => {
-  const basePath = process.env.NEXT_PUBLIC_BASE_PATH || '';
   return (
     <>
       <link
         rel="apple-touch-icon"
         sizes="180x180"
-        href={`${basePath}/apple-touch-icon.png`}
+        href="/apple-touch-icon.png"
       />
       <link
         rel="icon"
         type="image/png"
         sizes="32x32"
-        href={`${basePath}/favicon-32x32.png`}
+        href="/favicon-32x32.png"
       />
       <link
         rel="icon"
         type="image/png"
         sizes="16x16"
-        href={`${basePath}/favicon-16x16.png`}
+        href="/favicon-16x16.png"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2048-2732.jpg`}
+        href="/apple-splash-2048-2732.jpg"
         media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2732-2048.jpg`}
+        href="/apple-splash-2732-2048.jpg"
         media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1668-2388.jpg`}
+        href="/apple-splash-1668-2388.jpg"
         media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2388-1668.jpg`}
+        href="/apple-splash-2388-1668.jpg"
         media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1536-2048.jpg`}
+        href="/apple-splash-1536-2048.jpg"
         media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2048-1536.jpg`}
+        href="/apple-splash-2048-1536.jpg"
         media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1668-2224.jpg`}
+        href="/apple-splash-1668-2224.jpg"
         media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2224-1668.jpg`}
+        href="/apple-splash-2224-1668.jpg"
         media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1620-2160.jpg`}
+        href="/apple-splash-1620-2160.jpg"
         media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2160-1620.jpg`}
+        href="/apple-splash-2160-1620.jpg"
         media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1284-2778.jpg`}
+        href="/apple-splash-1284-2778.jpg"
         media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2778-1284.jpg`}
+        href="/apple-splash-2778-1284.jpg"
         media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1170-2532.jpg`}
+        href="/apple-splash-1170-2532.jpg"
         media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2532-1170.jpg`}
+        href="/apple-splash-2532-1170.jpg"
         media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1125-2436.jpg`}
+        href="/apple-splash-1125-2436.jpg"
         media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2436-1125.jpg`}
+        href="/apple-splash-2436-1125.jpg"
         media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1242-2688.jpg`}
+        href="/apple-splash-1242-2688.jpg"
         media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2688-1242.jpg`}
+        href="/apple-splash-2688-1242.jpg"
         media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-828-1792.jpg`}
+        href="/apple-splash-828-1792.jpg"
         media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1792-828.jpg`}
+        href="/apple-splash-1792-828.jpg"
         media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1242-2208.jpg`}
+        href="/apple-splash-1242-2208.jpg"
         media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-2208-1242.jpg`}
+        href="/apple-splash-2208-1242.jpg"
         media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-750-1334.jpg`}
+        href="/apple-splash-750-1334.jpg"
         media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1334-750.jpg`}
+        href="/apple-splash-1334-750.jpg"
         media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-640-1136.jpg`}
+        href="/apple-splash-640-1136.jpg"
         media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
       />
       <link
         rel="apple-touch-startup-image"
-        href={`${basePath}/apple-splash-1136-640.jpg`}
+        href="/apple-splash-1136-640.jpg"
         media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
       />
       <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -160,7 +159,7 @@ const PWAHeader = ({ applicationTitle = 'Jellyseerr' }: PWAHeaderProps) => {
       />
       <link
         rel="manifest"
-        href={`${basePath}/site.webmanifest`}
+        href="/site.webmanifest"
         crossOrigin="use-credentials"
       />
       <meta name="apple-mobile-web-app-title" content={applicationTitle} />

src/components/RequestBlock/index.tsx

@@ -1,5 +1,6 @@
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
+import CachedImage from '@app/components/Common/CachedImage';
 import Tooltip from '@app/components/Common/Tooltip';
 import RequestModal from '@app/components/RequestModal';
 import useRequestOverride from '@app/hooks/useRequestOverride';
@@ -95,36 +96,58 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
         <div className="flex items-center justify-between">
           <div className="mr-6 min-w-0 flex-1 flex-col items-center text-sm leading-5">
             <div className="white mb-1 flex flex-nowrap">
-              <Tooltip content={intl.formatMessage(messages.requestedby)}>
-                <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
-              </Tooltip>
-              <span className="w-40 truncate md:w-auto">
+              <span className="flex w-40 items-center truncate md:w-auto">
+                <Tooltip content={intl.formatMessage(messages.requestedby)}>
+                  <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
+                </Tooltip>
                 <Link
                   href={
                     request.requestedBy.id === user?.id
                       ? '/profile'
                       : `/users/${request.requestedBy.id}`
                   }
-                  className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
+                  className="flex items-center font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
                 >
+                  <span className="avatar-sm">
+                    <CachedImage
+                      type="avatar"
+                      src={request.requestedBy.avatar}
+                      alt=""
+                      className="avatar-sm object-cover"
+                      width={20}
+                      height={20}
+                    />
+                  </span>
                   {request.requestedBy.displayName}
                 </Link>
               </span>
             </div>
             {request.modifiedBy && (
               <div className="flex flex-nowrap">
-                <Tooltip content={intl.formatMessage(messages.lastmodifiedby)}>
-                  <EyeIcon className="mr-1.5 h-5 w-5 flex-shrink-0" />
-                </Tooltip>
-                <span className="w-40 truncate md:w-auto">
+                <span className="flex w-40 items-center truncate md:w-auto">
+                  <Tooltip
+                    content={intl.formatMessage(messages.lastmodifiedby)}
+                  >
+                    <EyeIcon className="mr-1.5 h-5 w-5 flex-shrink-0" />
+                  </Tooltip>
                   <Link
                     href={
                       request.modifiedBy.id === user?.id
                         ? '/profile'
                         : `/users/${request.modifiedBy.id}`
                     }
-                    className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
+                    className="flex items-center font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
                   >
+                    <span className="avatar-sm">
+                      <CachedImage
+                        type="avatar"
+                        src={request.modifiedBy.avatar}
+                        alt=""
+                        className="avatar-sm object-cover"
+                        width={20}
+                        height={20}
+                      />
+                    </span>
                     {request.modifiedBy.displayName}
                   </Link>
                 </span>

src/components/RequestList/index.tsx

@@ -8,7 +8,6 @@ import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import {
   ArrowDownIcon,
   ArrowUpIcon,
@@ -174,7 +173,7 @@ const RequestList = () => {
               onChange={(e) => {
                 setCurrentMediaType(e.target.value as MediaType);
                 router.push({
-                  pathname: getBasedPath(router.pathname),
+                  pathname: router.pathname,
                   query: router.query.userId
                     ? { userId: router.query.userId }
                     : {},
@@ -204,7 +203,7 @@ const RequestList = () => {
               onChange={(e) => {
                 setCurrentFilter(e.target.value as Filter);
                 router.push({
-                  pathname: getBasedPath(router.pathname),
+                  pathname: router.pathname,
                   query: router.query.userId
                     ? { userId: router.query.userId }
                     : {},
@@ -252,7 +251,7 @@ const RequestList = () => {
               onChange={(e) => {
                 setCurrentSort(e.target.value as Sort);
                 router.push({
-                  pathname: getBasedPath(router.pathname),
+                  pathname: router.pathname,
                   query: router.query.userId
                     ? { userId: router.query.userId }
                     : {},

src/components/ResetPassword/RequestResetLink.tsx

@@ -1,4 +1,3 @@
-import Image from '@app/components/Common/BaseImage';
 import Button from '@app/components/Common/Button';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -7,6 +6,7 @@ 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';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';

src/components/ResetPassword/index.tsx

@@ -1,4 +1,3 @@
-import Image from '@app/components/Common/BaseImage';
 import Button from '@app/components/Common/Button';
 import ImageFader from '@app/components/Common/ImageFader';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
@@ -8,6 +7,7 @@ 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';
 import { useRouter } from 'next/router';
 import { useState } from 'react';

src/components/Settings/Notifications/NotificationsNtfy/index.tsx

@@ -6,6 +6,7 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { isValidURL } from '@app/utils/urlValidationHelper';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import type { NotificationAgentNtfy } from '@server/lib/settings';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
@@ -44,7 +45,7 @@ const NotificationsNtfy = () => {
     data,
     error,
     mutate: revalidate,
-  } = useSWR('/api/v1/settings/notifications/ntfy');
+  } = useSWR<NotificationAgentNtfy>('/api/v1/settings/notifications/ntfy');
 
   const NotificationsNtfySchema = Yup.object().shape({
     url: Yup.string()
@@ -78,15 +79,15 @@ const NotificationsNtfy = () => {
   return (
     <Formik
       initialValues={{
-        enabled: data.enabled,
-        types: data.types,
-        url: data.options.url,
-        topic: data.options.topic,
-        authMethodUsernamePassword: data.options.authMethod,
-        username: data.options.username,
-        password: data.options.password,
-        authMethodToken: data.options.authMethodToken,
-        token: data.options.token,
+        enabled: data?.enabled,
+        types: data?.types,
+        url: data?.options.url,
+        topic: data?.options.topic,
+        authMethodUsernamePassword: data?.options.authMethodUsernamePassword,
+        username: data?.options.username,
+        password: data?.options.password,
+        authMethodToken: data?.options.authMethodToken,
+        token: data?.options.token,
       }}
       validationSchema={NotificationsNtfySchema}
       onSubmit={async (values) => {
@@ -302,7 +303,7 @@ const NotificationsNtfy = () => {
               </div>
             )}
             <NotificationTypeSelector
-              currentTypes={values.enabled ? values.types : 0}
+              currentTypes={values.enabled ? values.types || 0 : 0}
               onUpdate={(newTypes) => {
                 setFieldValue('types', newTypes);
                 setFieldTouched('types');

src/components/Settings/SettingsLogs/index.tsx

@@ -10,7 +10,6 @@ import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { Transition } from '@headlessui/react';
 import {
   ChevronLeftIcon,
@@ -287,7 +286,7 @@ const SettingsLogs = () => {
                 name="filter"
                 onChange={(e) => {
                   setCurrentFilter(e.target.value as Filter);
-                  router.push(getBasedPath(router.pathname));
+                  router.push(router.pathname);
                 }}
                 value={currentFilter}
                 className="rounded-r-only"

src/components/Settings/SettingsMain/index.tsx

@@ -66,6 +66,8 @@ const messages = defineMessages('components.Settings.SettingsMain', {
   enableSpecialEpisodes: 'Allow Special Episodes Requests',
   locale: 'Display Language',
   youtubeUrl: 'YouTube URL',
+  youtubeUrlTip:
+    'Base URL for YouTube videos if a self-hosted YouTube instance is used.',
   validationUrl: 'You must provide a valid URL',
   validationUrlTrailingSlash: 'URL must not end in a trailing slash',
 });
@@ -536,6 +538,9 @@ const SettingsMain = () => {
                 <div className="form-row">
                   <label htmlFor="youtubeUrl" className="text-label">
                     {intl.formatMessage(messages.youtubeUrl)}
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.youtubeUrlTip)}
+                    </span>
                   </label>
                   <div className="form-input-area">
                     <div className="form-input-field">

src/components/Settings/SettingsNetwork/index.tsx

@@ -42,6 +42,9 @@ const messages = defineMessages('components.Settings.SettingsNetwork', {
   networkDisclaimer:
     'Network parameters from your container/system should be used instead of these settings. See the {docs} for more information.',
   docs: 'documentation',
+  forceIpv4First: 'Force IPv4 Resolution First',
+  forceIpv4FirstTip:
+    'Force Jellyseerr to resolve IPv4 addresses first instead of IPv6',
 });
 
 const SettingsNetwork = () => {
@@ -86,6 +89,7 @@ const SettingsNetwork = () => {
         <Formik
           initialValues={{
             csrfProtection: data?.csrfProtection,
+            forceIpv4First: data?.forceIpv4First,
             trustProxy: data?.trustProxy,
             proxyEnabled: data?.proxy?.enabled,
             proxyHostname: data?.proxy?.hostname,
@@ -102,6 +106,7 @@ const SettingsNetwork = () => {
             try {
               await axios.post('/api/v1/settings/network', {
                 csrfProtection: values.csrfProtection,
+                forceIpv4First: values.forceIpv4First,
                 trustProxy: values.trustProxy,
                 proxy: {
                   enabled: values.proxyEnabled,
@@ -193,6 +198,29 @@ const SettingsNetwork = () => {
                     </Tooltip>
                   </div>
                 </div>
+                <div className="form-row">
+                  <label htmlFor="forceIpv4First" className="checkbox-label">
+                    <span className="mr-2">
+                      {intl.formatMessage(messages.forceIpv4First)}
+                    </span>
+                    <SettingsBadge badgeType="advanced" className="mr-2" />
+                    <SettingsBadge badgeType="restartRequired" />
+                    <SettingsBadge badgeType="experimental" />
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.forceIpv4FirstTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <Field
+                      type="checkbox"
+                      id="forceIpv4First"
+                      name="forceIpv4First"
+                      onChange={() => {
+                        setFieldValue('forceIpv4First', !values.forceIpv4First);
+                      }}
+                    />
+                  </div>
+                </div>
                 <div className="form-row">
                   <label htmlFor="proxyEnabled" className="checkbox-label">
                     <span className="mr-2">

src/components/Setup/index.tsx

@@ -2,7 +2,6 @@ import EmbyLogo from '@app/assets/services/emby.svg';
 import JellyfinLogo from '@app/assets/services/jellyfin.svg';
 import PlexLogo from '@app/assets/services/plex.svg';
 import AppDataWarning from '@app/components/AppDataWarning';
-import Image from '@app/components/Common/BaseImage';
 import Button from '@app/components/Common/Button';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -14,10 +13,10 @@ import SetupSteps from '@app/components/Setup/SetupSteps';
 import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { MediaServerType } from '@server/constants/server';
 import type { Library } from '@server/lib/settings';
 import axios from 'axios';
+import Image from 'next/image';
 import { useRouter } from 'next/router';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -68,7 +67,7 @@ const Setup = () => {
       await axios.post('/api/v1/settings/main', { locale });
       mutate('/api/v1/settings/public');
 
-      router.push(getBasedPath('/'));
+      router.push('/');
     }
   };
 
@@ -109,7 +108,7 @@ const Setup = () => {
 
   useEffect(() => {
     if (settings.currentSettings.initialized) {
-      router.push(getBasedPath('/'));
+      router.push('/');
     }
 
     if (

src/components/TvDetails/index.tsx

@@ -33,7 +33,6 @@ import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import { Disclosure, Transition } from '@headlessui/react';
 import {
@@ -521,7 +520,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
         onClose={() => {
           setShowManager(false);
           router.push({
-            pathname: getBasedPath(router.pathname),
+            pathname: router.pathname,
             query: { tvId: router.query.tvId },
           });
         }}

src/components/UserList/PlexImportModal.tsx

@@ -1,10 +1,10 @@
 import Alert from '@app/components/Common/Alert';
-import Image from '@app/components/Common/BaseImage';
 import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import axios from 'axios';
+import Image from 'next/image';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';

src/components/UserList/index.tsx

@@ -16,7 +16,6 @@ import type { User } from '@app/hooks/useUser';
 import { Permission, UserType, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { Transition } from '@headlessui/react';
 import {
   BarsArrowDownIcon,
@@ -551,7 +550,7 @@ const UserList = () => {
               name="sort"
               onChange={(e) => {
                 setCurrentSort(e.target.value as Sort);
-                router.push(getBasedPath(router.pathname));
+                router.push(router.pathname);
               }}
               value={currentSort}
               className="rounded-r-only"
@@ -718,7 +717,7 @@ const UserList = () => {
                   className="mr-2"
                   onClick={() =>
                     router.push(
-                      getBasedPath('/users/[userId]/settings'),
+                      '/users/[userId]/settings',
                       `/users/${user.id}/settings`
                     )
                   }

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx

@@ -33,13 +33,14 @@ const messages = defineMessages(
 
 const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
   const intl = useIntl();
+  const parsedUserAgent = UAParser(device.userAgent);
 
   return (
     <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">
       <div className="relative flex w-full flex-col justify-between overflow-hidden sm:flex-row">
         <div className="relative z-10 flex w-full items-center overflow-hidden pl-4 pr-4 sm:pr-0 xl:w-7/12 2xl:w-2/3">
           <div className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105">
-            {UAParser(device.userAgent).device.type === 'mobile' ? (
+            {parsedUserAgent.device.type === 'mobile' ? (
               <DevicePhoneMobileIcon />
             ) : (
               <ComputerDesktopIcon />
@@ -56,8 +57,8 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
                 : 'N/A'}
             </div>
             <div className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
-              {device.userAgent
-                ? UAParser(device.userAgent).device.model
+              {device.userAgent && parsedUserAgent.device.model
+                ? parsedUserAgent.device.model
                 : intl.formatMessage(messages.unknown)}
             </div>
           </div>
@@ -68,7 +69,7 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
               {intl.formatMessage(messages.operatingsystem)}
             </span>
             <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent ? UAParser(device.userAgent).os.name : 'N/A'}
+              {device.userAgent ? parsedUserAgent.os.name : 'N/A'}
             </span>
           </div>
           <div className="card-field">
@@ -76,9 +77,7 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
               {intl.formatMessage(messages.browser)}
             </span>
             <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).browser.name
-                : 'N/A'}
+              {device.userAgent ? parsedUserAgent.browser.name : 'N/A'}
             </span>
           </div>
           <div className="card-field">
@@ -86,16 +85,14 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
               {intl.formatMessage(messages.engine)}
             </span>
             <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).engine.name
-                : 'N/A'}
+              {device.userAgent ? parsedUserAgent.engine.name : 'N/A'}
             </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">
         <ConfirmButton
-          onClick={() => disablePushNotifications(device.p256dh)}
+          onClick={() => disablePushNotifications(device.endpoint)}
           confirmText={intl.formatMessage(globalMessages.areyousure)}
           className="w-full"
         >

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx

@@ -113,7 +113,7 @@ const UserWebPushSettings = () => {
 
   // Unsubscribes from the push manager
   // Deletes/disables corresponding push subscription from database
-  const disablePushNotifications = async (p256dh?: string) => {
+  const disablePushNotifications = async (endpoint?: string) => {
     if ('serviceWorker' in navigator && user?.id) {
       navigator.serviceWorker.getRegistration('/sw.js').then((registration) => {
         registration?.pushManager
@@ -122,17 +122,21 @@ const UserWebPushSettings = () => {
             const parsedSub = JSON.parse(JSON.stringify(subscription));
 
             await axios.delete(
-              `/api/v1/user/${user?.id}/pushSubscription/${
-                p256dh ? p256dh : parsedSub.keys.p256dh
-              }`
+              `/api/v1/user/${user.id}/pushSubscription/${encodeURIComponent(
+                endpoint ?? parsedSub.endpoint
+              )}`
             );
-            if (subscription && (p256dh === parsedSub.keys.p256dh || !p256dh)) {
+
+            if (
+              subscription &&
+              (endpoint === parsedSub.endpoint || !endpoint)
+            ) {
               subscription.unsubscribe();
               setWebPushEnabled(false);
             }
             addToast(
               intl.formatMessage(
-                p256dh
+                endpoint
                   ? messages.subscriptiondeleted
                   : messages.webpushhasbeendisabled
               ),
@@ -145,7 +149,7 @@ const UserWebPushSettings = () => {
           .catch(function () {
             addToast(
               intl.formatMessage(
-                p256dh
+                endpoint
                   ? messages.subscriptiondeleteerror
                   : messages.disablingwebpusherror
               ),
@@ -176,12 +180,17 @@ const UserWebPushSettings = () => {
                 const parsedKey = JSON.parse(JSON.stringify(subscription));
                 const currentUserPushSub =
                   await axios.get<UserPushSubscription>(
-                    `/api/v1/user/${user.id}/pushSubscription/${parsedKey.keys.p256dh}`
+                    `/api/v1/user/${
+                      user.id
+                    }/pushSubscription/${encodeURIComponent(
+                      parsedKey.endpoint
+                    )}`
                   );
 
-                if (currentUserPushSub.data.p256dh !== parsedKey.keys.p256dh) {
+                if (currentUserPushSub.data.endpoint !== parsedKey.endpoint) {
                   return;
                 }
+
                 setWebPushEnabled(true);
               } else {
                 setWebPushEnabled(false);

src/components/UserProfile/index.tsx

@@ -160,9 +160,12 @@ const UserProfile = () => {
                 <dd className="mt-1 text-3xl font-semibold text-white">
                   <Link
                     href={
-                      user.id === currentUser?.id
-                        ? '/profile/requests?filter=all'
-                        : `/users/${user?.id}/requests?filter=all`
+                      currentHasPermission(
+                        [Permission.MANAGE_REQUESTS, Permission.REQUEST_VIEW],
+                        { type: 'or' }
+                      )
+                        ? `/users/${user?.id}/requests?filter=all`
+                        : '/requests'
                     }
                   >
                     {intl.formatNumber(user.requestCount)}
@@ -293,9 +296,12 @@ const UserProfile = () => {
             <div className="slider-header">
               <Link
                 href={
-                  user.id === currentUser?.id
-                    ? '/profile/requests?filter=all'
-                    : `/users/${user?.id}/requests?filter=all`
+                  currentHasPermission(
+                    [Permission.MANAGE_REQUESTS, Permission.REQUEST_VIEW],
+                    { type: 'or' }
+                  )
+                    ? `/users/${user?.id}/requests?filter=all`
+                    : '/requests'
                 }
                 className="slider-title"
               >

src/context/UserContext.tsx

@@ -17,7 +17,6 @@ export const UserContext = ({ initialUser, children }: UserContextProps) => {
   const { user, error, revalidate } = useUser({ initialData: initialUser });
   const router = useRouter();
   const routing = useRef(false);
-  const API_BASE = process.env.NEXT_PUBLIC_BASE_PATH || '';
 
   useEffect(() => {
     revalidate();
@@ -30,9 +29,9 @@ export const UserContext = ({ initialUser, children }: UserContextProps) => {
       !routing.current
     ) {
       routing.current = true;
-      location.href = `${API_BASE}/login`;
+      location.href = '/login';
     }
-  }, [router, user, error, API_BASE]);
+  }, [router, user, error]);
 
   return <>{children}</>;
 };

src/hooks/useDiscover.ts

@@ -78,8 +78,7 @@ const useDiscover = <
         )
         .join('&');
 
-      const fullEndpoint = endpoint.startsWith('/') ? `${endpoint}` : endpoint;
-      return `${fullEndpoint}?${finalQueryString}`;
+      return `${endpoint}?${finalQueryString}`;
     },
     {
       initialSize: 3,

src/hooks/useRouteGuard.ts

@@ -1,4 +1,3 @@
-import { getBasedPath } from '@app/utils/navigationUtil';
 import { useRouter } from 'next/router';
 import { useEffect } from 'react';
 import type { Permission, PermissionCheckOptions } from './useUser';
@@ -13,7 +12,7 @@ const useRouteGuard = (
 
   useEffect(() => {
     if (user && !hasPermission(permission, options)) {
-      router.push(getBasedPath('/'));
+      router.push('/');
     }
   }, [user, permission, router, hasPermission, options]);
 };

src/hooks/useUpdateQueryParams.ts

@@ -1,4 +1,3 @@
-import { getBasedPath } from '@app/utils/navigationUtil';
 import type { NextRouter } from 'next/router';
 import { useRouter } from 'next/router';
 import type { ParsedUrlQuery } from 'querystring';
@@ -107,15 +106,9 @@ export const useQueryParams = (): UseQueryParamReturnedFunction => {
 
       if (newRoute.path !== router.asPath) {
         if (routerAction === 'replace') {
-          router.replace(
-            getBasedPath(newRoute.pathname),
-            getBasedPath(newRoute.path)
-          );
+          router.replace(newRoute.pathname, newRoute.path);
         } else {
-          router.push(
-            getBasedPath(newRoute.pathname),
-            getBasedPath(newRoute.path)
-          );
+          router.push(newRoute.pathname, newRoute.path);
         }
       }
     },

src/i18n/locale/en.json

@@ -978,10 +978,13 @@
   "components.Settings.SettingsMain.validationUrl": "You must provide a valid URL",
   "components.Settings.SettingsMain.validationUrlTrailingSlash": "URL must not end in a trailing slash",
   "components.Settings.SettingsMain.youtubeUrl": "YouTube URL",
+  "components.Settings.SettingsMain.youtubeUrlTip": "Base URL for YouTube videos if a self-hosted YouTube instance is used.",
   "components.Settings.SettingsNetwork.csrfProtection": "Enable CSRF Protection",
   "components.Settings.SettingsNetwork.csrfProtectionHoverTip": "Do NOT enable this setting unless you understand what you are doing!",
   "components.Settings.SettingsNetwork.csrfProtectionTip": "Set external API access to read-only (requires HTTPS)",
   "components.Settings.SettingsNetwork.docs": "documentation",
+  "components.Settings.SettingsNetwork.forceIpv4First": "Force IPv4 Resolution First",
+  "components.Settings.SettingsNetwork.forceIpv4FirstTip": "Force Jellyseerr to resolve IPv4 addresses first instead of IPv6",
   "components.Settings.SettingsNetwork.network": "Network",
   "components.Settings.SettingsNetwork.networkDisclaimer": "Network parameters from your container/system should be used instead of these settings. See the {docs} for more information.",
   "components.Settings.SettingsNetwork.networksettings": "Network Settings",
@@ -1213,7 +1216,7 @@
   "components.Setup.librarieserror": "Validation failed. Please toggle the libraries again to continue.",
   "components.Setup.servertype": "Choose Server Type",
   "components.Setup.setup": "Setup",
-  "components.Setup.signin": "Sign in to your account",
+  "components.Setup.signin": "Sign In",
   "components.Setup.signinMessage": "Get started by signing in",
   "components.Setup.signinWithEmby": "Enter your Emby details",
   "components.Setup.signinWithJellyfin": "Enter your Jellyfin details",

src/pages/_app.tsx

@@ -99,14 +99,6 @@ const loadLocaleData = (locale: AvailableLocale): Promise<any> => {
   }
 };
 
-const API_BASE = process.env.NEXT_PUBLIC_BASE_PATH || '';
-axios.interceptors.request.use((config) => {
-  if (config.url?.startsWith('/')) {
-    config.url = `${API_BASE}${config.url}`;
-  }
-  return config;
-});
-
 // Custom types so we can correctly type our GetInitialProps function
 // with our combined user prop
 // This is specific to _app.tsx. Other pages will not need to do this!
@@ -193,9 +185,9 @@ const CoreApp: Omit<NextAppComponentType, 'origGetInitialProps'> = ({
   return (
     <SWRConfig
       value={{
-        fetcher: async (url) => axios.get(url).then((res) => res.data),
+        fetcher: (url) => axios.get(url).then((res) => res.data),
         fallback: {
-          [`${API_BASE}/api/v1/auth/me`]: user,
+          '/api/v1/auth/me': user,
         },
       }}
     >
@@ -264,7 +256,7 @@ CoreApp.getInitialProps = async (initialProps) => {
     const response = await axios.get<PublicSettingsResponse>(
       `http://${process.env.HOST || 'localhost'}:${
         process.env.PORT || 5055
-      }${API_BASE}/api/v1/settings/public`
+      }/api/v1/settings/public`
     );
 
     currentSettings = response.data;
@@ -274,7 +266,7 @@ CoreApp.getInitialProps = async (initialProps) => {
     if (!initialized) {
       if (!router.pathname.match(/(setup|login\/plex)/)) {
         ctx.res.writeHead(307, {
-          Location: `${API_BASE}/setup`,
+          Location: '/setup',
         });
         ctx.res.end();
       }
@@ -284,7 +276,7 @@ CoreApp.getInitialProps = async (initialProps) => {
         const response = await axios.get<User>(
           `http://${process.env.HOST || 'localhost'}:${
             process.env.PORT || 5055
-          }${API_BASE}/api/v1/auth/me`,
+          }/api/v1/auth/me`,
           {
             headers:
               ctx.req && ctx.req.headers.cookie
@@ -296,7 +288,7 @@ CoreApp.getInitialProps = async (initialProps) => {
 
         if (router.pathname.match(/(setup|login)/)) {
           ctx.res.writeHead(307, {
-            Location: `/`,
+            Location: '/',
           });
           ctx.res.end();
         }
@@ -306,7 +298,7 @@ CoreApp.getInitialProps = async (initialProps) => {
         // before anything actually renders
         if (!router.pathname.match(/(login|setup|resetpassword)/)) {
           ctx.res.writeHead(307, {
-            Location: `${API_BASE}/login`,
+            Location: '/login',
           });
           ctx.res.end();
         }

src/pages/collection/[collectionId]/index.tsx

@@ -11,15 +11,13 @@ const CollectionPage: NextPage<CollectionPageProps> = ({ collection }) => {
   return <CollectionDetails collection={collection} />;
 };
 
-const API_BASE = process.env.NEXT_PUBLIC_BASE_PATH || '';
-
 export const getServerSideProps: GetServerSideProps<
   CollectionPageProps
 > = async (ctx) => {
   const response = await axios.get<Collection>(
     `http://${process.env.HOST || 'localhost'}:${
       process.env.PORT || 5055
-    }${API_BASE}/api/v1/collection/${ctx.query.collectionId}`,
+    }/api/v1/collection/${ctx.query.collectionId}`,
     {
       headers: ctx.req?.headers?.cookie
         ? { cookie: ctx.req.headers.cookie }

src/pages/movie/[movieId]/index.tsx

@@ -11,15 +11,13 @@ const MoviePage: NextPage<MoviePageProps> = ({ movie }) => {
   return <MovieDetails movie={movie} />;
 };
 
-const API_BASE = process.env.NEXT_PUBLIC_BASE_PATH || '';
-
 export const getServerSideProps: GetServerSideProps<MoviePageProps> = async (
   ctx
 ) => {
   const response = await axios.get<MovieDetailsType>(
     `http://${process.env.HOST || 'localhost'}:${
       process.env.PORT || 5055
-    }${API_BASE}/api/v1/movie/${ctx.query.movieId}`,
+    }/api/v1/movie/${ctx.query.movieId}`,
     {
       headers: ctx.req?.headers?.cookie
         ? { cookie: ctx.req.headers.cookie }

src/pages/profile/requests.tsx

@@ -1,8 +0,0 @@
-import RequestList from '@app/components/RequestList';
-import type { NextPage } from 'next';
-
-const UserRequestsPage: NextPage = () => {
-  return <RequestList />;
-};
-
-export default UserRequestsPage;

src/pages/tv/[tvId]/index.tsx

@@ -11,15 +11,13 @@ const TvPage: NextPage<TvPageProps> = ({ tv }) => {
   return <TvDetails tv={tv} />;
 };
 
-const API_BASE = process.env.NEXT_PUBLIC_BASE_PATH || '';
-
 export const getServerSideProps: GetServerSideProps<TvPageProps> = async (
   ctx
 ) => {
   const response = await axios.get<TvDetailsType>(
     `http://${process.env.HOST || 'localhost'}:${
       process.env.PORT || 5055
-    }${API_BASE}/api/v1/tv/${ctx.query.tvId}`,
+    }/api/v1/tv/${ctx.query.tvId}`,
     {
       headers: ctx.req?.headers?.cookie
         ? { cookie: ctx.req.headers.cookie }

src/utils/navigationUtil.ts

@@ -1,4 +0,0 @@
-export const getBasedPath = (path: string) => {
-  const API_BASE = process.env.NEXT_PUBLIC_BASE_PATH || '';
-  return path.startsWith('/') && path !== '/' ? `${API_BASE}${path}` : path;
-};