pleroma

commit: d3208d225048c1a55b44d7d8ce324a6fef8ac14d
parent f2f455f283a0508044adb5bf5aac0ec24116a24f
Author: lain <lain@soykaf.club>
Date:   Thu, 15 Feb 2024 09:35:39 +0000

Merge branch 'oauth-nickname' into 'develop'

Use User.full_nickname/1 in oauth html template

See merge request pleroma/pleroma!4054
Diffstat:
A
changelog.d/oauth-nickname.skip
2
++
M
lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
2
+-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/changelog.d/oauth-nickname.skip b/changelog.d/oauth-nickname.skip
@@ -0,0 +1 @@
+Use User.full_nickname/1 in oauth html template
+\ No newline at end of file
diff --git a/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
@@ -13,7 +13,7 @@
     <div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div>
     <div class="account-header__meta">
       <div class="account-header__display-name"><%= @user.name %></div>
-      <div class="account-header__nickname">@<%= @user.nickname %>@<%= Pleroma.User.get_host(@user) %></div>
+      <div class="account-header__nickname">@<%= Pleroma.User.full_nickname(@user.nickname) %></div>
     </div>
   </div>
 <% end %>