From 4f94999b07d92e1674bdd4bd7f723dff840eee84 Mon Sep 17 00:00:00 2001
From: ajnart <ajnart@pm.me>
Date: Thu, 11 Aug 2022 17:04:43 +0200
Subject: [PATCH] :bug: Fix a small bug with the display of images

---
 src/components/AppShelf/AddAppShelfItem.tsx |  8 +++++++-
 src/modules/common/MediaDisplay.tsx         | 10 ++++++----
 src/pages/api/modules/overseerr/[id].tsx    |  8 ++++++--
 src/pages/api/modules/overseerr/index.ts    |  4 +++-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index 668f19730..135224a27 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -135,7 +135,13 @@ export function AddAppShelfItemForm(props: { setOpened: (b: boolean) => void } &
 
   const [debounced, cancel] = useDebouncedValue(form.values.name, 250);
   useEffect(() => {
-    if (form.values.name !== debounced || form.values.icon !== DEFAULT_ICON || form.values.type !== 'Other') return;
+    if (
+      form.values.name !== debounced ||
+      form.values.icon !== DEFAULT_ICON ||
+      form.values.type !== 'Other'
+    ) {
+      return;
+    }
     MatchIcon(form.values.name, form);
     MatchService(form.values.name, form);
     tryMatchPort(form.values.name, form);
diff --git a/src/modules/common/MediaDisplay.tsx b/src/modules/common/MediaDisplay.tsx
index 8fa756117..d00822776 100644
--- a/src/modules/common/MediaDisplay.tsx
+++ b/src/modules/common/MediaDisplay.tsx
@@ -1,4 +1,4 @@
-import { ActionIcon, Badge, Button, Group, Image, Stack, Text, Title } from '@mantine/core';
+import { Badge, Button, Group, Image, Stack, Text, Title } from '@mantine/core';
 import { IconDownload, IconExternalLink, IconPlayerPlay } from '@tabler/icons';
 import { useState } from 'react';
 import { useColorTheme } from '../../tools/color';
@@ -63,9 +63,11 @@ export function ReadarrMediaDisplay(props: any) {
   if (!readarr) {
     return null;
   }
-  const baseUrl = new URL(readarr.url).origin;
+  const baseUrl = readarr.openedUrl
+    ? new URL(readarr.openedUrl).origin
+    : new URL(readarr.url).origin;
   // Remove '/' from the end of the lidarr url
-  const fullLink = `${baseUrl}${poster.url}`;
+  const fullLink = poster ? `${baseUrl}${poster.url}` : undefined;
   // Return a movie poster containting the title and the description
   return (
     <MediaDisplay
@@ -93,7 +95,7 @@ export function LidarrMediaDisplay(props: any) {
   if (!lidarr) {
     return null;
   }
-  const baseUrl = new URL(lidarr.url).origin;
+  const baseUrl = lidarr.openedUrl ? new URL(lidarr.openedUrl).origin : new URL(lidarr.url).origin;
   // Remove '/' from the end of the lidarr url
   const fullLink = poster ? `${baseUrl}${poster.url}` : undefined;
   // Return a movie poster containting the title and the description
diff --git a/src/pages/api/modules/overseerr/[id].tsx b/src/pages/api/modules/overseerr/[id].tsx
index d1c2171f6..74bddddc8 100644
--- a/src/pages/api/modules/overseerr/[id].tsx
+++ b/src/pages/api/modules/overseerr/[id].tsx
@@ -11,7 +11,9 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
   const { id, type } = req.query as { id: string; type: string };
   const configName = getCookie('config-name', { req });
   const { config }: { config: Config } = getConfig(configName?.toString() ?? 'default').props;
-  const service = config.services.find((service) => service.type === 'Overseerr' || service.type === 'Jellyseerr');
+  const service = config.services.find(
+    (service) => service.type === 'Overseerr' || service.type === 'Jellyseerr'
+  );
   if (!id) {
     return res.status(400).json({ error: 'No id provided' });
   }
@@ -70,7 +72,9 @@ async function Post(req: NextApiRequest, res: NextApiResponse) {
   const { seasons, type } = req.body as { seasons?: number[]; type: MediaType };
   const configName = getCookie('config-name', { req });
   const { config }: { config: Config } = getConfig(configName?.toString() ?? 'default').props;
-  const service = config.services.find((service) => service.type === 'Overseerr' || service.type === 'Jellyseerr');
+  const service = config.services.find(
+    (service) => service.type === 'Overseerr' || service.type === 'Jellyseerr'
+  );
   if (!id) {
     return res.status(400).json({ error: 'No id provided' });
   }
diff --git a/src/pages/api/modules/overseerr/index.ts b/src/pages/api/modules/overseerr/index.ts
index 694b39200..e45603453 100644
--- a/src/pages/api/modules/overseerr/index.ts
+++ b/src/pages/api/modules/overseerr/index.ts
@@ -8,7 +8,9 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
   const configName = getCookie('config-name', { req });
   const { config }: { config: Config } = getConfig(configName?.toString() ?? 'default').props;
   const { query } = req.query;
-  const service = config.services.find((service) => service.type === 'Overseerr' || service.type === 'Jellyseerr');
+  const service = config.services.find(
+    (service) => service.type === 'Overseerr' || service.type === 'Jellyseerr'
+  );
   // If query is an empty string, return an empty array
   if (query === '' || query === undefined) {
     return res.status(200).json([]);