From 6faafc0d5c1218e22c0dc1da64e671476b475434 Mon Sep 17 00:00:00 2001 From: rahul05ranjan Date: Wed, 30 Sep 2026 12:28:46 +0530 Subject: [PATCH] refactor: use ServerType enum for media server display names --- server/constants/server.ts | 1 + src/components/IssueDetails/index.tsx | 26 +++++++++---------- src/components/Login/LocalLogin.tsx | 6 ++--- src/components/Login/index.tsx | 8 +++--- src/components/ManageSlideOver/index.tsx | 8 +++--- src/components/MovieDetails/index.tsx | 26 ++++++++++++++----- src/components/PermissionEdit/index.tsx | 14 +++++----- src/components/Settings/SettingsJellyfin.tsx | 10 +++---- src/components/Settings/SettingsLayout.tsx | 6 ++--- src/components/Settings/SettingsPlex.tsx | 3 ++- .../Settings/SettingsUsers/index.tsx | 8 +++--- src/components/StatusBadge/index.tsx | 8 +++--- src/components/TvDetails/index.tsx | 26 ++++++++++++++----- .../UserList/JellyfinImportModal.tsx | 26 +++++++++---------- src/components/UserList/index.tsx | 12 ++++----- .../UserGeneralSettings/index.tsx | 5 ++-- .../LinkJellyfinModal.tsx | 6 ++--- .../LinkJellyfinQuickConnectModal.tsx | 6 ++--- 18 files changed, 116 insertions(+), 89 deletions(-) diff --git a/server/constants/server.ts b/server/constants/server.ts index eed1939f63..fdf1be3c8e 100644 --- a/server/constants/server.ts +++ b/server/constants/server.ts @@ -8,4 +8,5 @@ export enum MediaServerType { export enum ServerType { JELLYFIN = 'Jellyfin', EMBY = 'Emby', + PLEX = 'Plex', } diff --git a/src/components/IssueDetails/index.tsx b/src/components/IssueDetails/index.tsx index e272da96ba..82a29c4f85 100644 --- a/src/components/IssueDetails/index.tsx +++ b/src/components/IssueDetails/index.tsx @@ -24,7 +24,7 @@ import { import { ArrowPathIcon } from '@heroicons/react/24/solid'; import { IssueStatus } from '@server/constants/issue'; import { MediaType } from '@server/constants/media'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type Issue from '@server/entity/Issue'; import type { MovieDetails } from '@server/models/Movie'; import type { TvDetails } from '@server/models/Tv'; @@ -385,15 +385,15 @@ const IssueDetails = () => { {settings.currentSettings.mediaServerType === MediaServerType.EMBY ? intl.formatMessage(messages.playonplex, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, }) : settings.currentSettings.mediaServerType === MediaServerType.PLEX ? intl.formatMessage(messages.playonplex, { - mediaServerName: 'Plex', + mediaServerName: ServerType.PLEX, }) : intl.formatMessage(messages.playonplex, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} @@ -433,15 +433,15 @@ const IssueDetails = () => { {settings.currentSettings.mediaServerType === MediaServerType.EMBY ? intl.formatMessage(messages.play4konplex, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, }) : settings.currentSettings.mediaServerType === MediaServerType.PLEX ? intl.formatMessage(messages.play4konplex, { - mediaServerName: 'Plex', + mediaServerName: ServerType.PLEX, }) : intl.formatMessage(messages.play4konplex, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} @@ -651,15 +651,15 @@ const IssueDetails = () => { {settings.currentSettings.mediaServerType === MediaServerType.EMBY ? intl.formatMessage(messages.playonplex, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, }) : settings.currentSettings.mediaServerType === MediaServerType.PLEX ? intl.formatMessage(messages.playonplex, { - mediaServerName: 'Plex', + mediaServerName: ServerType.PLEX, }) : intl.formatMessage(messages.playonplex, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} @@ -698,15 +698,15 @@ const IssueDetails = () => { {settings.currentSettings.mediaServerType === MediaServerType.EMBY ? intl.formatMessage(messages.play4konplex, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, }) : settings.currentSettings.mediaServerType === MediaServerType.PLEX ? intl.formatMessage(messages.play4konplex, { - mediaServerName: 'Plex', + mediaServerName: ServerType.PLEX, }) : intl.formatMessage(messages.play4konplex, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} diff --git a/src/components/Login/LocalLogin.tsx b/src/components/Login/LocalLogin.tsx index 56dd227bd0..5b77869bd8 100644 --- a/src/components/Login/LocalLogin.tsx +++ b/src/components/Login/LocalLogin.tsx @@ -5,7 +5,7 @@ import useSettings from '@app/hooks/useSettings'; import defineMessages from '@app/utils/defineMessages'; import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline'; import { ExclamationTriangleIcon } from '@heroicons/react/24/solid'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import Link from 'next/link'; @@ -133,8 +133,8 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' - : 'Emby', + ? ServerType.JELLYFIN + : ServerType.EMBY, })} )} diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx index 2c321490b6..34666a2314 100644 --- a/src/components/Login/index.tsx +++ b/src/components/Login/index.tsx @@ -13,7 +13,7 @@ import { useUser } from '@app/hooks/useUser'; import defineMessages from '@app/utils/defineMessages'; import { Transition } from '@headlessui/react'; import { XCircleIcon } from '@heroicons/react/24/solid'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import axios from 'axios'; import { useRouter } from 'next/dist/client/router'; import Image from 'next/image'; @@ -83,11 +83,11 @@ const Login = () => { const mediaServerName = settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? 'Plex' + ? ServerType.PLEX : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' + ? ServerType.JELLYFIN : settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' + ? ServerType.EMBY : undefined; const MediaServerLogo = diff --git a/src/components/ManageSlideOver/index.tsx b/src/components/ManageSlideOver/index.tsx index a6fd5a1747..c1b90cc954 100644 --- a/src/components/ManageSlideOver/index.tsx +++ b/src/components/ManageSlideOver/index.tsx @@ -24,7 +24,7 @@ import { MediaStatus, MediaType, } from '@server/constants/media'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { MediaWatchDataResponse } from '@server/interfaces/api/mediaInterfaces'; import type { DownloadingItem } from '@server/lib/downloadtracker'; import type { RadarrSettings, SonarrSettings } from '@server/lib/settings'; @@ -733,11 +733,11 @@ const ManageSlideOver = ({ mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' + ? ServerType.EMBY : settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? 'Plex' - : 'Jellyfin', + ? ServerType.PLEX + : ServerType.JELLYFIN, })} diff --git a/src/components/MovieDetails/index.tsx b/src/components/MovieDetails/index.tsx index 80aded586e..1ab7f10d49 100644 --- a/src/components/MovieDetails/index.tsx +++ b/src/components/MovieDetails/index.tsx @@ -51,7 +51,7 @@ import { import { type RatingResponse } from '@server/api/ratings'; import { IssueStatus } from '@server/constants/issue'; import { MediaStatus, MediaType } from '@server/constants/media'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { MovieDetails as MovieDetailsType } from '@server/models/Movie'; import axios from 'axios'; import { countries } from 'country-flag-icons'; @@ -305,26 +305,38 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => { function getAvailableMediaServerName() { if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) { - return intl.formatMessage(messages.play, { mediaServerName: 'Emby' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.EMBY, + }); } if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) { - return intl.formatMessage(messages.play, { mediaServerName: 'Plex' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.PLEX, + }); } - return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.JELLYFIN, + }); } function getAvailable4kMediaServerName() { if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) { - return intl.formatMessage(messages.play, { mediaServerName: 'Emby' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.EMBY, + }); } if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) { - return intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' }); + return intl.formatMessage(messages.play4k, { + mediaServerName: ServerType.PLEX, + }); } - return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' }); + return intl.formatMessage(messages.play4k, { + mediaServerName: ServerType.JELLYFIN, + }); } const onClickWatchlistBtn = async (): Promise => { diff --git a/src/components/PermissionEdit/index.tsx b/src/components/PermissionEdit/index.tsx index cbba176cba..c0a083b409 100644 --- a/src/components/PermissionEdit/index.tsx +++ b/src/components/PermissionEdit/index.tsx @@ -4,7 +4,7 @@ import useSettings from '@app/hooks/useSettings'; import type { User } from '@app/hooks/useUser'; import { Permission } from '@app/hooks/useUser'; import defineMessages from '@app/utils/defineMessages'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import { useIntl } from 'react-intl'; export const messages = defineMessages('components.PermissionEdit', { @@ -145,20 +145,20 @@ export const PermissionEdit = ({ name: intl.formatMessage(messages.viewwatchlists, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? 'Plex' + ? ServerType.PLEX : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' - : 'Emby', + ? ServerType.JELLYFIN + : ServerType.EMBY, }), description: intl.formatMessage(messages.viewwatchlistsDescription, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? 'Plex' + ? ServerType.PLEX : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' - : 'Emby', + ? ServerType.JELLYFIN + : ServerType.EMBY, }), permission: Permission.WATCHLIST_VIEW, }, diff --git a/src/components/Settings/SettingsJellyfin.tsx b/src/components/Settings/SettingsJellyfin.tsx index a0b9ac363f..d7d5a7fdf2 100644 --- a/src/components/Settings/SettingsJellyfin.tsx +++ b/src/components/Settings/SettingsJellyfin.tsx @@ -10,7 +10,7 @@ import defineMessages from '@app/utils/defineMessages'; import { isValidURL } from '@app/utils/urlValidationHelper'; import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline'; import { ApiErrorCode } from '@server/constants/error'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { JellyfinSettings } from '@server/lib/settings'; import axios from 'axios'; import { Field, Formik } from 'formik'; @@ -182,8 +182,8 @@ const SettingsJellyfin: React.FC = ({ intl.formatMessage(messages.jellyfinSyncFailedConnectionError, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, }), { autoDismiss: true, @@ -247,9 +247,9 @@ const SettingsJellyfin: React.FC = ({ const mediaServerFormatValues = { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' + ? ServerType.JELLYFIN : settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' + ? ServerType.EMBY : undefined, }; diff --git a/src/components/Settings/SettingsLayout.tsx b/src/components/Settings/SettingsLayout.tsx index f01a5685a5..9687d5fc3d 100644 --- a/src/components/Settings/SettingsLayout.tsx +++ b/src/components/Settings/SettingsLayout.tsx @@ -4,7 +4,7 @@ import SettingsTabs from '@app/components/Common/SettingsTabs'; import useSettings from '@app/hooks/useSettings'; import globalMessages from '@app/i18n/globalMessages'; import defineMessages from '@app/utils/defineMessages'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import { useIntl } from 'react-intl'; const messages = defineMessages('components.Settings', { @@ -100,9 +100,9 @@ const SettingsLayout = ({ children }: SettingsLayoutProps) => { return intl.formatMessage(messages.menuJellyfinSettings, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' + ? ServerType.JELLYFIN : settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' + ? ServerType.EMBY : undefined, }); } diff --git a/src/components/Settings/SettingsPlex.tsx b/src/components/Settings/SettingsPlex.tsx index 2945344b73..58fe94ef4c 100644 --- a/src/components/Settings/SettingsPlex.tsx +++ b/src/components/Settings/SettingsPlex.tsx @@ -16,6 +16,7 @@ import { MagnifyingGlassIcon, XMarkIcon, } from '@heroicons/react/24/solid'; +import { ServerType } from '@server/constants/server'; import type { PlexDevice } from '@server/interfaces/api/plexInterfaces'; import type { PlexSettings, TautulliSettings } from '@server/lib/settings'; import axios from 'axios'; @@ -254,7 +255,7 @@ const SettingsPlex = ({ isSetupSettings }: SettingsPlexProps) => { addToast( e?.response?.data?.message === 'CONNECTION_ERROR' ? intl.formatMessage(messages.invalidurlerror, { - mediaServerName: 'Plex', + mediaServerName: ServerType.PLEX, }) : intl.formatMessage(messages.toastPlexSyncFailure), { diff --git a/src/components/Settings/SettingsUsers/index.tsx b/src/components/Settings/SettingsUsers/index.tsx index b69ea2bec4..92d1a628a9 100644 --- a/src/components/Settings/SettingsUsers/index.tsx +++ b/src/components/Settings/SettingsUsers/index.tsx @@ -10,7 +10,7 @@ import useToasts from '@app/hooks/useToasts'; import globalMessages from '@app/i18n/globalMessages'; import defineMessages from '@app/utils/defineMessages'; import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { MainSettings } from '@server/lib/settings'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; @@ -82,11 +82,11 @@ const SettingsUsers = () => { const mediaServerFormatValues = { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN - ? 'Jellyfin' + ? ServerType.JELLYFIN : settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' + ? ServerType.EMBY : settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? 'Plex' + ? ServerType.PLEX : undefined, }; diff --git a/src/components/StatusBadge/index.tsx b/src/components/StatusBadge/index.tsx index faea1fb5c2..1bca08b466 100644 --- a/src/components/StatusBadge/index.tsx +++ b/src/components/StatusBadge/index.tsx @@ -7,7 +7,7 @@ import { Permission, useUser } from '@app/hooks/useUser'; import globalMessages from '@app/i18n/globalMessages'; import defineMessages from '@app/utils/defineMessages'; import { MediaStatus } from '@server/constants/media'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { DownloadingItem } from '@server/lib/downloadtracker'; import { useIntl } from 'react-intl'; @@ -87,10 +87,10 @@ const StatusBadge = ({ mediaLinkDescription = intl.formatMessage(messages.playonplex, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' + ? ServerType.EMBY : settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? 'Plex' - : 'Jellyfin', + ? ServerType.PLEX + : ServerType.JELLYFIN, }); } else if (hasPermission(Permission.MANAGE_REQUESTS)) { if (mediaType && tmdbId) { diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx index a265627a4b..747481b23e 100644 --- a/src/components/TvDetails/index.tsx +++ b/src/components/TvDetails/index.tsx @@ -60,7 +60,7 @@ import { MediaStatus, MediaType, } from '@server/constants/media'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { TvDetails as TvDetailsType } from '@server/models/Tv'; import type { Crew } from '@server/models/common'; import axios from 'axios'; @@ -347,26 +347,38 @@ const TvDetails = ({ tv }: TvDetailsProps) => { function getAvailableMediaServerName() { if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) { - return intl.formatMessage(messages.play, { mediaServerName: 'Emby' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.EMBY, + }); } if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) { - return intl.formatMessage(messages.play, { mediaServerName: 'Plex' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.PLEX, + }); } - return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.JELLYFIN, + }); } function getAvailable4kMediaServerName() { if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) { - return intl.formatMessage(messages.play, { mediaServerName: 'Emby' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.EMBY, + }); } if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) { - return intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' }); + return intl.formatMessage(messages.play4k, { + mediaServerName: ServerType.PLEX, + }); } - return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' }); + return intl.formatMessage(messages.play, { + mediaServerName: ServerType.JELLYFIN, + }); } const onClickWatchlistBtn = async (): Promise => { diff --git a/src/components/UserList/JellyfinImportModal.tsx b/src/components/UserList/JellyfinImportModal.tsx index f85756b318..5082da73a4 100644 --- a/src/components/UserList/JellyfinImportModal.tsx +++ b/src/components/UserList/JellyfinImportModal.tsx @@ -5,7 +5,7 @@ import useSettings from '@app/hooks/useSettings'; import useToasts from '@app/hooks/useToasts'; import globalMessages from '@app/i18n/globalMessages'; import defineMessages from '@app/utils/defineMessages'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces'; import axios from 'axios'; import { useState } from 'react'; @@ -77,8 +77,8 @@ const JellyfinImportModal: React.FC = ({ strong: (msg: React.ReactNode) => {msg}, mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, }), { autoDismiss: true, @@ -91,8 +91,8 @@ const JellyfinImportModal: React.FC = ({ applicationTitle: settings.currentSettings.applicationTitle, mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, }), { autoDismiss: false, @@ -108,8 +108,8 @@ const JellyfinImportModal: React.FC = ({ intl.formatMessage(messages.importfromJellyfinerror, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, }), { autoDismiss: true, @@ -148,8 +148,8 @@ const JellyfinImportModal: React.FC = ({ title={intl.formatMessage(messages.importfromJellyfin, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, })} onOk={() => { importUsers(); @@ -168,8 +168,8 @@ const JellyfinImportModal: React.FC = ({ mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, strong: (msg: React.ReactNode) => ( {msg} ), @@ -295,8 +295,8 @@ const JellyfinImportModal: React.FC = ({ title={intl.formatMessage(messages.noJellyfinuserstoimport, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin', + ? ServerType.EMBY + : ServerType.JELLYFIN, })} type="info" /> diff --git a/src/components/UserList/index.tsx b/src/components/UserList/index.tsx index 0a20d4276d..a3b8496eda 100644 --- a/src/components/UserList/index.tsx +++ b/src/components/UserList/index.tsx @@ -31,7 +31,7 @@ import { PencilIcon, UserPlusIcon, } from '@heroicons/react/24/solid'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces'; import { hasPermission } from '@server/lib/permissions'; import axios from 'axios'; @@ -665,15 +665,15 @@ const UserList = () => { {settings.currentSettings.mediaServerType === MediaServerType.EMBY ? intl.formatMessage(messages.importfrommediaserver, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, }) : settings.currentSettings.mediaServerType === MediaServerType.PLEX ? intl.formatMessage(messages.importfrommediaserver, { - mediaServerName: 'Plex', + mediaServerName: ServerType.PLEX, }) : intl.formatMessage(messages.importfrommediaserver, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} @@ -904,13 +904,13 @@ const UserList = () => { ) : user.userType === UserType.EMBY ? ( {intl.formatMessage(messages.mediaServerUser, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, })} ) : user.userType === UserType.JELLYFIN ? ( {intl.formatMessage(messages.mediaServerUser, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} ) : null} diff --git a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx index c0e9100869..ee4f868ac9 100644 --- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx +++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx @@ -15,6 +15,7 @@ import ErrorPage from '@app/pages/_error'; import defineMessages from '@app/utils/defineMessages'; import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline'; import { ApiErrorCode } from '@server/constants/error'; +import { ServerType } from '@server/constants/server'; import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces'; import type { AvailableLocale } from '@server/types/languages'; import axios from 'axios'; @@ -254,13 +255,13 @@ const UserGeneralSettings = () => { ) : user?.userType === UserType.EMBY ? ( {intl.formatMessage(messages.mediaServerUser, { - mediaServerName: 'Emby', + mediaServerName: ServerType.EMBY, })} ) : user?.userType === UserType.JELLYFIN ? ( {intl.formatMessage(messages.mediaServerUser, { - mediaServerName: 'Jellyfin', + mediaServerName: ServerType.JELLYFIN, })} ) : null} diff --git a/src/components/UserProfile/UserSettings/UserLinkedAccountsSettings/LinkJellyfinModal.tsx b/src/components/UserProfile/UserSettings/UserLinkedAccountsSettings/LinkJellyfinModal.tsx index 1d530d9084..79315fadd8 100644 --- a/src/components/UserProfile/UserSettings/UserLinkedAccountsSettings/LinkJellyfinModal.tsx +++ b/src/components/UserProfile/UserSettings/UserLinkedAccountsSettings/LinkJellyfinModal.tsx @@ -6,7 +6,7 @@ import { useUser } from '@app/hooks/useUser'; import defineMessages from '@app/utils/defineMessages'; import { Transition } from '@headlessui/react'; import { QrCodeIcon } from '@heroicons/react/24/outline'; -import { MediaServerType } from '@server/constants/server'; +import { MediaServerType, ServerType } from '@server/constants/server'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -63,8 +63,8 @@ const LinkJellyfinModal = ({ const applicationName = settings.currentSettings.applicationTitle; const mediaServerName = settings.currentSettings.mediaServerType === MediaServerType.EMBY - ? 'Emby' - : 'Jellyfin'; + ? ServerType.EMBY + : ServerType.JELLYFIN; return ( {