Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223
This commit is contained in:
commit
f930e83fa2
15 changed files with 187 additions and 62 deletions
|
|
@ -391,6 +391,11 @@ config :pleroma, :mrf_keyword,
|
|||
federated_timeline_removal: [],
|
||||
replace: []
|
||||
|
||||
config :pleroma, :mrf_hashtag,
|
||||
sensitive: ["nsfw"],
|
||||
reject: [],
|
||||
federated_timeline_removal: []
|
||||
|
||||
config :pleroma, :mrf_subchain, match_actor: %{}
|
||||
|
||||
config :pleroma, :mrf_activity_expiration, days: 365
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue