diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 20:37:56 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 20:37:56 +0400 |
| commit | 364eecc49f137ae3c7798ad240983591e27b134c (patch) | |
| tree | 7ed228221db9794b0aae59fa0e548623c0aa12ae /docs/configuration | |
| parent | dc8fa04192cc133749e762b78ec043e0902d046d (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-364eecc49f137ae3c7798ad240983591e27b134c.tar.gz | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/mrf.md | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/configuration/mrf.md b/docs/configuration/mrf.md index c3957c255..3fcae0761 100644 --- a/docs/configuration/mrf.md +++ b/docs/configuration/mrf.md @@ -41,11 +41,14 @@ 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. Servers should be configured as lists. @@ -113,7 +116,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RewritePolicy do @impl true def describe do - {:ok, %{mrf_sample: %{content: "new message content"}}}` + {:ok, %{mrf_sample: %{content: "new message content"}}} end end ``` |