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

@@ -322,6 +322,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "joshuaboniface",
+      "name": "Joshua M. Boniface",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4031396?v=4",
+      "profile": "https://www.boniface.me",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.github/workflows/conflict_labeler.yml

@@ -0,0 +1,26 @@
+name: Merge Conflict Labeler
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request_target:
+    branches:
+      - develop
+    types: [synchronize]
+
+jobs:
+  label:
+    name: Labeling
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'Fallenbagel/jellyseerr' }}
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Apply label
+        uses: eps1lon/actions-label-merge-conflict@v3
+        with:
+          dirtyLabel: 'merge conflict'
+          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'

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-34-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.
@@ -229,6 +229,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="https://aleksasiriski.dev"><img src="https://avatars.githubusercontent.com/u/31509435?v=4?s=100" width="100px;" alt="Aleksa Siriški"/><br /><sub><b>Aleksa Siriški</b></sub></a><br /><a href="#infra-aleksasiriski" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://danishhumair.com"><img src="https://avatars.githubusercontent.com/u/121830048?v=4?s=100" width="100px;" alt="Danish Humair"/><br /><sub><b>Danish Humair</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Danish-H" title="Code">💻</a></td>
       <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>
   </tbody>
 </table>

overseerr-api.yml

@@ -2092,6 +2092,13 @@ paths:
             application/json:
               schema:
                 type: array
+                items:
+                  type: object
+                  properties:
+                    username:
+                      type: string
+                    userId:
+                      type: integer
   /settings/jellyfin/sync:
     get:
       summary: Get status of full Jellyfin library sync
@@ -3395,6 +3402,12 @@ paths:
         Updates a single slider and return the newly updated slider. Requires the `ADMIN` permission.
       tags:
         - settings
+      parameters:
+        - in: path
+          name: sliderId
+          required: true
+          schema:
+            type: number
       requestBody:
         required: true
         content:
@@ -3724,7 +3737,7 @@ paths:
                   results:
                     type: array
                     items:
-                    $ref: '#/components/schemas/User'
+                      $ref: '#/components/schemas/User'
     post:
       summary: Create new user
       description: |

server/api/jellyfin.ts

@@ -131,7 +131,11 @@ class JellyfinAPI {
       );
       return account.data;
     } catch (e) {
-      throw new Error('Unauthorized');
+      if (e.code === 'ECONNREFUSED') {
+        throw new Error('Connection_refused');
+      } else {
+        throw new Error('Unauthorized');
+      }
     }
   }
 

server/lib/notifications/agents/webhook.ts

@@ -141,7 +141,7 @@ class WebhookAgent
     const payloadString = Buffer.from(
       this.getSettings().options.jsonPayload,
       'base64'
-    ).toString('ascii');
+    ).toString('utf8');
 
     const parsedJSON = JSON.parse(JSON.parse(payloadString));
 

server/routes/auth.ts

@@ -443,6 +443,20 @@ authRoutes.post('/jellyfin', async (req, res, 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({

server/routes/settings/notifications.ts

@@ -275,7 +275,7 @@ notificationRoutes.get('/webhook', (_req, res) => {
       ...webhookSettings.options,
       jsonPayload: JSON.parse(
         Buffer.from(webhookSettings.options.jsonPayload, 'base64').toString(
-          'ascii'
+          'utf8'
         )
       ),
     },

src/components/Login/JellyfinLogin.tsx

@@ -26,6 +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.',
+  connectionrefusederror: 'Unable to connect to {mediaServerName} server.',
   signingin: 'Signing in…',
   signin: 'Sign In',
   initialsigningin: 'Connecting…',
@@ -97,7 +98,10 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                   ? messages.credentialerror
                   : e.message == 'Request failed with status code 403'
                   ? messages.adminerror
-                  : messages.loginerror
+                  : e.message == 'Request failed with status code 503'
+                  ? messages.connectionrefusederror
+                  : messages.loginerror,
+                mediaServerFormatValues
               ),
               {
                 autoDismiss: true,

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/components/Settings/SonarrModal/index.tsx

@@ -1,10 +1,8 @@
 import Modal from '@app/components/Common/Modal';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
-import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import { Transition } from '@headlessui/react';
-import { MediaServerType } from '@server/constants/server';
+import type { SonarrSettings } from '@server/lib/settings';
-import { type SonarrSettings } from '@server/lib/settings';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -111,7 +109,6 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
   const { addToast } = useToasts();
   const [isValidated, setIsValidated] = useState(sonarr ? true : false);
   const [isTesting, setIsTesting] = useState(false);
-  const settings = useSettings();
   const [testResponse, setTestResponse] = useState<TestResponse>({
     profiles: [],
     rootFolders: [],
@@ -258,9 +255,7 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
           animeTags: sonarr?.animeTags ?? [],
           isDefault: sonarr?.isDefault ?? false,
           is4k: sonarr?.is4k ?? false,
-          enableSeasonFolders:
+          enableSeasonFolders: sonarr?.enableSeasonFolders ?? false,
-            sonarr?.enableSeasonFolders ??
-            settings.currentSettings.mediaServerType !== MediaServerType.PLEX,
           externalUrl: sonarr?.externalUrl,
           syncEnabled: sonarr?.syncEnabled ?? false,
           enableSearch: !sonarr?.preventSearch,
@@ -966,24 +961,11 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                   >
                     {intl.formatMessage(messages.seasonfolders)}
                   </label>
-                  <div
+                  <div className="form-input-area">
-                    className={`form-input-area ${
-                      settings.currentSettings.mediaServerType ===
-                        MediaServerType.JELLYFIN ||
-                      settings.currentSettings.mediaServerType ===
-                        MediaServerType.EMBY
-                        ? 'opacity-50'
-                        : 'opacity-100'
-                    }`}
-                  >
                     <Field
                       type="checkbox"
                       id="enableSeasonFolders"
                       name="enableSeasonFolders"
-                      disabled={
-                        settings.currentSettings.mediaServerType !==
-                        MediaServerType.PLEX
-                      }
                     />
                   </div>
                 </div>

src/i18n/locale/en.json

@@ -219,8 +219,9 @@
   "components.Layout.VersionStatus.outofdate": "Out of Date",
   "components.Layout.VersionStatus.streamdevelop": "Jellyseerr Develop",
   "components.Layout.VersionStatus.streamstable": "Jellyseerr Stable",
-  "components.Login.credentialerror": "The username or password is incorrect.",
   "components.Login.adminerror": "You must use an admin account to sign in.",
+  "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",
   "components.Login.emailtooltip": "Address does not need to be associated with your {mediaServerName} instance.",
@@ -752,8 +753,8 @@
   "components.Settings.SettingsAbout.overseerrinformation": "About Jellyseerr",
   "components.Settings.SettingsAbout.preferredmethod": "Preferred",
   "components.Settings.SettingsAbout.runningDevelop": "You are running the <code>develop</code> branch of Jellyseerr, which is only recommended for those contributing to development or assisting with bleeding-edge testing.",
-  "components.Settings.SettingsAbout.supportoverseerr": "Support Overseerr",
   "components.Settings.SettingsAbout.supportjellyseerr": "Support Jellyseerr",
+  "components.Settings.SettingsAbout.supportoverseerr": "Support Overseerr",
   "components.Settings.SettingsAbout.timezone": "Time Zone",
   "components.Settings.SettingsAbout.totalmedia": "Total Media",
   "components.Settings.SettingsAbout.totalrequests": "Total Requests",
@@ -938,17 +939,18 @@
   "components.Settings.hostname": "Hostname or IP Address",
   "components.Settings.internalUrl": "Internal URL",
   "components.Settings.is4k": "4K",
+  "components.Settings.jellyfinForgotPasswordUrl": "Forgot Password URL",
   "components.Settings.jellyfinSettings": "{mediaServerName} Settings",
   "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.",
   "components.Settings.jellyfinSettingsFailure": "Something went wrong while saving {mediaServerName} settings.",
   "components.Settings.jellyfinSettingsSuccess": "{mediaServerName} settings saved successfully!",
+  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Custom authentication with Automatic Library Grouping not supported",
+  "components.Settings.jellyfinSyncFailedGenericError": "Something went wrong while syncing libraries",
+  "components.Settings.jellyfinSyncFailedNoLibrariesFound": "No libraries were found",
   "components.Settings.jellyfinlibraries": "{mediaServerName} Libraries",
   "components.Settings.jellyfinlibrariesDescription": "The libraries {mediaServerName} scans for titles. Click the button below if no libraries are listed.",
   "components.Settings.jellyfinsettings": "{mediaServerName} Settings",
   "components.Settings.jellyfinsettingsDescription": "Configure the settings for your {mediaServerName} server. {mediaServerName} scans your {mediaServerName} libraries to see what content is available.",
-  "components.Settings.jellyfinSyncFailedNoLibrariesFound": "No libraries were found",
-  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Custom authentication with Automatic Library Grouping not supported",
-  "components.Settings.jellyfinSyncFailedGenericError": "Something went wrong while syncing libraries",
   "components.Settings.librariesRemaining": "Libraries Remaining: {count}",
   "components.Settings.manualscan": "Manual Library Scan",
   "components.Settings.manualscanDescription": "Normally, this will only be run once every 24 hours. Jellyseerr will check your Plex server's recently added more aggressively. If this is your first time configuring Plex, a one-time full manual library scan is recommended!",