From 57336d8a7553e10c901db28037ae168cbdedaef9 Mon Sep 17 00:00:00 2001
From: fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
Date: Sun, 26 May 2024 19:38:39 +0500
Subject: [PATCH] refactor: clean up commented out code

---
 server/entity/Media.ts                       |  9 +-----
 server/lib/availabilitySync.ts               |  1 -
 server/lib/settings.ts                       |  3 --
 src/components/Login/JellyfinLogin.tsx       | 30 --------------------
 src/components/Settings/SettingsJellyfin.tsx | 23 ---------------
 5 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/server/entity/Media.ts b/server/entity/Media.ts
index ce8892c9f..102185be1 100644
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -213,19 +213,12 @@ class Media {
       const pageName =
         process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
       const { serverId, externalHostname } = getSettings().jellyfin;
-      // let jellyfinHost =
-      //   externalHostname && externalHostname.length > 0
-      //     ? externalHostname
-      //     : hostname;
+
       const jellyfinHost =
         externalHostname && externalHostname.length > 0
           ? externalHostname
           : getHostname();
 
-      // jellyfinHost = jellyfinHost.endsWith('/')
-      //   ? jellyfinHost.slice(0, -1)
-      //   : jellyfinHost;
-
       if (this.jellyfinMediaId) {
         this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
       }
diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index c541eeefe..1aa37cf9a 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -85,7 +85,6 @@ class AvailabilitySync {
       ) {
         if (admin) {
           this.jellyfinClient = new JellyfinAPI(
-            // settings.jellyfin. ?? '',
             getHostname(),
             admin.jellyfinAuthToken,
             admin.jellyfinDeviceId
diff --git a/server/lib/settings.ts b/server/lib/settings.ts
index 98ac43636..eabfeeca4 100644
--- a/server/lib/settings.ts
+++ b/server/lib/settings.ts
@@ -133,7 +133,6 @@ interface FullPublicSettings extends PublicSettings {
   region: string;
   originalLanguage: string;
   mediaServerType: number;
-  jellyfinHost?: string;
   jellyfinExternalHost?: string;
   jellyfinForgotPasswordUrl?: string;
   jellyfinServerName?: string;
@@ -552,8 +551,6 @@ class Settings {
       region: this.data.main.region,
       originalLanguage: this.data.main.originalLanguage,
       mediaServerType: this.main.mediaServerType,
-      // jellyfinHost: this.jellyfin.hostname,
-      // jellyfinExternalHost: this.jellyfin.externalHostname,
       partialRequestsEnabled: this.data.main.partialRequestsEnabled,
       cacheImages: this.data.main.cacheImages,
       vapidPublic: this.vapidPublic,
diff --git a/src/components/Login/JellyfinLogin.tsx b/src/components/Login/JellyfinLogin.tsx
index b606182ab..d3945be54 100644
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -59,17 +59,6 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
 
   if (initial) {
     const LoginSchema = Yup.object().shape({
-      // 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)
-      //   )
-      //   .required(
-      //     intl.formatMessage(messages.validationhostrequired, {
-      //       mediaServerName:
-      //         publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
-      //     })
-      //   ),
       hostname: Yup.string().required(
         intl.formatMessage(messages.validationhostrequired, {
           mediaServerName:
@@ -164,25 +153,6 @@ 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, mediaServerFormatValues)}
-              </label> */}
-              {/* <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
-                <div className="flex rounded-md shadow-sm">
-                  <Field
-                    id="host"
-                    name="host"
-                    type="text"
-                    placeholder={intl.formatMessage(
-                      messages.host,
-                      mediaServerFormatValues
-                    )}
-                  />
-                </div>
-                {errors.host && touched.host && (
-                  <div className="error">{errors.host}</div>
-                )}
-              </div> */}
               <div className="flex flex-col sm:flex-row sm:gap-4">
                 <div className="w-full">
                   <label htmlFor="hostname" className="text-label">
diff --git a/src/components/Settings/SettingsJellyfin.tsx b/src/components/Settings/SettingsJellyfin.tsx
index 9110d096a..6480a0fae 100644
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -33,7 +33,6 @@ const messages = defineMessages({
   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.',
   externalUrl: 'External URL',
-  // internalUrl: 'Internal URL',
   hostname: 'Hostname or IP Address',
   port: 'Port',
   enablessl: 'Use SSL',
@@ -438,7 +437,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
           </div>
           <Formik
             initialValues={{
-              // jellyfinInternalUrl: data?.hostname || '',
               hostname: data?.ip,
               port: data?.port ?? 8096,
               useSsl: data?.useSsl,
@@ -514,27 +512,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
             }) => {
               return (
                 <form className="section" onSubmit={handleSubmit}>
-                  {/* <div className="form-row">
-                    <label htmlFor="jellyfinInternalUrl" className="text-label">
-                      {intl.formatMessage(messages.internalUrl)}
-                    </label>
-                    <div className="form-input-area">
-                      <div className="form-input-field">
-                        <Field
-                          type="text"
-                          inputMode="url"
-                          id="jellyfinInternalUrl"
-                          name="jellyfinInternalUrl"
-                        />
-                      </div>
-                      {errors.jellyfinInternalUrl &&
-                        touched.jellyfinInternalUrl && (
-                          <div className="error">
-                            {errors.jellyfinInternalUrl}
-                          </div>
-                        )}
-                    </div>
-                        </div> */}
                   <div className="form-row">
                     <label htmlFor="hostname" className="text-label">
                       {intl.formatMessage(messages.hostname)}