diff --git a/packages/nicolium/src/components/statuses/status-action-bar.tsx b/packages/nicolium/src/components/statuses/status-action-bar.tsx index 9b0a7670c..dba79f5d3 100644 --- a/packages/nicolium/src/components/statuses/status-action-bar.tsx +++ b/packages/nicolium/src/components/statuses/status-action-bar.tsx @@ -1476,7 +1476,7 @@ const StatusActionBar: React.FC = ({ }); }, []); - if (!status) { + if (!status || !status.account) { return null; } diff --git a/packages/pl-api/lib/entities/admin/report.ts b/packages/pl-api/lib/entities/admin/report.ts index caa3fd927..a96a46777 100644 --- a/packages/pl-api/lib/entities/admin/report.ts +++ b/packages/pl-api/lib/entities/admin/report.ts @@ -15,6 +15,11 @@ import { adminAccountSchema } from './account'; const adminReportSchema = v.pipe( v.any(), v.transform((report: any) => { + report.statuses = report.statuses?.map((status: any) => ({ + ...status, + account: (report.actor ? report.account : report.target_account)?.account || status.account, + })); + if (report.actor) { /** * Convert Pleroma report schema