use external viewer link for statuses as well

environments/review-main-yi2y9f/deployments/4710^2
Siddharth Singh 3 months ago
parent 73df5533bb
commit de866d25e5
No known key found for this signature in database

@ -464,11 +464,13 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
} }
if (features.federating && !account.local) { if (features.federating && !account.local) {
const { hostname: domain } = new URL(status.uri); const ditto: string | undefined = status.ditto?.get('external');
const { hostname: domain } = new URL(ditto || status.uri);
menu.push({ menu.push({
text: intl.formatMessage(messages.external, { domain }), text: intl.formatMessage(messages.external, { domain }),
icon: require('@tabler/icons/outline/external-link.svg'), icon: require('@tabler/icons/outline/external-link.svg'),
href: status.uri, href: ditto || status.uri,
target: '_blank', target: '_blank',
}); });
} }

@ -67,6 +67,7 @@ export const StatusRecord = ImmutableRecord({
muted: false, muted: false,
pinned: false, pinned: false,
pleroma: ImmutableMap<string, any>(), pleroma: ImmutableMap<string, any>(),
ditto: ImmutableMap<string, any>(),
poll: null as EmbeddedEntity<Poll>, poll: null as EmbeddedEntity<Poll>,
quote: null as EmbeddedEntity<any>, quote: null as EmbeddedEntity<any>,
quotes_count: 0, quotes_count: 0,

@ -24,6 +24,10 @@ const statusPleromaSchema = z.object({
quote_visible: z.boolean().catch(true), quote_visible: z.boolean().catch(true),
}); });
const statusDittoSchema = z.object({
external: z.string().optional().catch(undefined),
});
const baseStatusSchema = z.object({ const baseStatusSchema = z.object({
account: accountSchema, account: accountSchema,
application: z.object({ application: z.object({
@ -51,6 +55,7 @@ const baseStatusSchema = z.object({
muted: z.coerce.boolean(), muted: z.coerce.boolean(),
pinned: z.coerce.boolean(), pinned: z.coerce.boolean(),
pleroma: statusPleromaSchema.optional().catch(undefined), pleroma: statusPleromaSchema.optional().catch(undefined),
ditto: statusDittoSchema.optional().catch(undefined),
reactions: filteredArray(emojiReactionSchema), reactions: filteredArray(emojiReactionSchema),
poll: pollSchema.nullable().catch(null), poll: pollSchema.nullable().catch(null),
quote: z.literal(null).catch(null), quote: z.literal(null).catch(null),

Loading…
Cancel
Save