projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5bb88fd
)
Runtime config: MRF changes
author
href
<href@random.sh>
Wed, 7 Nov 2018 09:40:24 +0000
(10:40 +0100)
committer
href
<href@random.sh>
Wed, 7 Nov 2018 09:40:24 +0000
(10:40 +0100)
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index 341b5bce36cdaa13310cc4004ae84333739a4e5e..86dcf5080532b1054bfba7e00a97d2c4114a9ff7 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@
-7,6
+7,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
cond do
accepts == [] -> {:ok, object}
cond do
accepts == [] -> {:ok, object}
+ actor_host == Pleroma.Config.get([Pleroma.Web.Endpoint, :url, :host]) -> {:ok, object}
Enum.member?(accepts, actor_host) -> {:ok, object}
true -> {:reject, nil}
end
Enum.member?(accepts, actor_host) -> {:ok, object}
true -> {:reject, nil}
end
@@
-22,9
+23,9
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
defp check_media_removal(
%{host: actor_host} = _actor_info,
defp check_media_removal(
%{host: actor_host} = _actor_info,
- %{"type" => "Create", "object" => %{"attachement" => child_attach
e
ment}} = object
+ %{"type" => "Create", "object" => %{"attachement" => child_attachment}} = object
)
)
- when length(child_attach
e
ment) > 0 do
+ when length(child_attachment) > 0 do
object =
if Enum.member?(Pleroma.Config.get([:mrf_simple, :media_removal]), actor_host) do
child_object = Map.delete(object["object"], "attachment")
object =
if Enum.member?(Pleroma.Config.get([:mrf_simple, :media_removal]), actor_host) do
child_object = Map.delete(object["object"], "attachment")
@@
-68,7
+69,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
Pleroma.Config.get([:mrf_simple, :federated_timeline_removal]),
actor_host
),
Pleroma.Config.get([:mrf_simple, :federated_timeline_removal]),
actor_host
),
- user <- User.get_by_ap_id(object["actor"]),
+ 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
to =
true <- "https://www.w3.org/ns/activitystreams#Public" in object["to"],
true <- user.follower_address in object["cc"] do
to =