summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorrinpatch <rin@patch.cx>2021-03-19 08:48:22 +0000
committerrinpatch <rin@patch.cx>2021-03-19 08:48:22 +0000
commitf930e83fa2a7e2184ca6bd09773d81568e7c755c (patch)
tree2b2323d9f5f26dee318a7586fa0ecafa907fc0ca /docs
parent67bde35e710e7c3c800364b4ab94a3fd81833ffa (diff)
parent3bc7d122712b5cc35ba509542bde63ca130d6a40 (diff)
downloadpleroma-f930e83fa2a7e2184ca6bd09773d81568e7c755c.tar.gz
pleroma-f930e83fa2a7e2184ca6bd09773d81568e7c755c.zip
Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration/cheatsheet.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index d085f0f44..8f2c4347e 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -210,6 +210,16 @@ config :pleroma, :mrf_user_allowlist, %{
* `days`: Default global expiration time for all local Create activities (in days)
+#### :mrf_hashtag
+
+* `sensitive`: List of hashtags to mark activities as sensitive (default: `nsfw`)
+* `federated_timeline_removal`: List of hashtags to remove activities from the federated timeline (aka TWNK)
+* `reject`: List of hashtags to reject activities from
+
+Notes:
+- The hashtags in the configuration do not have a leading `#`.
+- This MRF Policy is always enabled, if you want to disable it you have to set empty lists
+
### :activitypub
* `unfollow_blocked`: Whether blocks result in people getting unfollowed
* `outgoing_blocks`: Whether to federate blocks to other instances