diff options
| author | lain <lain@soykaf.club> | 2020-04-21 12:00:33 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-21 12:00:33 +0200 |
| commit | 5165287ff49ff894d2c318fd1138b789a97f9cce (patch) | |
| tree | 97be7133fb193dd1d4647830b60eccb81e93a0fc /docs/configuration | |
| parent | b5df4a98e4044cf1360f03f7dc3a0b59932ec8f5 (diff) | |
| parent | e57c1b60e4a0f882d5217bf1be8b1a7240aa322d (diff) | |
| download | pleroma-5165287ff49ff894d2c318fd1138b789a97f9cce.tar.gz pleroma-5165287ff49ff894d2c318fd1138b789a97f9cce.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/mrf.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/configuration/mrf.md b/docs/configuration/mrf.md index 287416b2a..d48d0cc99 100644 --- a/docs/configuration/mrf.md +++ b/docs/configuration/mrf.md @@ -41,11 +41,15 @@ config :pleroma, :instance, Once `SimplePolicy` is enabled, you can configure various groups in the `:mrf_simple` config object. These groups are: -* `media_removal`: Servers in this group will have media stripped from incoming messages. -* `media_nsfw`: Servers in this group will have the #nsfw tag and sensitive setting injected into incoming messages which contain media. * `reject`: Servers in this group will have their messages rejected. -* `federated_timeline_removal`: Servers in this group will have their messages unlisted from the public timelines by flipping the `to` and `cc` fields. +* `accept`: If not empty, only messages from these instances will be accepted (whitelist federation). +* `media_nsfw`: Servers in this group will have the #nsfw tag and sensitive setting injected into incoming messages which contain media. +* `media_removal`: Servers in this group will have media stripped from incoming messages. +* `avatar_removal`: Avatars from these servers will be stripped from incoming messages. +* `banner_removal`: Banner images from these servers will be stripped from incoming messages. * `report_removal`: Servers in this group will have their reports (flags) rejected. +* `federated_timeline_removal`: Servers in this group will have their messages unlisted from the public timelines by flipping the `to` and `cc` fields. +* `reject_deletes`: Deletion requests will be rejected from these servers. Servers should be configured as lists. |