refactor(i8n): changes the i8n message to use Jellyseerr for future ease of extraction

Properly log as connection refused if the jellyfin/emby server is unreachable. Previously it used to
throw a credentials error which lead to a lot of confusion

.all-contributorsrc

@@ -331,51 +331,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "gauthier-th",
-      "name": "Gauthier",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
-      "profile": "https://gauthierth.fr/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Kara-Zor-El",
-      "name": "Kara",
-      "avatar_url": "https://avatars.githubusercontent.com/u/69772087?v=4",
-      "profile": "https://github.com/Kara-Zor-El",
-      "contributions": [
-        "infra"
-      ]
-    },
-    {
-      "login": "JoaquinOlivero",
-      "name": "Joaquin Olivero",
-      "avatar_url": "https://avatars.githubusercontent.com/u/66050823?v=4",
-      "profile": "https://joaquinolivero.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Bretterteig",
-      "name": "Julian Behr",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47298401?v=4",
-      "profile": "https://github.com/Bretterteig",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "ThowZzy",
-      "name": "ThowZzy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/61882536?v=4",
-      "profile": "https://github.com/ThowZzy",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

.github/FUNDING.yml

@@ -1 +1 @@
-buy_me_a_coffee: fallen.bagel
+github: [Fallenbagel]

.github/workflows/snap.yaml

@@ -1,13 +1,9 @@
 name: Publish Snap
 
-# turn off edge snap builds temporarily and make it manual
-
-# on:
-#  push:
-#    branches:
-#      - develop
-
-on: workflow_dispatch
+on:
+  push:
+    branches:
+      - develop
 
 jobs:
   jobs:

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-40-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-35-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -231,13 +231,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="https://arm0.red"><img src="https://avatars.githubusercontent.com/u/16858514?v=4?s=100" width="100px;" alt="Stephen Harris"/><br /><sub><b>Stephen Harris</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=trackmastersteve" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.boniface.me"><img src="https://avatars.githubusercontent.com/u/4031396?v=4?s=100" width="100px;" alt="Joshua M. Boniface"/><br /><sub><b>Joshua M. Boniface</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=joshuaboniface" title="Code">💻</a></td>
     </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kara-Zor-El"><img src="https://avatars.githubusercontent.com/u/69772087?v=4?s=100" width="100px;" alt="Kara"/><br /><sub><b>Kara</b></sub></a><br /><a href="#infra-Kara-Zor-El" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <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>
-    </tr>
   </tbody>
 </table>
 

server/api/jellyfin.ts

@@ -1,10 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import ExternalAPI from '@server/api/externalapi';
-import { ApiErrorCode } from '@server/constants/error';
 import availabilitySync from '@server/lib/availabilitySync';
 import logger from '@server/logger';
-import { ApiError } from '@server/types/error';
-import { getAppVersion } from '@server/utils/appVersion';
+import type { AxiosInstance } from 'axios';
+import axios from 'axios';
 
 export interface JellyfinUserResponse {
   Name: string;
@@ -92,86 +90,52 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
   DateCreated?: string;
 }
 
-class JellyfinAPI extends ExternalAPI {
+class JellyfinAPI {
   private authToken?: string;
   private userId?: string;
   private jellyfinHost: string;
+  private axios: AxiosInstance;
 
   constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
-    let authHeaderVal: string;
-    if (authToken) {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
-    } else {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}"`;
-    }
-
-    super(
-      jellyfinHost,
-      {},
-      {
-        headers: {
-          'X-Emby-Authorization': authHeaderVal,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-      }
-    );
-
     this.jellyfinHost = jellyfinHost;
     this.authToken = authToken;
+
+    let authHeaderVal = '';
+    if (this.authToken) {
+      authHeaderVal = `MediaBrowser Client="Overseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0", Token="${authToken}"`;
+    } else {
+      authHeaderVal = `MediaBrowser Client="Overseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0"`;
+    }
+
+    this.axios = axios.create({
+      baseURL: this.jellyfinHost,
+      headers: {
+        'X-Emby-Authorization': authHeaderVal,
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+    });
   }
 
   public async login(
     Username?: string,
-    Password?: string,
-    ClientIP?: string
+    Password?: string
   ): Promise<JellyfinLoginResponse> {
-    logger.debug('Client IP: ', ClientIP);
     try {
-      const headers = ClientIP
-        ? {
-            'X-Forwarded-For': ClientIP,
-          }
-        : {};
-
-      const authResponse = await this.post<JellyfinLoginResponse>(
+      const account = await this.axios.post<JellyfinLoginResponse>(
         '/Users/AuthenticateByName',
         {
           Username: Username,
           Pw: Password,
-        },
-        {
-          headers: headers,
         }
       );
-
-      return authResponse;
+      return account.data;
     } catch (e) {
-      logger.debug(e);
-      const status = e.response?.status;
-
-      const networkErrorCodes = new Set([
-        'ECONNREFUSED',
-        'EHOSTUNREACH',
-        'ENOTFOUND',
-        'ETIMEDOUT',
-        'ECONNRESET',
-        'EADDRINUSE',
-        'ENETDOWN',
-        'ENETUNREACH',
-        'EPIPE',
-        'ECONNABORTED',
-        'EPROTO',
-        'EHOSTDOWN',
-        'EAI_AGAIN',
-        'ERR_INVALID_URL',
-      ]);
-
-      if (networkErrorCodes.has(e.code) || status === 404) {
-        throw new ApiError(status, ApiErrorCode.InvalidUrl);
+      if (e.code === 'ECONNREFUSED') {
+        throw new Error('Connection_refused');
+      } else {
+        throw new Error('Unauthorized');
       }
-
-      throw new ApiError(status, ApiErrorCode.InvalidCredentials);
     }
   }
 
@@ -182,72 +146,66 @@ class JellyfinAPI extends ExternalAPI {
 
   public async getServerName(): Promise<string> {
     try {
-      const serverResponse = await this.get<JellyfinUserResponse>(
-        '/System/Info/Public'
+      const account = await this.axios.get<JellyfinUserResponse>(
+        "/System/Info/Public'}"
       );
-
-      return serverResponse.ServerName;
+      return account.data.ServerName;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
+      throw new Error('girl idk');
     }
   }
 
   public async getUsers(): Promise<JellyfinUserListResponse> {
     try {
-      const userReponse = await this.get<JellyfinUserResponse[]>(`/Users`);
-
-      return { users: userReponse };
+      const account = await this.axios.get(`/Users`);
+      return { users: account.data };
     } catch (e) {
       logger.error(
         `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 
   public async getUser(): Promise<JellyfinUserResponse> {
     try {
-      const userReponse = await this.get<JellyfinUserResponse>(
+      const account = await this.axios.get<JellyfinUserResponse>(
         `/Users/${this.userId ?? 'Me'}`
       );
-      return userReponse;
+      return account.data;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 
   public async getLibraries(): Promise<JellyfinLibrary[]> {
     try {
-      const mediaFolderResponse = await this.get<any>(`/Library/MediaFolders`);
+      const mediaFolders = await this.axios.get<any>(`/Library/MediaFolders`);
 
-      return this.mapLibraries(mediaFolderResponse.Items);
-    } catch (mediaFoldersResponseError) {
+      return this.mapLibraries(mediaFolders.data.Items);
+    } catch (mediaFoldersError) {
       // fallback to user views to get libraries
-      // this only and maybe/depending on factors affects LDAP users
+      // this only affects LDAP users
       try {
-        const mediaFolderResponse = await this.get<any>(
+        const mediaFolders = await this.axios.get<any>(
           `/Users/${this.userId ?? 'Me'}/Views`
         );
 
-        return this.mapLibraries(mediaFolderResponse.Items);
+        return this.mapLibraries(mediaFolders.data.Items);
       } catch (e) {
         logger.error(
           `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
           { label: 'Jellyfin API' }
         );
-
         return [];
       }
     }
@@ -281,11 +239,11 @@ class JellyfinAPI extends ExternalAPI {
 
   public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
     try {
-      const libraryItemsResponse = await this.get<any>(
+      const contents = await this.axios.get<any>(
         `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
       );
 
-      return libraryItemsResponse.Items.filter(
+      return contents.data.Items.filter(
         (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
       );
     } catch (e) {
@@ -293,25 +251,23 @@ class JellyfinAPI extends ExternalAPI {
         `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 
   public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
     try {
-      const itemResponse = await this.get<any>(
+      const contents = await this.axios.get<any>(
         `/Users/${this.userId}/Items/Latest?Limit=12&ParentId=${id}`
       );
 
-      return itemResponse;
+      return contents.data;
     } catch (e) {
       logger.error(
         `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 
@@ -319,38 +275,36 @@ class JellyfinAPI extends ExternalAPI {
     id: string
   ): Promise<JellyfinLibraryItemExtended | undefined> {
     try {
-      const itemResponse = await this.get<any>(
+      const contents = await this.axios.get<any>(
         `/Users/${this.userId}/Items/${id}`
       );
 
-      return itemResponse;
+      return contents.data;
     } catch (e) {
       if (availabilitySync.running) {
         if (e.response && e.response.status === 500) {
           return undefined;
         }
       }
-
       logger.error(
         `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 
   public async getSeasons(seriesID: string): Promise<JellyfinLibraryItem[]> {
     try {
-      const seasonResponse = await this.get<any>(`/Shows/${seriesID}/Seasons`);
+      const contents = await this.axios.get<any>(`/Shows/${seriesID}/Seasons`);
 
-      return seasonResponse.Items;
+      return contents.data.Items;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 
@@ -359,11 +313,11 @@ class JellyfinAPI extends ExternalAPI {
     seasonID: string
   ): Promise<JellyfinLibraryItem[]> {
     try {
-      const episodeResponse = await this.get<any>(
+      const contents = await this.axios.get<any>(
         `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
       );
 
-      return episodeResponse.Items.filter(
+      return contents.data.Items.filter(
         (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
       );
     } catch (e) {
@@ -371,8 +325,7 @@ class JellyfinAPI extends ExternalAPI {
         `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }
       );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
     }
   }
 }

server/constants/error.ts

@@ -1,7 +0,0 @@
-export enum ApiErrorCode {
-  InvalidUrl = 'INVALID_URL',
-  InvalidCredentials = 'INVALID_CREDENTIALS',
-  InvalidAuthToken = 'INVALID_AUTH_TOKEN',
-  NotAdmin = 'NOT_ADMIN',
-  Unknown = 'UNKNOWN',
-}

server/routes/auth.ts

@@ -1,6 +1,5 @@
 import JellyfinAPI from '@server/api/jellyfin';
 import PlexTvAPI from '@server/api/plextv';
-import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
@@ -10,7 +9,6 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
-import { ApiError } from '@server/types/error';
 import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
 import gravatarUrl from 'gravatar-url';
@@ -271,13 +269,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
       ? jellyfinHost.slice(0, -1)
       : jellyfinHost;
 
-    const ip = req.ip ? req.ip.split(':').reverse()[0] : undefined;
-    const account = await jellyfinserver.login(
-      body.username,
-      body.password,
-      ip
-    );
-
+    const account = await jellyfinserver.login(body.username, body.password);
     // Next let's see if the user already exists
     user = await userRepository.findOne({
       where: { jellyfinUserId: account.User.Id },
@@ -286,7 +278,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
     if (!user && !(await userRepository.count())) {
       // Check if user is admin on jellyfin
       if (account.User.Policy.IsAdministrator === false) {
-        throw new ApiError(403, ApiErrorCode.NotAdmin);
+        throw new Error('not_admin');
       }
 
       logger.info(
@@ -314,9 +306,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         userType: UserType.JELLYFIN,
       });
 
-      const serverName = await jellyfinserver.getServerName();
-
-      settings.jellyfin.name = serverName;
       settings.jellyfin.hostname = body.hostname ?? '';
       settings.jellyfin.serverId = account.User.ServerId;
       settings.save();
@@ -325,7 +314,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
       await userRepository.save(user);
     }
     // User already exists, let's update their information
-    else if (account.User.Id === user?.jellyfinUserId) {
+    else if (body.username === user?.jellyfinUsername) {
       logger.info(
         `Found matching ${
           settings.main.mediaServerType === MediaServerType.JELLYFIN
@@ -423,63 +412,57 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
 
     return res.status(200).json(user?.filter() ?? {});
   } catch (e) {
-    switch (e.errorCode) {
-      case ApiErrorCode.InvalidUrl:
-        logger.error(
-          `The provided ${
-            process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin'
-          } is invalid or the server is not reachable.`,
-          {
-            label: 'Auth',
-            error: e.errorCode,
-            status: e.statusCode,
-            hostname: body.hostname,
-          }
-        );
-        return next({
-          status: e.statusCode,
-          message: e.errorCode,
-        });
-
-      case ApiErrorCode.InvalidCredentials:
-        logger.warn(
-          'Failed login attempt from user with incorrect Jellyfin credentials',
-          {
-            label: 'Auth',
-            account: {
-              ip: req.ip,
-              email: body.username,
-              password: '__REDACTED__',
-            },
-          }
-        );
-        return next({
-          status: e.statusCode,
-          message: e.errorCode,
-        });
-
-      case ApiErrorCode.NotAdmin:
-        logger.warn(
-          'Failed login attempt from user without admin permissions',
-          {
-            label: 'Auth',
-            account: {
-              ip: req.ip,
-              email: body.username,
-            },
-          }
-        );
-        return next({
-          status: e.statusCode,
-          message: e.errorCode,
-        });
-
-      default:
-        logger.error(e.message, { label: 'Auth' });
-        return next({
-          status: 500,
-          message: 'Something went wrong.',
-        });
+    if (e.message === 'Unauthorized') {
+      logger.warn(
+        'Failed login attempt from user with incorrect Jellyfin credentials',
+        {
+          label: 'Auth',
+          account: {
+            ip: req.ip,
+            email: body.username,
+            password: '__REDACTED__',
+          },
+        }
+      );
+      return next({
+        status: 401,
+        message: 'Unauthorized',
+      });
+    } else if (e.message === 'not_admin') {
+      return next({
+        status: 403,
+        message: 'CREDENTIAL_ERROR_NOT_ADMIN',
+      });
+    } else if (e.message === 'add_email') {
+      return next({
+        status: 406,
+        message: 'CREDENTIAL_ERROR_ADD_EMAIL',
+      });
+    } else if (e.message === 'select_server_type') {
+      return next({
+        status: 406,
+        message: 'CREDENTIAL_ERROR_NO_SERVER_TYPE',
+      });
+    } else if (e.message === 'Connection_refused') {
+      logger.error(
+        `Unable to connect to ${
+          process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin'
+        } server`,
+        {
+          label: 'Auth',
+          hostname: body.hostname,
+        }
+      );
+      return next({
+        status: 503,
+        message: 'CONNECTION_REFUSED',
+      });
+    } else {
+      logger.error(e.message, { label: 'Auth' });
+      return next({
+        status: 500,
+        message: 'Something went wrong.',
+      });
     }
   }
 });

server/routes/user/usersettings.ts

@@ -98,7 +98,6 @@ userSettingsRoutes.post<
     }
 
     user.username = req.body.username;
-    user.email = req.body.email ?? user.email;
 
     // Update quota values only if the user has the correct permissions
     if (
@@ -128,19 +127,20 @@ userSettingsRoutes.post<
       user.settings.originalLanguage = req.body.originalLanguage;
       user.settings.watchlistSyncMovies = req.body.watchlistSyncMovies;
       user.settings.watchlistSyncTv = req.body.watchlistSyncTv;
+      user.email = req.body.email ?? user.email;
     }
 
-    const savedUser = await userRepository.save(user);
+    await userRepository.save(user);
 
     return res.status(200).json({
-      username: savedUser.username,
-      discordId: savedUser.settings?.discordId,
-      locale: savedUser.settings?.locale,
-      region: savedUser.settings?.region,
-      originalLanguage: savedUser.settings?.originalLanguage,
-      watchlistSyncMovies: savedUser.settings?.watchlistSyncMovies,
-      watchlistSyncTv: savedUser.settings?.watchlistSyncTv,
-      email: savedUser.email,
+      username: user.username,
+      discordId: user.settings.discordId,
+      locale: user.settings.locale,
+      region: user.settings.region,
+      originalLanguage: user.settings.originalLanguage,
+      watchlistSyncMovies: user.settings.watchlistSyncMovies,
+      watchlistSyncTv: user.settings.watchlistSyncTv,
+      email: user.email,
     });
   } catch (e) {
     next({ status: 500, message: e.message });

server/types/error.ts

@@ -1,9 +0,0 @@
-import type { ApiErrorCode } from '@server/constants/error';
-
-export class ApiError extends Error {
-  constructor(public statusCode: number, public errorCode: ApiErrorCode) {
-    super();
-
-    this.name = 'apiError';
-  }
-}

src/components/Login/JellyfinLogin.tsx

@@ -2,7 +2,6 @@ import Button from '@app/components/Common/Button';
 import Tooltip from '@app/components/Common/Tooltip';
 import useSettings from '@app/hooks/useSettings';
 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';
@@ -27,7 +26,7 @@ const messages = defineMessages({
   loginerror: 'Something went wrong while trying to sign in.',
   adminerror: 'You must use an admin account to sign in.',
   credentialerror: 'The username or password is incorrect.',
-  invalidurlerror: 'Unable to connect to {mediaServerName} server.',
+  connectionrefusederror: 'Unable to connect to {mediaServerName} server.',
   signingin: 'Signing in…',
   signin: 'Sign In',
   initialsigningin: 'Connecting…',
@@ -93,24 +92,17 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
               email: values.email,
             });
           } catch (e) {
-            let errorMessage = null;
-            switch (e.response?.data?.message) {
-              case ApiErrorCode.InvalidUrl:
-                errorMessage = messages.invalidurlerror;
-                break;
-              case ApiErrorCode.InvalidCredentials:
-                errorMessage = messages.credentialerror;
-                break;
-              case ApiErrorCode.NotAdmin:
-                errorMessage = messages.adminerror;
-                break;
-              default:
-                errorMessage = messages.loginerror;
-                break;
-            }
-
             toasts.addToast(
-              intl.formatMessage(errorMessage, mediaServerFormatValues),
+              intl.formatMessage(
+                e.message == 'Request failed with status code 401'
+                  ? messages.credentialerror
+                  : e.message == 'Request failed with status code 403'
+                  ? messages.adminerror
+                  : e.message == 'Request failed with status code 503'
+                  ? messages.connectionrefusederror
+                  : messages.loginerror,
+                mediaServerFormatValues
+              ),
               {
                 autoDismiss: true,
                 appearance: 'error',

src/components/Settings/SettingsPlex.tsx

@@ -28,7 +28,7 @@ const messages = defineMessages({
   plex: 'Plex',
   plexsettings: 'Plex Settings',
   plexsettingsDescription:
-    'Configure the settings for your Plex server. Overseerr scans your Plex libraries to determine content availability.',
+    'Configure the settings for your Plex server. Jellyseerr scans your Plex libraries to determine content availability.',
   serverpreset: 'Server',
   serverLocal: 'local',
   serverRemote: 'remote',

src/context/LanguageContext.tsx

@@ -9,7 +9,6 @@ export type AvailableLocale =
   | 'en'
   | 'el'
   | 'es'
-  | 'es-MX'
   | 'fr'
   | 'hr'
   | 'hu'
@@ -60,10 +59,6 @@ export const availableLanguages: AvailableLanguageObject = {
     code: 'es',
     display: 'Español',
   },
-  'es-MX': {
-    code: 'es-MX',
-    display: 'Español (Latinoamérica)',
-  },
   fr: {
     code: 'fr',
     display: 'Français',

src/i18n/locale/en.json

@@ -220,7 +220,7 @@
   "components.Layout.VersionStatus.streamdevelop": "Jellyseerr Develop",
   "components.Layout.VersionStatus.streamstable": "Jellyseerr Stable",
   "components.Login.adminerror": "You must use an admin account to sign in.",
-  "components.Login.invalidurlerror": "Unable to connect to {mediaServerName} server.",
+  "components.Login.connectionrefusederror": "Unable to connect to {mediaServerName} server.",
   "components.Login.credentialerror": "The username or password is incorrect.",
   "components.Login.description": "Since this is your first time logging into {applicationName}, you are required to add a valid email address.",
   "components.Login.email": "Email Address",

src/pages/_app.tsx

@@ -41,8 +41,6 @@ const loadLocaleData = (locale: AvailableLocale): Promise<any> => {
       return import('../i18n/locale/el.json');
     case 'es':
       return import('../i18n/locale/es.json');
-    case 'es-MX':
-      return import('../i18n/locale/es_MX.json');
     case 'fr':
       return import('../i18n/locale/fr.json');
     case 'hr':