diff options
| author | lain <lain@soykaf.club> | 2024-02-15 09:35:39 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-02-15 09:35:39 +0000 |
| commit | d3208d225048c1a55b44d7d8ce324a6fef8ac14d (patch) | |
| tree | 453235ae9aab84d893b371111d0bb70136fd1215 | |
| parent | f2f455f283a0508044adb5bf5aac0ec24116a24f (diff) | |
| parent | 0fcdcc2300cc23eee27f1d20bf0a8008581329d1 (diff) | |
| download | pleroma-d3208d225048c1a55b44d7d8ce324a6fef8ac14d.tar.gz pleroma-d3208d225048c1a55b44d7d8ce324a6fef8ac14d.zip | |
Merge branch 'oauth-nickname' into 'develop'
Use User.full_nickname/1 in oauth html template
See merge request pleroma/pleroma!4054
| -rw-r--r-- | changelog.d/oauth-nickname.skip | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/templates/o_auth/o_auth/show.html.eex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/oauth-nickname.skip b/changelog.d/oauth-nickname.skip new file mode 100644 index 000000000..02f16e06c --- /dev/null +++ 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 index 5b38f7142..6bc8eb602 100644 --- 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 %> |