diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-23 18:20:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-23 18:20:08 +0000 |
| commit | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (patch) | |
| tree | 7b4647efceeca5885f171bc94371d858a853f2f8 /config/description.exs | |
| parent | 472e7b796cfeb1445ee1572df414531655b050ce (diff) | |
| parent | 6b3d5ed6db6a3c73eb1f8373ebd670427aa8849d (diff) | |
| download | pleroma-fd48bd80eb7eab563c25586b1deba2ed42c02c5a.tar.gz pleroma-fd48bd80eb7eab563c25586b1deba2ed42c02c5a.zip | |
Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 65ea6bf01..5dc8dc364 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2256,6 +2256,14 @@ config :pleroma, :config_description, [ "Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download." <> " Currently only one manifest can be added (no arrays)", suggestions: ["https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"] + }, + %{ + key: :shared_pack_cache_seconds_per_file, + type: :integer, + descpiption: + "When an emoji pack is shared, the archive is created and cached in memory" <> + " for this amount of seconds multiplied by the number of files.", + suggestions: [60] } ] }, |