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

[#1335] Reorganized users.mutes as relation to UserMute entity.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-11-15 21:38:54 +03:00
commit c31ddce51e
16 changed files with 258 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -858,7 +858,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_muted(query, %{"with_muted" => val}) when val in [true, "true", "1"], do: query
defp restrict_muted(query, %{"muting_user" => %User{} = user} = opts) do
mutes = user.mutes
mutes = opts["muted_ap_ids"] || User.muted_ap_ids(user)
query =
from([activity] in query,
@ -875,8 +875,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_muted(query, _), do: query
defp restrict_blocked(query, %{"blocking_user" => %User{} = user}) do
blocked_ap_ids = User.blocked_ap_ids(user)
defp restrict_blocked(query, %{"blocking_user" => %User{} = user} = opts) do
blocked_ap_ids = opts["blocked_ap_ids"] || User.blocked_ap_ids(user)
domain_blocks = user.domain_blocks || []
query =