aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvaartis <vaartis@cock.li>2019-09-11 09:07:19 +0000
committerEkaterina Vaartis <vaartis@cock.li>2019-09-19 00:16:33 +0300
commit163082de6f789044b4fcb0c69f5b4cfd89731903 (patch)
tree04c639c79129b51231a49246db0dce51a92fe576
parentf6d4acc87181c94fa202ff5673f741ae9cb45b14 (diff)
downloadpleroma-163082de6f789044b4fcb0c69f5b4cfd89731903.tar.gz
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
-rw-r--r--lib/pleroma/web/emoji_api/emoji_api_controller.ex20
1 files changed, 6 insertions, 14 deletions
diff --git a/lib/pleroma/web/emoji_api/emoji_api_controller.ex b/lib/pleroma/web/emoji_api/emoji_api_controller.ex
index cbd237519..499802fa5 100644
--- a/lib/pleroma/web/emoji_api/emoji_api_controller.ex
+++ b/lib/pleroma/web/emoji_api/emoji_api_controller.ex
@@ -104,22 +104,14 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
# Having a different pack.json md5 invalidates cache
pack_file_md5 = :crypto.hash(:md5, File.read!(Path.join(pack_dir, "pack.json")))
- maybe_cached_pack = Cachex.get!(:emoji_packs_cache, name)
+ case Cachex.get!(:emoji_packs_cache, name) do
+ %{pack_file_md5: ^pack_file_md5, pack_data: zip_result} ->
+ Logger.debug("Using cache for the '#{name}' shared emoji pack")
+ zip_result
- zip_result =
- if is_nil(maybe_cached_pack) do
+ _ ->
create_archive_and_cache(name, pack, pack_dir, pack_file_md5)
- else
- if maybe_cached_pack[:pack_file_md5] == pack_file_md5 do
- Logger.debug("Using cache for the '#{name}' shared emoji pack")
-
- maybe_cached_pack[:pack_data]
- else
- create_archive_and_cache(name, pack, pack_dir, pack_file_md5)
- end
- end
-
- zip_result
+ end
end
@doc """