limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'

Browse source 
activitypub: allow mastodon S2S block extension support to be disabled

See merge request pleroma/pleroma!176
This commit is contained in:
lambda 2018-05-26 09:50:54 +00:00
commit e1fe46e1cf
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -56,6 +56,8 @@ config :pleroma, :instance,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true public: true
config :pleroma, :activitypub, accept_blocks: true
config :pleroma, :mrf_simple, config :pleroma, :mrf_simple,
media_removal: [], media_removal: [],
media_nsfw: [], media_nsfw: [],

9
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -259,6 +259,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
end end
end end
@ap_config Application.get_env(:pleroma, :activitypub)
@accept_blocks Keyword.get(@ap_config, :accept_blocks)
def handle_incoming( def handle_incoming(
%{ %{
"type" => "Undo", "type" => "Undo",
@ -267,7 +270,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
"id" => id "id" => id
} = _data } = _data
) do ) do
with %User{local: true} = blocked <- User.get_cached_by_ap_id(blocked), with true <- @accept_blocks,
%User{local: true} = blocked <- User.get_cached_by_ap_id(blocked),
%User{} = blocker <- User.get_or_fetch_by_ap_id(blocker), %User{} = blocker <- User.get_or_fetch_by_ap_id(blocker),
{:ok, activity} <- ActivityPub.unblock(blocker, blocked, id, false) do {:ok, activity} <- ActivityPub.unblock(blocker, blocked, id, false) do
User.unblock(blocker, blocked) User.unblock(blocker, blocked)
@ -280,7 +284,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def handle_incoming( def handle_incoming(
%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data %{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data
) do ) do
with %User{local: true} = blocked = User.get_cached_by_ap_id(blocked), with true <- @accept_blocks,
%User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
%User{} = blocker = User.get_or_fetch_by_ap_id(blocker), %User{} = blocker = User.get_or_fetch_by_ap_id(blocker),
{:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do {:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do
User.unfollow(blocker, blocked) User.unfollow(blocker, blocked)