diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2019-05-22 05:55:09 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2019-05-22 18:53:30 +0000 |
| commit | 7d9b33b3cebeed451210f754a8c34cc14a9e969b (patch) | |
| tree | d797e8fb39e0423df00f0af6a8bcea303c3fb3ef | |
| parent | 8086c7aed6cdc3b2ac1c09c6c40344e47be08ed9 (diff) | |
| download | pleroma-7d9b33b3cebeed451210f754a8c34cc14a9e969b.tar.gz pleroma-7d9b33b3cebeed451210f754a8c34cc14a9e969b.zip | |
update documentation for the new MRF features [no-ci]
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | docs/config.md | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 02d64a850..2a2b11ddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - 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 --git a/docs/config.md b/docs/config.md index 264b65499..1d1d24c32 100644 --- a/docs/config.md +++ b/docs/config.md @@ -220,6 +220,9 @@ relates to mascots on the mastodon frontend * `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 |