From cfcccf76546a57f09ced444e035307888f59bf99 Mon Sep 17 00:00:00 2001
From: pancakes <trypancakes@tutanota.com>
Date: Tue, 5 Nov 2024 16:41:20 +1000
Subject: [PATCH] [frontend/components] Use a single component for display
 names with emoji rendering

---
 Iceshrimp.Frontend/Components/Note/Note.razor       |  9 +--------
 Iceshrimp.Frontend/Components/NoteLikeDetails.razor |  2 +-
 .../Components/NoteRenoteDetails.razor              |  2 +-
 .../Components/NotificationComponent.razor          |  2 +-
 Iceshrimp.Frontend/Components/ReactionDetails.razor |  2 +-
 Iceshrimp.Frontend/Components/UserDisplayName.razor | 13 +++++++++++++
 Iceshrimp.Frontend/Components/UserProfileCard.razor |  2 +-
 7 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 Iceshrimp.Frontend/Components/UserDisplayName.razor

diff --git a/Iceshrimp.Frontend/Components/Note/Note.razor b/Iceshrimp.Frontend/Components/Note/Note.razor
index 335a8274..e2bfcafd 100644
--- a/Iceshrimp.Frontend/Components/Note/Note.razor
+++ b/Iceshrimp.Frontend/Components/Note/Note.razor
@@ -7,14 +7,7 @@
             <div class="renote-info">
                 <span class="user">
                     <Icon Name="Icons.Repeat"/> Renoted by
-                    @if (NoteResponse.User.DisplayName != null)
-                    {
-                        @NoteResponse.User.DisplayName
-                    }
-                    else
-                    {
-                        @NoteResponse.User.Username
-                    }
+                    <UserDisplayName User="@NoteResponse.User"/>
                 </span>
                 <span class="metadata">
                     <NoteMetadata Visibility="NoteResponse.Visibility" InstanceName="@null" CreatedAt="DateTime.Parse(NoteResponse.CreatedAt)"/>
diff --git a/Iceshrimp.Frontend/Components/NoteLikeDetails.razor b/Iceshrimp.Frontend/Components/NoteLikeDetails.razor
index 00c145e4..d4096f8e 100644
--- a/Iceshrimp.Frontend/Components/NoteLikeDetails.razor
+++ b/Iceshrimp.Frontend/Components/NoteLikeDetails.razor
@@ -13,7 +13,7 @@
             <div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry">
                 <img class="icon" src="@el.AvatarUrl"/>
                 <div class="name-section">
-                    <div class="displayname">@(el.DisplayName ?? el.Username)</div>
+                    <div class="displayname"><UserDisplayName User="@el"/></div>
                     <div class="username">@@@el.Username@(el.Host != null ? $"@{el.Host}" : "")</div>
                 </div>
             </div>
diff --git a/Iceshrimp.Frontend/Components/NoteRenoteDetails.razor b/Iceshrimp.Frontend/Components/NoteRenoteDetails.razor
index f204fea9..aa2511c0 100644
--- a/Iceshrimp.Frontend/Components/NoteRenoteDetails.razor
+++ b/Iceshrimp.Frontend/Components/NoteRenoteDetails.razor
@@ -13,7 +13,7 @@
             <div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry">
                 <img class="icon" src="@el.AvatarUrl"/>
                 <div class="name-section">
-                    <div class="displayname">@(el.DisplayName ?? el.Username)</div>
+                    <div class="displayname"><UserDisplayName User="@el"/></div>
                     <div class="username">@@@el.Username@(el.Host != null ? $"@{el.Host}" : "")</div>
                 </div>
             </div>
diff --git a/Iceshrimp.Frontend/Components/NotificationComponent.razor b/Iceshrimp.Frontend/Components/NotificationComponent.razor
index ccac25fc..ff59cd10 100644
--- a/Iceshrimp.Frontend/Components/NotificationComponent.razor
+++ b/Iceshrimp.Frontend/Components/NotificationComponent.razor
@@ -16,7 +16,7 @@
         <div class="notification-body">
             @if (NotificationResponse is { User: not null })
             {
-                <span @onclick="OpenProfile" class="display-name">@(NotificationResponse.User.DisplayName ?? NotificationResponse.User.Username)</span>
+                <span @onclick="OpenProfile" class="display-name"><UserDisplayName User="@NotificationResponse.User"/></span>
             }
 
             @if (NotificationResponse is { Note: not null, Type: "like", User: not null })
diff --git a/Iceshrimp.Frontend/Components/ReactionDetails.razor b/Iceshrimp.Frontend/Components/ReactionDetails.razor
index 2f22f7da..2dc3984b 100644
--- a/Iceshrimp.Frontend/Components/ReactionDetails.razor
+++ b/Iceshrimp.Frontend/Components/ReactionDetails.razor
@@ -13,7 +13,7 @@
             <div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry">
                 <img class="icon" src="@el.AvatarUrl"/>
                 <div class="name-section">
-                    <div class="displayname">@(el.DisplayName ?? el.Username)</div>
+                    <div class="displayname"><UserDisplayName User="@el"/></div>
                     <div class="username">@@@el.Username@(el.Host != null ? $"@{el.Host}" : "")</div>
                 </div>
             </div>
diff --git a/Iceshrimp.Frontend/Components/UserDisplayName.razor b/Iceshrimp.Frontend/Components/UserDisplayName.razor
new file mode 100644
index 00000000..d9389cb3
--- /dev/null
+++ b/Iceshrimp.Frontend/Components/UserDisplayName.razor
@@ -0,0 +1,13 @@
+@using Iceshrimp.Shared.Schemas.Web
+@if (User.DisplayName != null && User.Emojis.Count != 0)
+{
+    <MfmText Text="@User.DisplayName" Emoji="@User.Emojis" Simple="@true"/>
+}
+else
+{
+    @(User.DisplayName ?? User.Username)
+}
+
+@code {
+    [Parameter] [EditorRequired] public required UserResponse User { get; set; }
+}
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Components/UserProfileCard.razor b/Iceshrimp.Frontend/Components/UserProfileCard.razor
index 29056897..2819af51 100644
--- a/Iceshrimp.Frontend/Components/UserProfileCard.razor
+++ b/Iceshrimp.Frontend/Components/UserProfileCard.razor
@@ -14,7 +14,7 @@
             </div>
             <div class="name-section">
                 <div class="name">
-                    @(User.DisplayName ?? User.Username)
+                    <UserDisplayName User="@User"/>
                 </div>
                 <div class="identifier">
                     @@@User.Username