From 788304adfbe3c6c9696758e9ad42bca9d9b86290 Mon Sep 17 00:00:00 2001
From: Meier Lukas <meierschlumpf@gmail.com>
Date: Sat, 1 Mar 2025 17:24:07 +0100
Subject: [PATCH] fix(old-import): default logo and favicon not replaced
 (#2456)

---
 packages/old-import/src/mappers/map-board.ts | 32 ++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/old-import/src/mappers/map-board.ts b/packages/old-import/src/mappers/map-board.ts
index 1e2153bef..7b5450057 100644
--- a/packages/old-import/src/mappers/map-board.ts
+++ b/packages/old-import/src/mappers/map-board.ts
@@ -14,12 +14,40 @@ export const mapBoard = (preparedBoard: PreparedBoard): InferInsertModel<typeof
   backgroundImageUrl: preparedBoard.config.settings.customization.backgroundImageUrl,
   backgroundImageRepeat: preparedBoard.config.settings.customization.backgroundImageRepeat,
   backgroundImageSize: preparedBoard.config.settings.customization.backgroundImageSize,
-  faviconImageUrl: preparedBoard.config.settings.customization.faviconUrl,
+  faviconImageUrl: mapFavicon(preparedBoard.config.settings.customization.faviconUrl),
   isPublic: preparedBoard.config.settings.access.allowGuests,
-  logoImageUrl: preparedBoard.config.settings.customization.logoImageUrl,
+  logoImageUrl: mapLogo(preparedBoard.config.settings.customization.logoImageUrl),
   pageTitle: preparedBoard.config.settings.customization.pageTitle,
   metaTitle: preparedBoard.config.settings.customization.metaTitle,
   opacity: preparedBoard.config.settings.customization.appOpacity,
   primaryColor: mapColor(preparedBoard.config.settings.customization.colors.primary, "#fa5252"),
   secondaryColor: mapColor(preparedBoard.config.settings.customization.colors.secondary, "#fd7e14"),
 });
+
+const defaultOldmarrLogoPath = "/imgs/logo/logo.png";
+
+const mapLogo = (logo: string | null | undefined) => {
+  if (!logo) {
+    return null;
+  }
+
+  if (logo.trim() === defaultOldmarrLogoPath) {
+    return null; // We fallback to default logo when null
+  }
+
+  return logo;
+};
+
+const defaultOldmarrFaviconPath = "/imgs/favicon/favicon-squared.png";
+
+const mapFavicon = (favicon: string | null | undefined) => {
+  if (!favicon) {
+    return null;
+  }
+
+  if (favicon.trim() === defaultOldmarrFaviconPath) {
+    return null; // We fallback to default favicon when null
+  }
+
+  return favicon;
+};