From ef1f4615e64128983d63fc35b375b2fa5411e12f Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:47:22 +0100
Subject: [PATCH] Expose stored media server URL

No need to recalculate it
+ Plex URL was broken due to an earlier change
---
 .../Rule/Rules/Search/EmbyAvailabilityRule.cs     | 14 +-------------
 .../Rule/Rules/Search/JellyfinAvailabilityRule.cs | 15 +--------------
 .../Rule/Rules/Search/PlexAvailabilityRule.cs     |  2 +-
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
index 027f22e8b..e7a629854 100644
--- a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
@@ -67,19 +67,7 @@ namespace Ombi.Core.Rule.Rules.Search
             if (item != null)
             {
                 obj.Available = true;
-                var s = await EmbySettings.GetSettingsAsync();
-                if (s.Enable)
-                {
-                    var server = s.Servers.FirstOrDefault();
-                    if ((server?.ServerHostname ?? string.Empty).HasValue())
-                    {
-                        obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, server?.ServerHostname);
-                    }
-                    else
-                    {
-                        obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, null);
-                    }
-                }
+                obj.EmbyUrl = item.Url;
 
                 if (obj.Type == RequestType.TvShow)
                 {
diff --git a/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs
index dbbfc8da5..95a2da80b 100644
--- a/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs
@@ -81,20 +81,7 @@ namespace Ombi.Core.Rule.Rules.Search
                     useTheMovieDb = true;
                 }
                 obj.Available = true;
-                var s = await JellyfinSettings.GetSettingsAsync();
-                if (s.Enable)
-                {
-                    var server = s.Servers.FirstOrDefault(x => x.ServerHostname != null);
-                    if ((server?.ServerHostname ?? string.Empty).HasValue())
-                    {
-                        obj.JellyfinUrl = JellyfinHelper.GetJellyfinMediaUrl(item.JellyfinId, server?.ServerId, server?.ServerHostname);
-                    }
-                    else
-                    {
-                        var firstServer = s.Servers?.FirstOrDefault();
-                        obj.JellyfinUrl = JellyfinHelper.GetJellyfinMediaUrl(item.JellyfinId, firstServer.ServerId, firstServer.FullUri);
-                    }
-                }
+                obj.JellyfinUrl = item.Url;
 
                 if (obj.Type == RequestType.TvShow)
                 {
diff --git a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
index c84eb610c..13bdb45e4 100644
--- a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
@@ -90,7 +90,7 @@ namespace Ombi.Core.Rule.Rules.Search
                     useTheMovieDb = true;
                 }
                 obj.Available = true;
-                obj.PlexUrl = PlexHelper.BuildPlexMediaUrl(item.Url, host);
+                obj.PlexUrl = item.Url;
                 obj.Quality = item.Quality;
                 
                 if (obj.Type == RequestType.TvShow)