From 585e369e0bb0e17ff5e025385dfefde1e9e81fa3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 15:43:08 +0200
Subject: [PATCH] Fix display name being displayed instead of domain in remote
reports (#31613)
---
.../components/notification_admin_report.tsx | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
index fda5798ae..e41a6b273 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
@@ -42,19 +42,11 @@ export const NotificationAdminReport: React.FC<{
if (!account || !targetAccount) return null;
+ const domain = account.acct.split('@')[1];
+
const values = {
- name: (
- <bdi
- dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
- />
- ),
- target: (
- <bdi
- dangerouslySetInnerHTML={{
- __html: targetAccount.get('display_name_html'),
- }}
- />
- ),
+ name: <bdi>{domain ?? `@${account.acct}`}</bdi>,
+ target: <bdi>@{targetAccount.acct}</bdi>,
category: intl.formatMessage(messages[report.category]),
count: report.status_ids.length,
};