Merge branch 'instance-uri' into 'main'

instanceSchema: v1.uri -> v2.domain

See merge request soapbox-pub/soapbox!2963
environments/review-main-yi2y9f/deployments/4488
Alex Gleason 2024-03-25 16:34:33 +00:00
commit 0f1ece2c9e
1 zmienionych plików z 3 dodań i 0 usunięć

Wyświetl plik

@ -176,6 +176,7 @@ const instanceV1Schema = coerceObject({
stats: statsSchema, stats: statsSchema,
thumbnail: z.string().catch(''), thumbnail: z.string().catch(''),
title: z.string().catch(''), title: z.string().catch(''),
uri: z.string().catch(''),
urls: coerceObject({ urls: coerceObject({
streaming_api: z.string().url().optional().catch(undefined), streaming_api: z.string().url().optional().catch(undefined),
}), }),
@ -200,6 +201,7 @@ const instanceSchema = z.preprocess((data: any) => {
registrations, registrations,
short_description, short_description,
thumbnail, thumbnail,
uri,
urls, urls,
...instance ...instance
} = instanceV1Schema.parse(data); } = instanceV1Schema.parse(data);
@ -231,6 +233,7 @@ const instanceSchema = z.preprocess((data: any) => {
email: email, email: email,
}, },
description: short_description || description, description: short_description || description,
domain: uri,
pleroma: { pleroma: {
...pleroma, ...pleroma,
metadata: { metadata: {