diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/swagger.yaml | 4 | ||||
| -rw-r--r-- | docs/configuration/media.md | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/docs/api/swagger.yaml b/docs/api/swagger.yaml index 7ae1f5b54..ebcf14c02 100644 --- a/docs/api/swagger.yaml +++ b/docs/api/swagger.yaml @@ -2724,7 +2724,9 @@ paths: pattern: \w{2,30} required: true type: string - - description: A png or gif image of the emoji. Animated pngs work too! + - description: |- + A png or gif image of the emoji. Animated pngs work too! + To ensure compatibility with other fedi implementations, emoji size limit is 50kb by default. in: formData name: image required: true diff --git a/docs/configuration/media.md b/docs/configuration/media.md index 4adb3bedf..880a2bc95 100644 --- a/docs/configuration/media.md +++ b/docs/configuration/media.md @@ -39,4 +39,20 @@ media-description-max-chars: 500 # Examples: [30, 60, 7, 0] # Default: 30 media-remote-cache-days: 30 + +# Int. Max size in bytes of emojis uploaded to this instance via the admin API. +# The default is the same as the Mastodon size limit for emojis (50kb), which allows +# for good interoperability. Raising this limit may cause issues with federation +# of your emojis to other instances, so beware. +# Examples: [51200, 102400] +# Default: 51200 +media-emoji-local-max-size: 51200 + +# Int. Max size in bytes of emojis to download from other instances. +# By default this is 100kb, or twice the size of the default for media-emoji-local-max-size. +# This strikes a good balance between decent interoperability with instances that have +# higher emoji size limits, and not taking up too much space in storage. +# Examples: [51200, 102400] +# Default: 51200 +media-emoji-remote-max-size: 102400 ``` |