From: lain <lain@soykaf.club>
Date: Mon, 20 Apr 2020 12:57:45 +0000 (+0000)
Subject: Merge branch 'mrf-docs-update' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=617a9f62089438832ee50ebbdb40e313def63bbc;hp=-c;p=akkoma

Merge branch 'mrf-docs-update' into 'develop'

Expand MRF SimplePolicy docs

See merge request pleroma/pleroma!2370
---

617a9f62089438832ee50ebbdb40e313def63bbc
diff --combined docs/configuration/mrf.md
index 287416b2a,9f13c3d18..3fcae0761
--- a/docs/configuration/mrf.md
+++ b/docs/configuration/mrf.md
@@@ -41,11 -41,14 +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 +116,7 @@@ defmodule Pleroma.Web.ActivityPub.MRF.R
  
    @impl true
    def describe do
 -    {:ok, %{mrf_sample: %{content: "new message content"}}}`
 +    {:ok, %{mrf_sample: %{content: "new message content"}}}
    end
  end
  ```