mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

SimpleMRF silence: optimize, work okay with nil values in addressing

Browse source
This commit is contained in:
Alex Gleason 2020-07-28 20:17:18 -05:00
parent 3c90f7f715
commit 2a99e7df8e
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/following_relationship.ex
View file

@ -95,7 +95,11 @@ defmodule Pleroma.FollowingRelationship do
|> where([r], r.state == ^:follow_accept)
end
def followers_ap_ids(%User{} = user, from_ap_ids \\ nil) do
def followers_ap_ids(user, from_ap_ids \\ nil)
def followers_ap_ids(_, []), do: []
def followers_ap_ids(%User{} = user, from_ap_ids) do
query =
user
|> followers_query()

13
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View file

@ -117,14 +117,15 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
object =
with true <- MRF.subdomain_match?(silence, actor_host),
user <- User.get_cached_by_ap_id(object["actor"]) do
to =
FollowingRelationship.followers_ap_ids(user, Map.get(object, "to", [])) ++
[user.follower_address]
# Don't use Map.get/3 intentionally, these must not be nil
fixed_to = object["to"] || []
fixed_cc = object["cc"] || []
cc = FollowingRelationship.followers_ap_ids(user, Map.get(object, "cc", []))
to = FollowingRelationship.followers_ap_ids(user, fixed_to)
cc = FollowingRelationship.followers_ap_ids(user, fixed_cc)
object
|> Map.put("to", to)
|> Map.put("to", [user.follower_address] ++ to)
|> Map.put("cc", cc)
else
_ -> object
@ -133,8 +134,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
{:ok, object}
end
defp check_silence(_actor_info, object), do: {:ok, object}
defp check_report_removal(%{host: actor_host} = _actor_info, %{"type" => "Flag"} = object) do
report_removal =
Config.get([:mrf_simple, :report_removal])