diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-25 06:12:29 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-25 06:12:29 +0000 |
| commit | dfc96f222cc65eda92e5696a2fc2d6d926f960ed (patch) | |
| tree | d4e9c57c4005af7348b11795834d2993585708c1 /CONFIGURATION.md | |
| parent | 92135d00fc6a9dcdeda32a55ac7a88353b7f96f2 (diff) | |
| parent | ea214b8ba65c0911aed6d2b019465272fc77fbc4 (diff) | |
| download | pleroma-dfc96f222cc65eda92e5696a2fc2d6d926f960ed.tar.gz pleroma-dfc96f222cc65eda92e5696a2fc2d6d926f960ed.zip | |
Merge branch 'feature/configurable-blocks' into 'develop'
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
Diffstat (limited to 'CONFIGURATION.md')
| -rw-r--r-- | CONFIGURATION.md | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 6b2821b21..3f0ecafb5 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -13,6 +13,23 @@ Instead, overload the settings by editing the following files: * `dev.secret.exs`: custom additional configuration for `MIX_ENV=dev` * `prod.secret.exs`: custom additional configuration for `MIX_ENV=prod` +## Block functionality + + config :pleroma, :activitypub, + accept_blocks: true, + unfollow_blocked: true, + outgoing_blocks: true + + config :pleroma, :user, deny_follow_blocked: true + +* `accept_blocks`: whether to accept incoming block activities from + other instances +* `unfollow_blocked`: whether blocks result in people getting + unfollowed +* `outgoing_blocks`: whether to federate blocks to other instances +* `deny_follow_blocked`: whether to disallow following an account that + has blocked the user in question + ## Message Rewrite Filters (MRFs) Modify incoming and outgoing posts. |