mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'oauth-nickname' into 'develop'

Browse source 
Use User.full_nickname/1 in oauth html template

See merge request pleroma/pleroma!4054
This commit is contained in:
lain 2024-02-15 09:35:39 +00:00
commit d3208d2250
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/oauth-nickname.skip Normal file
View file

@ -0,0 +1 @@
Use User.full_nickname/1 in oauth html template

2
lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
View file

@ -13,7 +13,7 @@
<div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div> <div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div>
<div class="account-header__meta"> <div class="account-header__meta">
<div class="account-header__display-name"><%= @user.name %></div> <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>
</div> </div>
<% end %> <% end %>