commit: f25a3f4f78c9505b14e0e03a6d4ac23a3b497999
parent: f53dc5ee08b5db336738fa73677533785fb7351f
Author: lambda <pleromagit@rogerbraun.net>
Date: Tue, 19 Feb 2019 14:08:19 +0000
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
Diffstat:
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -878,7 +878,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
def is_private?(activity) do
- !is_public?(activity) && Enum.any?(activity.data["to"], &String.contains?(&1, "/followers"))
+ unless is_public?(activity) do
+ follower_address = User.get_cached_by_ap_id(activity.data["actor"]).follower_address
+ Enum.any?(activity.data["to"], &(&1 == follower_address))
+ else
+ false
+ end
end
def is_direct?(%Activity{data: %{"directMessage" => true}}), do: true