Merge branch 'follower-mrf-again' into 'develop'

Follower mrf again

See merge request pleroma/pleroma!2833
This commit is contained in:
lain 2020-08-03 14:22:11 +00:00
commit 56b5b9aa27
6 changed files with 104 additions and 1 deletions

View file

@ -374,6 +374,7 @@ config :pleroma, :mrf_simple,
federated_timeline_removal: [],
report_removal: [],
reject: [],
followers_only: [],
accept: [],
avatar_removal: [],
banner_removal: [],

View file

@ -1542,6 +1542,12 @@ config :pleroma, :config_description, [
description: "List of instances to only accept activities from (except deletes)",
suggestions: ["example.com", "*.example.com"]
},
%{
key: :followers_only,
type: {:list, :string},
description: "Force posts from the given instances to be visible by followers only",
suggestions: ["example.com", "*.example.com"]
},
%{
key: :report_removal,
type: {:list, :string},