From 407f5b881ede82774f0d542b50adf00048763fe8 Mon Sep 17 00:00:00 2001
From: Massedil <massedil-framagit.org@msd.im>
Date: Thu, 3 Jul 2025 21:41:07 +0200
Subject: [PATCH] fix: solves some TypeScript errors

---
 src/utils/image.ts               |  2 +-
 src/views/Admin/SettingsView.vue | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/utils/image.ts b/src/utils/image.ts
index f8abfd0cc..31c8d3a32 100644
--- a/src/utils/image.ts
+++ b/src/utils/image.ts
@@ -88,7 +88,7 @@ export async function loadWrappedMedia(
 export function asMediaInput(
   mmedia: IModifiableMedia,
   name: string,
-  fallbackId: number
+  fallbackId: string
 ): any {
   const ret = {
     [name]: {},
diff --git a/src/views/Admin/SettingsView.vue b/src/views/Admin/SettingsView.vue
index b252b5362..1943fd55d 100644
--- a/src/views/Admin/SettingsView.vue
+++ b/src/views/Admin/SettingsView.vue
@@ -522,10 +522,9 @@ const adminSettings = ref<IAdminSettings>();
 
 onAdminSettingsResult(async ({ data }) => {
   if (!data) return;
-  adminSettings.value =
-    {
-      ...data.adminSettings,
-    } ?? defaultAdminSettings;
+  adminSettings.value = {
+    ...data.adminSettings,
+  };
 
   loadWrappedMedia(instanceLogo, adminSettings.value.instanceLogo);
   loadWrappedMedia(instanceFavicon, adminSettings.value.instanceFavicon);
@@ -642,21 +641,21 @@ saveAdminSettingsError((e) => {
 
 const updateSettings = async (): Promise<void> => {
   const variables = {
-    ...settingsToWrite.value,
+    ...structuredClone(toRaw(settingsToWrite.value)),
     ...asMediaInput(
       instanceLogo,
       "instanceLogo",
-      adminSettings.value?.instanceLogo?.uuid
+      adminSettings.value?.instanceLogo?.uuid ?? ""
     ),
     ...asMediaInput(
       instanceFavicon,
       "instanceFavicon",
-      adminSettings.value?.instanceFavicon?.uuid
+      adminSettings.value?.instanceFavicon?.uuid ?? ""
     ),
     ...asMediaInput(
       defaultPicture,
       "defaultPicture",
-      adminSettings.value?.defaultPicture?.uuid
+      adminSettings.value?.defaultPicture?.uuid ?? ""
     ),
   };
   saveAdminSettings(variables);