moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename ditto.external property to ditto.external_url

This commit is contained in:
Siddharth Singh 2024-06-24 02:39:45 +05:30
parent de866d25e5
commit 0770220fbb
No known key found for this signature in database
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/status-action-bar.tsx
View File

@ -464,7 +464,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
} }
if (features.federating && !account.local) { 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); const { hostname: domain } = new URL(ditto || status.uri);
menu.push({ menu.push({

4
src/features/account/components/header.tsx
View File

@ -311,10 +311,10 @@ const Header: React.FC<IHeader> = ({ 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)) { if (features.federating && (!account.local || ditto)) {
const domain = ditto || account.fqn.split('@')[1]; 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) { if (domain && url) {
menu.push({ menu.push({

2
src/schemas/account.ts
View File

@ -43,7 +43,7 @@ const baseAccountSchema = z.object({
ditto: coerceObject({ ditto: coerceObject({
accepts_zaps: z.boolean().catch(false), accepts_zaps: z.boolean().catch(false),
is_registered: 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), emojis: filteredArray(customEmojiSchema),
fields: filteredArray(fieldSchema), fields: filteredArray(fieldSchema),