Merge branch 'features/emoji_stealer' into 'develop'

MRF.StealEmojiPolicy: New Policy

See merge request pleroma/pleroma!2385
This commit is contained in:
lain 2020-05-21 13:31:49 +00:00
commit a42a0716ec
5 changed files with 171 additions and 0 deletions

View file

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