Merge branch 'feature/mrf-user-filter' into 'develop'

mrf: add support for filtering users

See merge request pleroma/pleroma!1188

diff --combined CHANGELOG.md
index 6c94669dbec254281d790de455f748b9158646cb,2a2b11ddfb768feb3954c6ce0881d2ccf5782de3..7869e299bb293169083653f83fcba907f8af71bc
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,7 -5,6 +5,7 @@@ The format is based on [Keep a Changelo
  
  ## [unreleased]
  ### Added
 +- Optional SSH access mode. (Needs `erlang-ssh` package on some distributions).
  - [MongooseIM](https://github.com/esl/MongooseIM) http authentication support.
  - LDAP authentication
  - External OAuth provider authentication
@@@ -43,6 -42,8 +43,8 @@@
  - Emoji packs and emoji pack manager
  - Object pruning (`mix pleroma.database prune_objects`)
  - OAuth: added job to clean expired access tokens
+ - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
+ - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
  
  ### Changed
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer

diff --combined docs/config.md
index be0cbc2dcd51791b0b8a59c9e8a7f01fcf46cb9c,1d1d24c3275d7f5f4a03f91649c2b2a4c530253d..67b062fe930b776112f680eae2ac24161cbbc1dc
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -220,6 -220,9 +220,9 @@@ relates to mascots on the mastodon fron
  * `federated_timeline_removal`: List of instances to remove from Federated (aka The Whole Known Network) Timeline
  * `reject`: List of instances to reject any activities from
  * `accept`: List of instances to accept any activities from
+ * `report_removal`: List of instances to reject reports from
+ * `avatar_removal`: List of instances to strip avatars from
+ * `banner_removal`: List of instances to strip banners from
  
  ## :mrf_rejectnonpublic
  * `allow_followersonly`: whether to allow followers-only posts
@@@ -478,7 -481,7 +481,7 @@@ config :esshd
    password_authenticator: "Pleroma.BBS.Authenticator"
  ```
  
 -Feel free to adjust the priv_dir and port number. Then you will have to create the key for the keys (in the example `priv/ssh_keys`) and create the host keys with `ssh-keygen -N "" -b 2048 -t rsa -f ssh_host_rsa_key`. After restarting, you should be able to connect to your Pleroma instance with `ssh username@server -p $PORT`
 +Feel free to adjust the priv_dir and port number. Then you will have to create the key for the keys (in the example `priv/ssh_keys`) and create the host keys with `ssh-keygen -m PEM -N "" -b 2048 -t rsa -f ssh_host_rsa_key`. After restarting, you should be able to connect to your Pleroma instance with `ssh username@server -p $PORT`
  
  ## :auth