hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/remove_auto_nsfw' into 'develop'

Browse source 
Remove sensitive setting #nsfw

See merge request pleroma/pleroma!3223
This commit is contained in:
rinpatch 2021-03-19 08:48:22 +00:00
commit f930e83fa2
15 changed files with 187 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docs/configuration/cheatsheet.md
View file

@ -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