From 2847fc8f90601c693074a514d8bd0447908bf020 Mon Sep 17 00:00:00 2001 From: squidboi Date: Fri, 8 Jun 2018 17:12:16 -0700 Subject: add option to not unfollow on block, and option to not federate outgoing blocks --- config/config.exs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 3292bf29c..dc2b42a8b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -57,7 +57,10 @@ config :pleroma, :instance, 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: [], -- cgit v1.2.3 From e99c73aeba3581a16b58d07658c98588108f254c Mon Sep 17 00:00:00 2001 From: squidboi Date: Fri, 8 Jun 2018 17:47:24 -0700 Subject: add option to not deny follow if blocked --- config/config.exs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index dc2b42a8b..ea08a5f71 100644 --- a/config/config.exs +++ b/config/config.exs @@ -62,6 +62,9 @@ config :pleroma, :activitypub, unfollow_blocked: true, outgoing_blocks: true +config :pleroma, :activitypub, + deny_follow_blocked: true + config :pleroma, :mrf_simple, media_removal: [], media_nsfw: [], -- cgit v1.2.3 From b3580b6971ed539c0d979e2b80631d0dc26e04c8 Mon Sep 17 00:00:00 2001 From: squidboi Date: Fri, 8 Jun 2018 18:29:41 -0700 Subject: add option to not deny follow if blocked (fixed) --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index ea08a5f71..58b17e206 100644 --- a/config/config.exs +++ b/config/config.exs @@ -62,7 +62,7 @@ config :pleroma, :activitypub, unfollow_blocked: true, outgoing_blocks: true -config :pleroma, :activitypub, +config :pleroma, :user, deny_follow_blocked: true config :pleroma, :mrf_simple, -- cgit v1.2.3 From 4f9ecfc77a54eef23741c89206b4cbce924f7d76 Mon Sep 17 00:00:00 2001 From: squidboi Date: Sat, 9 Jun 2018 04:28:11 +0000 Subject: formatting --- config/config.exs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 58b17e206..b8dd867c4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -62,8 +62,7 @@ config :pleroma, :activitypub, unfollow_blocked: true, outgoing_blocks: true -config :pleroma, :user, - deny_follow_blocked: true +config :pleroma, :user, deny_follow_blocked: true config :pleroma, :mrf_simple, media_removal: [], -- cgit v1.2.3