From 0770220fbb96e35ed4df4266d4e2507c662c5624 Mon Sep 17 00:00:00 2001 From: Siddharth Singh Date: Mon, 24 Jun 2024 02:39:45 +0530 Subject: [PATCH] rename ditto.external property to ditto.external_url --- src/components/status-action-bar.tsx | 4 ++-- src/features/account/components/header.tsx | 4 ++-- src/schemas/account.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx index 4e670f82a..f193bd951 100644 --- a/src/components/status-action-bar.tsx +++ b/src/components/status-action-bar.tsx @@ -464,9 +464,9 @@ const StatusActionBar: React.FC = ({ } if (features.federating && !account.local) { - const ditto: string | undefined = status.ditto?.get('external'); + const ditto: string | undefined = status.ditto?.get('external_url'); const { hostname: domain } = new URL(ditto || status.uri); - + menu.push({ text: intl.formatMessage(messages.external, { domain }), icon: require('@tabler/icons/outline/external-link.svg'), diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx index 061dc8031..ced1d7a28 100644 --- a/src/features/account/components/header.tsx +++ b/src/features/account/components/header.tsx @@ -311,10 +311,10 @@ const Header: React.FC = ({ account }) => { }); } - const ditto = account.ditto.external ? new URL(account.ditto.external).host : undefined; + const ditto = account.ditto.external_url ? new URL(account.ditto.external_url).host : undefined; if (features.federating && (!account.local || ditto)) { const domain = ditto || account.fqn.split('@')[1]; - const url = account.ditto.external || account.url; + const url = account.ditto.external_url || account.url; if (domain && url) { menu.push({ diff --git a/src/schemas/account.ts b/src/schemas/account.ts index d53d2da7f..15ebc821e 100644 --- a/src/schemas/account.ts +++ b/src/schemas/account.ts @@ -43,7 +43,7 @@ const baseAccountSchema = z.object({ ditto: coerceObject({ accepts_zaps: z.boolean().catch(false), is_registered: z.boolean().catch(false), - external: z.string().optional().catch(undefined), + external_url: z.string().optional().catch(undefined), }), emojis: filteredArray(customEmojiSchema), fields: filteredArray(fieldSchema),