nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex

Browse source
This commit is contained in:
vaartis 2019-09-11 09:07:19 +00:00 committed by Ekaterina Vaartis
parent f6d4acc871
commit 163082de6f
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/pleroma/web/emoji_api/emoji_api_controller.ex
View file

@ -104,24 +104,16 @@ defp make_archive(name, pack, pack_dir) do
# 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)
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
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
maybe_cached_pack[:pack_data]
else
_ ->
create_archive_and_cache(name, pack, pack_dir, pack_file_md5)
end
end
zip_result
end
@doc """
An endpoint for other instances (via admin UI) or users (via browser)
to download packs that the instance shares.