commit: b082e1f86b412b627db04d719233432fd387a30a
parent f5a5d354f73f06df298258ed44e9b9cad5adae30
Author: mkljczk <me@mkljczk.pl>
Date: Wed, 9 Jul 2025 00:05:21 +0200
Merge branch 'endorsement-state-fix' into 'develop'
Fix endorsement state display in relationship view
See merge request pleroma/pleroma!4381
Diffstat:
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changelog.d/endorsement-state.fix b/changelog.d/endorsement-state.fix
@@ -0,0 +1 @@
+Fix endorsement state display in relationship view
diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex
@@ -193,7 +193,8 @@ defmodule Pleroma.UserRelationship do
{[:mute], []}
nil ->
- {[:block, :mute, :notification_mute, :reblog_mute], [:block, :inverse_subscription]}
+ {[:block, :mute, :notification_mute, :reblog_mute, :endorsement],
+ [:block, :inverse_subscription]}
unknown ->
raise "Unsupported :subset option value: #{inspect(unknown)}"
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -168,9 +168,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
UserRelationship.exists?(
user_relationships,
:endorsement,
- target,
reading_user,
- &User.endorses?(&2, &1)
+ target,
+ &User.endorses?(&1, &2)
)
}
end