commit: 67a5542a73a8fab8c79da21022877bc233e8a760
parent f74f5e0a56277507e7bc3df7251ec58b6c8b41cb
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 5 Jan 2024 00:45:29 +0000
Merge branch 'fix-account-auth-check' into 'develop'
Fix authentication check on account rendering when bio is defined
See merge request pleroma/pleroma!4027
Diffstat:
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changelog.d/account-rendering-auth-check.fix b/changelog.d/account-rendering-auth-check.fix
@@ -0,0 +1 @@
+Fix authentication check on account rendering when bio is defined
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -194,6 +194,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
end
defp do_render("show.json", %{user: user} = opts) do
+ self = opts[:for] == user
+
user = User.sanitize_html(user, User.html_filter_policy(opts[:for]))
display_name = user.name || user.nickname
@@ -203,12 +205,12 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
header_static = User.banner_url(user) |> MediaProxy.preview_url(static: true)
following_count =
- if !user.hide_follows_count or !user.hide_follows or opts[:for] == user,
+ if !user.hide_follows_count or !user.hide_follows or self,
do: user.following_count,
else: 0
followers_count =
- if !user.hide_followers_count or !user.hide_followers or opts[:for] == user,
+ if !user.hide_followers_count or !user.hide_followers or self,
do: user.follower_count,
else: 0