hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MastoAPI AccountView: Readd block/mute expiry outside the relationship

Browse source
This commit is contained in:
Phantasm 2026-01-24 21:33:49 +01:00 • committed by Henry Jameson
commit f4a8c426df
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -345,6 +345,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
|> maybe_put_unread_conversation_count(user, opts[:for])
|> maybe_put_unread_notification_count(user, opts[:for])
|> maybe_put_email_address(user, opts[:for])
|> maybe_put_mute_expires_at(user, opts[:for], relationship)
|> maybe_put_block_expires_at(user, opts[:for], relationship)
|> maybe_show_birthday(user, opts[:for])
end
@ -482,6 +484,21 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
end
end
defp maybe_put_mute_expires_at(data, %User{} = target, %User{} = user, relationship) do
cond do
Map.has_key?(relationship, :mute_expires_at) ->
Map.put(data, :mute_expires_at, relationship.mute_expires_at)
User.mutes_user?(user, target) ->
Map.put(data, :mute_expires_at, UserRelationship.get_mute_expire_date(user, target))
true ->
Map.put(data, :mute_expires_at, nil)
end
end
defp maybe_put_mute_expires_at(data, _, _, _), do: data
defp maybe_put_block_expires_at(user_relationships, %User{} = target, %User{} = user) do
cond do
UserRelationship.exists?(
@ -498,6 +515,21 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
end
end
defp maybe_put_block_expires_at(data, %User{} = target, %User{} = user, relationship) do
cond do
Map.has_key?(relationship, :block_expires_at) ->
Map.put(data, :block_expires_at, relationship.block_expires_at)
User.blocks_user?(user, target) ->
Map.put(data, :block_expires_at, UserRelationship.get_block_expire_date(user, target))
true ->
Map.put(data, :block_expires_at, nil)
end
end
defp maybe_put_block_expires_at(data, _, _, _), do: data
defp maybe_show_birthday(data, %User{id: user_id} = user, %User{id: user_id}) do
data
|> Kernel.put_in([:pleroma, :birthday], user.birthday)