Merge branch 'endorsement-state-fix' into 'develop'
Fix endorsement state display in relationship view See merge request pleroma/pleroma!4381
This commit is contained in:
commit
b082e1f86b
3 changed files with 5 additions and 3 deletions
1
changelog.d/endorsement-state.fix
Normal file
1
changelog.d/endorsement-state.fix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Fix endorsement state display in relationship view
|
||||||
|
|
@ -193,7 +193,8 @@ defmodule Pleroma.UserRelationship do
|
||||||
{[:mute], []}
|
{[:mute], []}
|
||||||
|
|
||||||
nil ->
|
nil ->
|
||||||
{[:block, :mute, :notification_mute, :reblog_mute], [:block, :inverse_subscription]}
|
{[:block, :mute, :notification_mute, :reblog_mute, :endorsement],
|
||||||
|
[:block, :inverse_subscription]}
|
||||||
|
|
||||||
unknown ->
|
unknown ->
|
||||||
raise "Unsupported :subset option value: #{inspect(unknown)}"
|
raise "Unsupported :subset option value: #{inspect(unknown)}"
|
||||||
|
|
|
||||||
|
|
@ -168,9 +168,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
|
||||||
UserRelationship.exists?(
|
UserRelationship.exists?(
|
||||||
user_relationships,
|
user_relationships,
|
||||||
:endorsement,
|
:endorsement,
|
||||||
target,
|
|
||||||
reading_user,
|
reading_user,
|
||||||
&User.endorses?(&2, &1)
|
target,
|
||||||
|
&User.endorses?(&1, &2)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue