diff options
| author | lain <lain@soykaf.club> | 2020-08-03 14:22:11 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-03 14:22:11 +0000 |
| commit | 56b5b9aa276c0a302c89dc7ca02c18fdc4645e56 (patch) | |
| tree | fe77831be5ce2165d9c0fbe64f1f6b551c3ddb6d /config | |
| parent | 66ebd88634d2093fc6c4f9f90d5e32a4f2638696 (diff) | |
| parent | cb1e3893aa8c03e3245978eb6d76bc2b3c534ba0 (diff) | |
| download | pleroma-56b5b9aa276c0a302c89dc7ca02c18fdc4645e56.tar.gz | |
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index ef92d4cb3..6acb38051 100644 --- a/config/config.exs +++ b/config/config.exs @@ -374,6 +374,7 @@ config :pleroma, :mrf_simple, federated_timeline_removal: [], report_removal: [], reject: [], + followers_only: [], accept: [], avatar_removal: [], banner_removal: [], diff --git a/config/description.exs b/config/description.exs index 11fbe0d78..d623a9f75 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1543,6 +1543,12 @@ config :pleroma, :config_description, [ 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}, description: "List of instances to reject reports from", |