aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-09-24 13:00:48 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-24 13:00:48 +0300
commit5e9759cd7d0730c14bcc44e9b3dbda94947d602f (patch)
tree5917d89cad99d14a246e33f3e8ebd56e70abe20b /lib/pleroma/application.ex
parent79c3443b609663ab23a4353ebdb7e5e2f0e6a150 (diff)
parent29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff)
downloadpleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.tar.gz
Merge branch 'develop' into feature/return-link-for-password-reset
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index dabce771d..a339e2c48 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -102,10 +102,14 @@ defmodule Pleroma.Application do
build_cachex("rich_media", default_ttl: :timer.minutes(120), limit: 5000),
build_cachex("scrubber", limit: 2500),
build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500),
- build_cachex("web_resp", limit: 2500)
+ build_cachex("web_resp", limit: 2500),
+ build_cachex("emoji_packs", expiration: emoji_packs_expiration(), limit: 10)
]
end
+ defp emoji_packs_expiration,
+ do: expiration(default: :timer.seconds(5 * 60), interval: :timer.seconds(60))
+
defp idempotency_expiration,
do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))