pzingg/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

add option to not unfollow on block, and option to not federate outgoing blocks

Browse source
This commit is contained in:
squidboi 2018-06-08 17:12:16 -07:00
parent 45a935f0bd
commit 2847fc8f90
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/config.exs
View file

@ -57,7 +57,10 @@
public: true,
quarantined_instances: []
config :pleroma, :activitypub, accept_blocks: true
config :pleroma, :activitypub,
accept_blocks: true,
unfollow_blocked: true,
outgoing_blocks: true
config :pleroma, :mrf_simple,
media_removal: [],

14
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -240,18 +240,28 @@ def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ tru
end
end
def block(blocker, blocked, activity_id \\ nil, local \\ true) do
follow_activity = fetch_latest_follow(blocker, blocked)
@ap_config Application.get_env(:pleroma, :activitypub)
@unfollow_blocked Keyword.get(@ap_config, :unfollow_blocked)
@outgoing_blocks Keyword.get(@ap_config, :outgoing_blocks)
def block(blocker, blocked, activity_id \\ nil, local \\ true) do
with true <- unfollow_blocked do
follow_activity = fetch_latest_follow(blocker, blocked)
if follow_activity do
unfollow(blocker, blocked, nil, local)
end
end
with true <- outgoing_blocks do
with block_data <- make_block_data(blocker, blocked, activity_id),
{:ok, activity} <- insert(block_data, local),
:ok <- maybe_federate(activity) do
{:ok, activity}
end
else
{:ok, nil}
end
end
def unblock(blocker, blocked, activity_id \\ nil, local \\ true) do