fix: solves some TypeScript errors

This commit is contained in:
Massedil
2025-07-03 21:41:07 +02:00
parent 960b2ca4f7
commit 407f5b881e
2 changed files with 8 additions and 9 deletions

View File

@@ -88,7 +88,7 @@ export async function loadWrappedMedia(
export function asMediaInput( export function asMediaInput(
mmedia: IModifiableMedia, mmedia: IModifiableMedia,
name: string, name: string,
fallbackId: number fallbackId: string
): any { ): any {
const ret = { const ret = {
[name]: {}, [name]: {},

View File

@@ -522,10 +522,9 @@ const adminSettings = ref<IAdminSettings>();
onAdminSettingsResult(async ({ data }) => { onAdminSettingsResult(async ({ data }) => {
if (!data) return; if (!data) return;
adminSettings.value = adminSettings.value = {
{ ...data.adminSettings,
...data.adminSettings, };
} ?? defaultAdminSettings;
loadWrappedMedia(instanceLogo, adminSettings.value.instanceLogo); loadWrappedMedia(instanceLogo, adminSettings.value.instanceLogo);
loadWrappedMedia(instanceFavicon, adminSettings.value.instanceFavicon); loadWrappedMedia(instanceFavicon, adminSettings.value.instanceFavicon);
@@ -642,21 +641,21 @@ saveAdminSettingsError((e) => {
const updateSettings = async (): Promise<void> => { const updateSettings = async (): Promise<void> => {
const variables = { const variables = {
...settingsToWrite.value, ...structuredClone(toRaw(settingsToWrite.value)),
...asMediaInput( ...asMediaInput(
instanceLogo, instanceLogo,
"instanceLogo", "instanceLogo",
adminSettings.value?.instanceLogo?.uuid adminSettings.value?.instanceLogo?.uuid ?? ""
), ),
...asMediaInput( ...asMediaInput(
instanceFavicon, instanceFavicon,
"instanceFavicon", "instanceFavicon",
adminSettings.value?.instanceFavicon?.uuid adminSettings.value?.instanceFavicon?.uuid ?? ""
), ),
...asMediaInput( ...asMediaInput(
defaultPicture, defaultPicture,
"defaultPicture", "defaultPicture",
adminSettings.value?.defaultPicture?.uuid adminSettings.value?.defaultPicture?.uuid ?? ""
), ),
}; };
saveAdminSettings(variables); saveAdminSettings(variables);