diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-26 02:10:31 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-26 02:10:31 +0000 |
| commit | d66cf4b2c4968c52aa1a9e5aa0abff571e336b96 (patch) | |
| tree | a35a72811a7e7db09515a5eb09a62e294c982fd6 /lib | |
| parent | 9f44fa068648929aff639ecd5fd74e9c643803b5 (diff) | |
| parent | 79503ce90f6d85f00ee9e2dbc6358df2237d5036 (diff) | |
| download | pleroma-d66cf4b2c4968c52aa1a9e5aa0abff571e336b96.tar.gz | |
Merge branch 'fix/mrf-simple' into 'develop'
mrf: simple policy: fix matching imported activitypub and ostatus statuses
Closes #915
See merge request pleroma/pleroma!1205
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index 890d70a7a..433d23c5f 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -74,8 +74,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do actor_host ), user <- User.get_cached_by_ap_id(object["actor"]), - true <- "https://www.w3.org/ns/activitystreams#Public" in object["to"], - true <- user.follower_address in object["cc"] do + true <- "https://www.w3.org/ns/activitystreams#Public" in object["to"] do to = List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++ [user.follower_address] |