Commit 1dd162a5 authored by lain's avatar lain

SimplePolicy: Fix problem with DM leaks.

parent e2e66e50
Pipeline #29256 passed with stages
in 21 minutes and 1 second
......@@ -109,6 +109,10 @@ defp check_ftl_removal(%{host: actor_host} = _actor_info, object) do
{:ok, object}
end
defp intersection(list1, list2) do
list1 -- list1 -- list2
end
defp check_followers_only(%{host: actor_host} = _actor_info, object) do
followers_only =
Config.get([:mrf_simple, :followers_only])
......@@ -125,8 +129,8 @@ defp check_followers_only(%{host: actor_host} = _actor_info, object) do
cc = FollowingRelationship.followers_ap_ids(user, fixed_cc)
object
|> Map.put("to", [user.follower_address] ++ to)
|> Map.put("cc", cc)
|> Map.put("to", intersection([user.follower_address | to], fixed_to))
|> Map.put("cc", intersection([user.follower_address | cc], fixed_cc))
else
_ -> object
end
......
......@@ -308,7 +308,7 @@ test "has a matching host" do
Config.put([:mrf_simple, :followers_only], [actor_domain])
assert {:ok, new_activity} = SimplePolicy.filter(activity)
assert actor.follower_address in new_activity["to"]
assert actor.follower_address in new_activity["cc"]
assert following_user.ap_id in new_activity["to"]
refute "https://www.w3.org/ns/activitystreams#Public" in new_activity["to"]
refute "https://www.w3.org/ns/activitystreams#Public" in new_activity["cc"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment