notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[frontend/components] Use a single component for display names with emoji rendering

Browse source
This commit is contained in:
pancakes 2024-11-05 16:41:20 +10:00
parent 53c3fc9edc
commit cfcccf7654
No known key found for this signature in database
GPG key ID: ED53D426432B861B
7 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Iceshrimp.Frontend/Components/Note/Note.razor
View file

@ -7,14 +7,7 @@
<div class="renote-info"> <div class="renote-info">
<span class="user"> <span class="user">
<Icon Name="Icons.Repeat"/> Renoted by <Icon Name="Icons.Repeat"/> Renoted by
@if (NoteResponse.User.DisplayName != null) <UserDisplayName User="@NoteResponse.User"/>
{
@NoteResponse.User.DisplayName
}
else
{
@NoteResponse.User.Username
}
</span> </span>
<span class="metadata"> <span class="metadata">
<NoteMetadata Visibility="NoteResponse.Visibility" InstanceName="@null" CreatedAt="DateTime.Parse(NoteResponse.CreatedAt)"/> <NoteMetadata Visibility="NoteResponse.Visibility" InstanceName="@null" CreatedAt="DateTime.Parse(NoteResponse.CreatedAt)"/>

2
Iceshrimp.Frontend/Components/NoteLikeDetails.razor
View file

@ -13,7 +13,7 @@
<div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry"> <div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry">
<img class="icon" src="@el.AvatarUrl"/> <img class="icon" src="@el.AvatarUrl"/>
<div class="name-section"> <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 class="username">@@@el.Username@(el.Host != null ? $"@{el.Host}" : "")</div>
</div> </div>
</div> </div>

2
Iceshrimp.Frontend/Components/NoteRenoteDetails.razor
View file

@ -13,7 +13,7 @@
<div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry"> <div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry">
<img class="icon" src="@el.AvatarUrl"/> <img class="icon" src="@el.AvatarUrl"/>
<div class="name-section"> <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 class="username">@@@el.Username@(el.Host != null ? $"@{el.Host}" : "")</div>
</div> </div>
</div> </div>

2
Iceshrimp.Frontend/Components/NotificationComponent.razor
View file

@ -16,7 +16,7 @@
<div class="notification-body"> <div class="notification-body">
@if (NotificationResponse is { User: not null }) @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 }) @if (NotificationResponse is { Note: not null, Type: "like", User: not null })

2
Iceshrimp.Frontend/Components/ReactionDetails.razor
View file

@ -13,7 +13,7 @@
<div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry"> <div @onclick="() => OpenProfile(el.Username, el.Host)" class="detail-entry">
<img class="icon" src="@el.AvatarUrl"/> <img class="icon" src="@el.AvatarUrl"/>
<div class="name-section"> <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 class="username">@@@el.Username@(el.Host != null ? $"@{el.Host}" : "")</div>
</div> </div>
</div> </div>

13
Iceshrimp.Frontend/Components/UserDisplayName.razor Normal file
View file

@ -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; }
}

2
Iceshrimp.Frontend/Components/UserProfileCard.razor
View file

@ -14,7 +14,7 @@
</div> </div>
<div class="name-section"> <div class="name-section">
<div class="name"> <div class="name">
@(User.DisplayName ?? User.Username) <UserDisplayName User="@User"/>
</div> </div>
<div class="identifier"> <div class="identifier">
@@@User.Username @@@User.Username