diff options
author | lain <lain@soykaf.club> | 2020-05-21 15:35:13 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-21 15:35:13 +0200 |
commit | 578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff (patch) | |
tree | 9eb3e3d2a5731378567a940321100efcb3f1bd7c /docs/configuration/cheatsheet.md | |
parent | c4a5cead51770f0d54cb77805b7e2bd705f251d9 (diff) | |
parent | a42a0716ec769dfbd97505b6c872c5ea1a8f800a (diff) | |
download | pleroma-578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r-- | docs/configuration/cheatsheet.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 9af8ee95a..e8def466e 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -149,6 +149,11 @@ config :pleroma, :mrf_user_allowlist, * `:strip_followers` removes followers from the ActivityPub recipient list, ensuring they won't be delivered to home timelines * `:reject` rejects the message entirely +#### mrf_steal_emoji +* `hosts`: List of hosts to steal emojis from +* `rejected_shortcodes`: Regex-list of shortcodes to reject +* `size_limit`: File size limit (in bytes), checked before an emoji is saved to the disk + ### :activitypub * `unfollow_blocked`: Whether blocks result in people getting unfollowed * `outgoing_blocks`: Whether to federate blocks to other instances |