From 2bfdf02c7942762bd9f5201459b1a9ad6003b9a6 Mon Sep 17 00:00:00 2001
From: Mohamed jinas <j@live.mv>
Date: Sun, 22 May 2022 22:12:05 +0500
Subject: [PATCH 01/10] feat: conditional media server name

---
 next.config.js                     |  1 +
 src/components/TvDetails/index.tsx | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/next.config.js b/next.config.js
index f0a623d4e..83a0c63cb 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,6 +1,7 @@
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
+    JELLYFIN_TYPE: 'emby',
   },
   images: {
     domains: ['image.tmdb.org'],
diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx
index 7de7fff17..98bf45e34 100644
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -124,10 +124,7 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
     })
   ) {
     mediaLinks.push({
-      text:
-        settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-          ? intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' })
-          : intl.formatMessage(messages.play, { mediaServerName: 'Plex' }),
+      text: getAvalaibleMediaServerName(),
       url: data.mediaInfo?.mediaUrl,
       svg: <PlayIcon />,
     });
@@ -228,6 +225,18 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
     data?.watchProviders?.find((provider) => provider.iso_3166_1 === region)
       ?.flatrate ?? [];
 
+  function getAvalaibleMediaServerName() {
+    if (process.env.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.play, { mediaServerName: 'Emby' });
+    }
+
+    if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) {
+      return intl.formatMessage(messages.play, { mediaServerName: 'Plex' });
+    }
+
+    return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' });
+  }
+
   return (
     <div
       className="media-page"

From ff3e3ce841f0676713242d0c8e3a977ef65530d8 Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 05:49:33 +0500
Subject: [PATCH 02/10] feat: conditional media server name to add emby to
 tvdetails

---
 next.config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/next.config.js b/next.config.js
index 83a0c63cb..f0a623d4e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
-    JELLYFIN_TYPE: 'emby',
   },
   images: {
     domains: ['image.tmdb.org'],

From e75b71b8168b4a661971b809c88f9910c4206545 Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 05:54:57 +0500
Subject: [PATCH 03/10] feat: conditional media server name to add emby to
 tvdetails

---
 src/components/TvDetails/index.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx
index 98bf45e34..fe9a039a4 100644
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -138,10 +138,7 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
     })
   ) {
     mediaLinks.push({
-      text:
-        settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-          ? intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' })
-          : intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' }),
+      text: getAvalaibleMediaServerName(),
       url: data.mediaInfo?.mediaUrl4k,
       svg: <PlayIcon />,
     });

From ddd773c03ff61654490644dec21f406d03374b3d Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 08:30:21 +0500
Subject: [PATCH 04/10] fix: conditional media server name for 4k url to add
 emby to tvdetails

---
 src/components/TvDetails/index.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx
index fe9a039a4..0548e2485 100644
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -138,7 +138,7 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
     })
   ) {
     mediaLinks.push({
-      text: getAvalaibleMediaServerName(),
+      text: getAvalaible4kMediaServerName(),
       url: data.mediaInfo?.mediaUrl4k,
       svg: <PlayIcon />,
     });
@@ -234,6 +234,18 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
     return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' });
   }
 
+  function getAvalaible4kMediaServerName() {
+    if (process.env.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.play4k, { mediaServerName: 'Emby' });
+    }
+
+    if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) {
+      return intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' });
+    }
+
+    return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' });
+  }
+
   return (
     <div
       className="media-page"

From 14d293799bb37f45449c201ab03638af257623be Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 08:37:51 +0500
Subject: [PATCH 05/10] feat(ui): conditional media server name to add emby to
 moviedetails

---
 src/components/MovieDetails/index.tsx | 34 ++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/components/MovieDetails/index.tsx b/src/components/MovieDetails/index.tsx
index fbbad4bd3..0ba0b9279 100644
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -130,10 +130,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
 
   if (data.mediaInfo?.mediaUrl) {
     mediaLinks.push({
-      text:
-        settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-          ? intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' })
-          : intl.formatMessage(messages.play, { mediaServerName: 'Plex' }),
+      text: getAvalaibleMediaServerName(),
       url: data.mediaInfo?.mediaUrl,
       svg: <PlayIcon />,
     });
@@ -146,10 +143,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
     })
   ) {
     mediaLinks.push({
-      text:
-        settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-          ? intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' })
-          : intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' }),
+      text: getAvalaible4kMediaServerName(),
       url: data.mediaInfo?.mediaUrl4k,
       svg: <PlayIcon />,
     });
@@ -228,6 +222,30 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
     data?.watchProviders?.find((provider) => provider.iso_3166_1 === region)
       ?.flatrate ?? [];
 
+  function getAvalaibleMediaServerName() {
+    if (process.env.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.play, { mediaServerName: 'Emby' });
+    }
+
+    if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) {
+      return intl.formatMessage(messages.play, { mediaServerName: 'Plex' });
+    }
+
+    return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' });
+  }
+
+  function getAvalaible4kMediaServerName() {
+    if (process.env.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.play4k, { mediaServerName: 'Emby' });
+    }
+
+    if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) {
+      return intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' });
+    }
+
+    return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' });
+  }
+
   return (
     <div
       className="media-page"

From 377a4fd85b7194afb48a8ba9bfa4ce4ccf996be8 Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 08:39:39 +0500
Subject: [PATCH 06/10] feat(ui): conditional media server name to add emby to
 issuedetails play on button

---
 src/components/IssueDetails/index.tsx | 68 +++++++++++++++++----------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/components/IssueDetails/index.tsx b/src/components/IssueDetails/index.tsx
index 90cfb494c..346133896 100644
--- a/src/components/IssueDetails/index.tsx
+++ b/src/components/IssueDetails/index.tsx
@@ -366,13 +366,18 @@ const IssueDetails: React.FC = () => {
                 >
                   <PlayIcon />
                   <span>
-                    {intl.formatMessage(messages.playonplex, {
-                      mediaServerName:
-                        settings.currentSettings.mediaServerType ===
+                    {process.env.JELLYFIN_TYPE == 'emby'
+                      ? intl.formatMessage(messages.playonplex, {
+                          mediaServerName: 'Emby',
+                        })
+                      : settings.currentSettings.mediaServerType ===
                         MediaServerType.PLEX
-                          ? 'Plex'
-                          : 'Jellyfin',
-                    })}
+                      ? intl.formatMessage(messages.playonplex, {
+                          mediaServerName: 'Plex',
+                        })
+                      : intl.formatMessage(messages.playonplex, {
+                          mediaServerName: 'Jellyfin',
+                        })}
                   </span>
                 </Button>
               )}
@@ -407,13 +412,18 @@ const IssueDetails: React.FC = () => {
                 >
                   <PlayIcon />
                   <span>
-                    {intl.formatMessage(messages.play4konplex, {
-                      mediaServerName:
-                        settings.currentSettings.mediaServerType ===
+                    {process.env.JELLYFIN_TYPE == 'emby'
+                      ? intl.formatMessage(messages.play4konplex, {
+                          mediaServerName: 'Emby',
+                        })
+                      : settings.currentSettings.mediaServerType ===
                         MediaServerType.PLEX
-                          ? 'Plex'
-                          : 'Jellyfin',
-                    })}
+                      ? intl.formatMessage(messages.play4konplex, {
+                          mediaServerName: 'Plex',
+                        })
+                      : intl.formatMessage(messages.play4konplex, {
+                          mediaServerName: 'Jellyfin',
+                        })}
                   </span>
                 </Button>
               )}
@@ -618,13 +628,18 @@ const IssueDetails: React.FC = () => {
               >
                 <PlayIcon />
                 <span>
-                  {intl.formatMessage(messages.playonplex, {
-                    mediaServerName:
-                      settings.currentSettings.mediaServerType ===
+                  {process.env.JELLYFIN_TYPE == 'emby'
+                    ? intl.formatMessage(messages.playonplex, {
+                        mediaServerName: 'Emby',
+                      })
+                    : settings.currentSettings.mediaServerType ===
                       MediaServerType.PLEX
-                        ? 'Plex'
-                        : 'Jellyfin',
-                  })}
+                    ? intl.formatMessage(messages.playonplex, {
+                        mediaServerName: 'Plex',
+                      })
+                    : intl.formatMessage(messages.playonplex, {
+                        mediaServerName: 'Jellyfin',
+                      })}
                 </span>
               </Button>
             )}
@@ -659,13 +674,18 @@ const IssueDetails: React.FC = () => {
               >
                 <PlayIcon />
                 <span>
-                  {intl.formatMessage(messages.play4konplex, {
-                    mediaServerName:
-                      settings.currentSettings.mediaServerType ===
+                  {process.env.JELLYFIN_TYPE == 'emby'
+                    ? intl.formatMessage(messages.play4konplex, {
+                        mediaServerName: 'Emby',
+                      })
+                    : settings.currentSettings.mediaServerType ===
                       MediaServerType.PLEX
-                        ? 'Plex'
-                        : 'Jellyfin',
-                  })}
+                    ? intl.formatMessage(messages.play4konplex, {
+                        mediaServerName: 'Plex',
+                      })
+                    : intl.formatMessage(messages.play4konplex, {
+                        mediaServerName: 'Jellyfin',
+                      })}
                 </span>
               </Button>
             )}

From f8a239b1b82feb8f2705bfd8b1b76dd448b14e7c Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 08:52:16 +0500
Subject: [PATCH 07/10] style(ui): conditional media server name to add emby to
 settings

Conditionaly media server name to replace every reference of jellyfin with emby in settings tab when
environmental variable set
---
 src/components/Settings/SettingsJellyfin.tsx  | 86 ++++++++++++++-----
 src/components/Settings/SettingsLayout.tsx    | 16 +++-
 .../Settings/SettingsUsers/index.tsx          | 12 ++-
 3 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/src/components/Settings/SettingsJellyfin.tsx b/src/components/Settings/SettingsJellyfin.tsx
index 9740762ce..5a5d4ffa2 100644
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -14,28 +14,28 @@ import LoadingSpinner from '../Common/LoadingSpinner';
 import LibraryItem from './LibraryItem';
 
 const messages = defineMessages({
-  jellyfinsettings: 'Jellyfin Settings',
+  jellyfinsettings: '{mediaServerName} Settings',
   jellyfinsettingsDescription:
-    'Configure the settings for your Jellyfin server. Jellyfin scans your Jellyfin libraries to see what content is available.',
+    'Configure the settings for your {mediaServerName} server. {mediaServerName} scans your {mediaServerName} libraries to see what content is available.',
   timeout: 'Timeout',
   save: 'Save Changes',
   saving: 'Saving…',
-  jellyfinlibraries: 'Jellyfin Libraries',
+  jellyfinlibraries: '{mediaServerName} Libraries',
   jellyfinlibrariesDescription:
-    'The libraries Jellyfin scans for titles. Click the button below if no libraries are listed.',
+    'The libraries {mediaServerName} scans for titles. Click the button below if no libraries are listed.',
   jellyfinSettingsFailure:
-    'Something went wrong while saving Jellyfin settings.',
-  jellyfinSettingsSuccess: 'Jellyfin settings saved successfully!',
-  jellyfinSettings: 'Jellyfin Settings',
+    'Something went wrong while saving {mediaServerName} settings.',
+  jellyfinSettingsSuccess: '{mediaServerName} settings saved successfully!',
+  jellyfinSettings: '{mediaServerName} Settings',
   jellyfinSettingsDescription:
-    'Optionally configure an external player endpoint for your jellyfin server that is different to the internal URL used during setup',
+    'Optionally configure an external player endpoint for your {mediaServerName} server that is different to the internal URL used during setup',
   externalUrl: 'External URL',
   validationUrl: 'You must provide a valid URL',
   syncing: 'Syncing',
   syncJellyfin: 'Sync Libraries',
   manualscanJellyfin: 'Manual Library Scan',
   manualscanDescriptionJellyfin:
-    "Normally, this will only be run once every 24 hours. Jellyfin will check your Jellyfin server's recently added more aggressively. If this is your first time configuring Jellyfin, a one-time full manual library scan is recommended!",
+    "Normally, this will only be run once every 24 hours. {mediaServerName} will check your {mediaServerName} server's recently added more aggressively. If this is your first time configuring {mediaServerName}, a one-time full manual library scan is recommended!",
   notrunning: 'Not Running',
   currentlibrary: 'Current Library: {name}',
   librariesRemaining: 'Libraries Remaining: {count}',
@@ -161,10 +161,22 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
     <>
       <div className="mb-6">
         <h3 className="heading">
-          <FormattedMessage {...messages.jellyfinlibraries} />
+          {process.env.JELLYFIN_TYPE == 'emby'
+            ? intl.formatMessage(messages.jellyfinlibraries, {
+                mediaServerName: 'Emby',
+              })
+            : intl.formatMessage(messages.jellyfinlibraries, {
+                mediaServerName: 'Jellyfin',
+              })}
         </h3>
         <p className="description">
-          <FormattedMessage {...messages.jellyfinlibrariesDescription} />
+          {process.env.JELLYFIN_TYPE == 'emby'
+            ? intl.formatMessage(messages.jellyfinlibrariesDescription, {
+                mediaServerName: 'Emby',
+              })
+            : intl.formatMessage(messages.jellyfinlibrariesDescription, {
+                mediaServerName: 'Jellyfin',
+              })}
         </p>
       </div>
       <div className="section">
@@ -201,7 +213,13 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
           <FormattedMessage {...messages.manualscanJellyfin} />
         </h3>
         <p className="description">
-          <FormattedMessage {...messages.manualscanDescriptionJellyfin} />
+          {process.env.JELLYFIN_TYPE == 'emby'
+            ? intl.formatMessage(messages.manualscanDescriptionJellyfin, {
+                mediaServerName: 'Emby',
+              })
+            : intl.formatMessage(messages.manualscanDescriptionJellyfin, {
+                mediaServerName: 'Jellyfin',
+              })}
         </p>
       </div>
       <div className="section">
@@ -305,10 +323,22 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
         <>
           <div className="mt-10 mb-6">
             <h3 className="heading">
-              {intl.formatMessage(messages.jellyfinSettings)}
+              {process.env.JELLYFIN_TYPE == 'emby'
+                ? intl.formatMessage(messages.jellyfinSettings, {
+                    mediaServerName: 'Emby',
+                  })
+                : intl.formatMessage(messages.jellyfinSettings, {
+                    mediaServerName: 'Jellyfin',
+                  })}
             </h3>
             <p className="description">
-              {intl.formatMessage(messages.jellyfinSettingsDescription)}
+              {process.env.JELLYFIN_TYPE == 'emby'
+                ? intl.formatMessage(messages.jellyfinSettingsDescription, {
+                    mediaServerName: 'Emby',
+                  })
+                : intl.formatMessage(messages.jellyfinSettingsDescription, {
+                    mediaServerName: 'Jellyfin',
+                  })}
             </p>
           </div>
           <Formik
@@ -322,15 +352,27 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                   externalHostname: values.jellyfinExternalUrl,
                 } as JellyfinSettings);
 
-                addToast(intl.formatMessage(messages.jellyfinSettingsSuccess), {
-                  autoDismiss: true,
-                  appearance: 'success',
-                });
+                addToast(
+                  intl.formatMessage(messages.jellyfinSettingsSuccess, {
+                    mediaServerName:
+                      process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+                  }),
+                  {
+                    autoDismiss: true,
+                    appearance: 'success',
+                  }
+                );
               } catch (e) {
-                addToast(intl.formatMessage(messages.jellyfinSettingsFailure), {
-                  autoDismiss: true,
-                  appearance: 'error',
-                });
+                addToast(
+                  intl.formatMessage(messages.jellyfinSettingsFailure, {
+                    mediaServerName:
+                      process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+                  }),
+                  {
+                    autoDismiss: true,
+                    appearance: 'error',
+                  }
+                );
               } finally {
                 revalidate();
               }
diff --git a/src/components/Settings/SettingsLayout.tsx b/src/components/Settings/SettingsLayout.tsx
index f2fa90784..23af1c632 100644
--- a/src/components/Settings/SettingsLayout.tsx
+++ b/src/components/Settings/SettingsLayout.tsx
@@ -8,7 +8,7 @@ const messages = defineMessages({
   menuGeneralSettings: 'General',
   menuUsers: 'Users',
   menuPlexSettings: 'Plex',
-  menuJellyfinSettings: 'Jellyfin',
+  menuJellyfinSettings: '{mediaServerName}',
   menuServices: 'Services',
   menuNotifications: 'Notifications',
   menuLogs: 'Logs',
@@ -18,7 +18,6 @@ const messages = defineMessages({
 
 const SettingsLayout: React.FC = ({ children }) => {
   const intl = useIntl();
-
   const settingsRoutes: SettingsRoute[] = [
     {
       text: intl.formatMessage(messages.menuGeneralSettings),
@@ -36,7 +35,7 @@ const SettingsLayout: React.FC = ({ children }) => {
       regex: /^\/settings\/plex/,
     },
     {
-      text: intl.formatMessage(messages.menuJellyfinSettings),
+      text: getAvalaibleMediaServerName(),
       route: '/settings/jellyfin',
       regex: /^\/settings\/jellyfin/,
     },
@@ -76,6 +75,17 @@ const SettingsLayout: React.FC = ({ children }) => {
       <div className="mt-10 text-white">{children}</div>
     </>
   );
+  function getAvalaibleMediaServerName() {
+    if (process.env.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.menuJellyfinSettings, {
+        mediaServerName: 'Emby',
+      });
+    }
+
+    return intl.formatMessage(messages.menuJellyfinSettings, {
+      mediaServerName: 'Jellyfin',
+    });
+  }
 };
 
 export default SettingsLayout;
diff --git a/src/components/Settings/SettingsUsers/index.tsx b/src/components/Settings/SettingsUsers/index.tsx
index d53a619bf..03232f884 100644
--- a/src/components/Settings/SettingsUsers/index.tsx
+++ b/src/components/Settings/SettingsUsers/index.tsx
@@ -131,16 +131,20 @@ const SettingsUsers: React.FC = () => {
                   <label htmlFor="newPlexLogin" className="checkbox-label">
                     {intl.formatMessage(messages.newPlexLogin, {
                       mediaServerName:
-                        settings.currentSettings.mediaServerType ===
-                        MediaServerType.PLEX
+                        process.env.JELLYFIN_TYPE == 'emby'
+                          ? 'Emby'
+                          : settings.currentSettings.mediaServerType ===
+                            MediaServerType.PLEX
                           ? 'Plex'
                           : 'Jellyfin',
                     })}
                     <span className="label-tip">
                       {intl.formatMessage(messages.newPlexLoginTip, {
                         mediaServerName:
-                          settings.currentSettings.mediaServerType ===
-                          MediaServerType.PLEX
+                          process.env.JELLYFIN_TYPE == 'emby'
+                            ? 'Emby'
+                            : settings.currentSettings.mediaServerType ===
+                              MediaServerType.PLEX
                             ? 'Plex'
                             : 'Jellyfin',
                       })}

From 18d8d969f1bcf397856e37d2f930ba2e7047cf78 Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Thu, 26 May 2022 09:39:19 +0500
Subject: [PATCH 08/10] style(ui): conditional mediaServerName to add emby to
 setup/login page

---
 src/components/Login/JellyfinLogin.tsx | 28 ++++++++++++++++++++------
 src/components/Setup/SetupLogin.tsx    | 14 +++++++++----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/components/Login/JellyfinLogin.tsx b/src/components/Login/JellyfinLogin.tsx
index 540fb6fdc..bfc92fc82 100644
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -11,9 +11,9 @@ import useSettings from '../../hooks/useSettings';
 const messages = defineMessages({
   username: 'Username',
   password: 'Password',
-  host: 'Jellyfin URL',
+  host: '{mediaServerName} URL',
   email: 'Email',
-  validationhostrequired: 'Jellyfin URL required',
+  validationhostrequired: '{mediaServerName} URL required',
   validationhostformat: 'Valid URL required',
   validationemailrequired: 'Email required',
   validationemailformat: 'Valid email required',
@@ -46,9 +46,17 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
       host: Yup.string()
         .matches(
           /^(?:(?:(?:https?):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*\.?)(?::\d{2,5})?(?:[/?#]\S*)?$/,
-          intl.formatMessage(messages.validationhostformat)
+          intl.formatMessage(messages.validationhostformat, {
+            mediaServerName:
+              process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+          })
         )
-        .required(intl.formatMessage(messages.validationhostrequired)),
+        .required(
+          intl.formatMessage(messages.validationhostrequired, {
+            mediaServerName:
+              process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+          })
+        ),
       email: Yup.string()
         .email(intl.formatMessage(messages.validationemailformat))
         .required(intl.formatMessage(messages.validationemailrequired)),
@@ -97,7 +105,10 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
           <Form>
             <div className="sm:border-t sm:border-gray-800">
               <label htmlFor="host" className="text-label">
-                {intl.formatMessage(messages.host)}
+                {intl.formatMessage(messages.host, {
+                  mediaServerName:
+                    process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+                })}
               </label>
               <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                 <div className="flex rounded-md shadow-sm">
@@ -105,7 +116,12 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                     id="host"
                     name="host"
                     type="text"
-                    placeholder={intl.formatMessage(messages.host)}
+                    placeholder={intl.formatMessage(messages.host, {
+                      mediaServerName:
+                        process.env.JELLYFIN_TYPE == 'emby'
+                          ? 'Emby'
+                          : 'Jellyfin',
+                    })}
                   />
                 </div>
                 {errors.host && touched.host && (
diff --git a/src/components/Setup/SetupLogin.tsx b/src/components/Setup/SetupLogin.tsx
index 2dde96dcf..182c4b160 100644
--- a/src/components/Setup/SetupLogin.tsx
+++ b/src/components/Setup/SetupLogin.tsx
@@ -3,14 +3,14 @@ import { useUser } from '../../hooks/useUser';
 import PlexLoginButton from '../PlexLoginButton';
 import JellyfinLogin from '../Login/JellyfinLogin';
 import axios from 'axios';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import Accordion from '../Common/Accordion';
 import { MediaServerType } from '../../../server/constants/server';
 
 const messages = defineMessages({
   welcome: 'Welcome to Overseerr',
   signinMessage: 'Get started by signing in',
-  signinWithJellyfin: 'Use your Jellyfin account',
+  signinWithJellyfin: 'Use your {mediaServerName} account',
   signinWithPlex: 'Use your Plex account',
 });
 
@@ -24,7 +24,7 @@ const SetupLogin: React.FC<LoginWithMediaServerProps> = ({ onComplete }) => {
     MediaServerType.NOT_CONFIGURED
   );
   const { user, revalidate } = useUser();
-
+  const intl = useIntl();
   // Effect that is triggered when the `authToken` comes back from the Plex OAuth
   // We take the token and attempt to login. If we get a success message, we will
   // ask swr to revalidate the user which _shouid_ come back with a valid user.
@@ -91,7 +91,13 @@ const SetupLogin: React.FC<LoginWithMediaServerProps> = ({ onComplete }) => {
                 }`}
                 onClick={() => handleClick(1)}
               >
-                <FormattedMessage {...messages.signinWithJellyfin} />
+                {process.env.JELLYFIN_TYPE == 'emby'
+                  ? intl.formatMessage(messages.signinWithJellyfin, {
+                      mediaServerName: 'Emby',
+                    })
+                  : intl.formatMessage(messages.signinWithJellyfin, {
+                      mediaServerName: 'Jellyfin',
+                    })}
               </button>
               <AccordionContent isOpen={openIndexes.includes(1)}>
                 <div

From 410b536c9474806ab9f7f5f097cedfafde1fbf67 Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Fri, 27 May 2022 04:58:24 +0500
Subject: [PATCH 09/10] feat(ui): add emby user badge to the user list and fix
 local user badge

add emby user badge to the user list and fix local user badge which was previously not showing
---
 src/components/UserList/index.tsx | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/UserList/index.tsx b/src/components/UserList/index.tsx
index 444185a82..d37f250f1 100644
--- a/src/components/UserList/index.tsx
+++ b/src/components/UserList/index.tsx
@@ -636,17 +636,23 @@ const UserList: React.FC = () => {
                   <Badge badgeType="warning">
                     {intl.formatMessage(messages.plexuser)}
                   </Badge>
-                ) : (
+                ) : user.userType === UserType.LOCAL ? (
                   <Badge badgeType="default">
+                    {intl.formatMessage(messages.localuser)}
+                  </Badge>
+                ) : process.env.JELLYFIN_TYPE == 'emby' ? (
+                  <Badge badgeType="success">
                     {intl.formatMessage(messages.mediaServerUser, {
-                      mediaServerName:
-                        settings.currentSettings.mediaServerType ===
-                        MediaServerType.PLEX
-                          ? 'Plex'
-                          : 'Jellyfin',
+                      mediaServerName: 'Emby',
                     })}
                   </Badge>
-                )}
+                ) : user.userType === UserType.JELLYFIN ? (
+                  <Badge badgeType="default">
+                    {intl.formatMessage(messages.mediaServerUser, {
+                      mediaServerName: 'Jellyfin',
+                    })}
+                  </Badge>
+                ) : null}
               </Table.TD>
               <Table.TD>
                 {user.id === 1

From 6a6bfe0c6875a1d8ccb1a6fdc409f595202ef38e Mon Sep 17 00:00:00 2001
From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Fri, 27 May 2022 05:35:00 +0500
Subject: [PATCH 10/10] feat(ui): add emby as a mediaServerType to the import
 user button

Add emby as a mediaServerType to the import user button and replace any reference to Jellyfin with
mediaServerName
---
 .../UserList/JellyfinImportModal.tsx          | 38 +++++++++++++------
 src/components/UserList/index.tsx             | 17 ++++++---
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/components/UserList/JellyfinImportModal.tsx b/src/components/UserList/JellyfinImportModal.tsx
index 295938b2f..2bfdf6269 100644
--- a/src/components/UserList/JellyfinImportModal.tsx
+++ b/src/components/UserList/JellyfinImportModal.tsx
@@ -15,15 +15,15 @@ interface JellyfinImportProps {
 }
 
 const messages = defineMessages({
-  importfromJellyfin: 'Import Jellyfin Users',
+  importfromJellyfin: 'Import {mediaServerName} Users',
   importfromJellyfinerror:
-    'Something went wrong while importing Jellyfin users.',
+    'Something went wrong while importing {mediaServerName} users.',
   importedfromJellyfin:
-    '<strong>{userCount}</strong> Jellyfin {userCount, plural, one {user} other {users}} imported successfully!',
+    '<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} imported successfully!',
   user: 'User',
-  noJellyfinuserstoimport: 'There are no Jellyfin users to import.',
+  noJellyfinuserstoimport: 'There are no {mediaServerName} users to import.',
   newJellyfinsigninenabled:
-    'The <strong>Enable New Jellyfin Sign-In</strong> setting is currently enabled. Jellyfin users with library access do not need to be imported in order to sign in.',
+    'The <strong>Enable New {mediaServerName} Sign-In</strong> setting is currently enabled. {mediaServerName} users with library access do not need to be imported in order to sign in.',
 });
 
 const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
@@ -66,6 +66,8 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
           strong: function strong(msg) {
             return <strong>{msg}</strong>;
           },
+          mediaServerName:
+            process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
         }),
         {
           autoDismiss: true,
@@ -77,10 +79,16 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
         onComplete();
       }
     } catch (e) {
-      addToast(intl.formatMessage(messages.importfromJellyfinerror), {
-        autoDismiss: true,
-        appearance: 'error',
-      });
+      addToast(
+        intl.formatMessage(messages.importfromJellyfinerror, {
+          mediaServerName:
+            process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+        }),
+        {
+          autoDismiss: true,
+          appearance: 'error',
+        }
+      );
     } finally {
       setImporting(false);
     }
@@ -110,7 +118,10 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
   return (
     <Modal
       loading={!data && !error}
-      title={intl.formatMessage(messages.importfromJellyfin)}
+      title={intl.formatMessage(messages.importfromJellyfin, {
+        mediaServerName:
+          process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+      })}
       iconSvg={<InboxInIcon />}
       onOk={() => {
         importUsers();
@@ -126,6 +137,8 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
           {settings.currentSettings.newPlexLogin && (
             <Alert
               title={intl.formatMessage(messages.newJellyfinsigninenabled, {
+                mediaServerName:
+                  process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
                 strong: function strong(msg) {
                   return (
                     <strong className="font-semibold text-white">{msg}</strong>
@@ -240,7 +253,10 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
         </>
       ) : (
         <Alert
-          title={intl.formatMessage(messages.noJellyfinuserstoimport)}
+          title={intl.formatMessage(messages.noJellyfinuserstoimport, {
+            mediaServerName:
+              process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+          })}
           type="info"
         />
       )}
diff --git a/src/components/UserList/index.tsx b/src/components/UserList/index.tsx
index d37f250f1..5eb951736 100644
--- a/src/components/UserList/index.tsx
+++ b/src/components/UserList/index.tsx
@@ -503,13 +503,18 @@ const UserList: React.FC = () => {
             >
               <InboxInIcon />
               <span>
-                {intl.formatMessage(messages.importfromplex, {
-                  mediaServerName:
-                    settings.currentSettings.mediaServerType ===
+                {process.env.JELLYFIN_TYPE == 'emby'
+                  ? intl.formatMessage(messages.importfromplex, {
+                      mediaServerName: 'Emby',
+                    })
+                  : settings.currentSettings.mediaServerType ===
                     MediaServerType.PLEX
-                      ? 'Plex'
-                      : 'Jellyfin',
-                })}
+                  ? intl.formatMessage(messages.importfromplex, {
+                      mediaServerName: 'Plex',
+                    })
+                  : intl.formatMessage(messages.importfromplex, {
+                      mediaServerName: 'Jellyfin',
+                    })}
               </span>
             </Button>
           </div>