diff options
author | lain <lain@soykaf.club> | 2020-05-21 13:31:49 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-21 13:31:49 +0000 |
commit | a42a0716ec769dfbd97505b6c872c5ea1a8f800a (patch) | |
tree | b8275897e5271aedc8ba54fa95952eb778d12d83 /docs/configuration/cheatsheet.md | |
parent | f166316f507ed2ac165e230fcab0463afa9503bf (diff) | |
parent | e688d4ee69dfbda0f8fd3a5544720a566b3946c5 (diff) | |
download | pleroma-a42a0716ec769dfbd97505b6c872c5ea1a8f800a.tar.gz pleroma-a42a0716ec769dfbd97505b6c872c5ea1a8f800a.zip |
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
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 |