squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests 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 16:00:48 +00:00 committed by Ekaterina Vaartis
parent 8f509e6d1e
commit cb125ffaf7
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/pleroma/web/emoji_api/emoji_api_controller.ex
View File

@ -124,26 +124,22 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
pack_dir = Path.join(@emoji_dir_path, name) pack_dir = Path.join(@emoji_dir_path, name)
pack_file = Path.join(pack_dir, "pack.json") pack_file = Path.join(pack_dir, "pack.json")
if File.exists?(pack_file) do with {_, true} <- {:exists?, File.exists?(pack_file)},
pack = Jason.decode!(File.read!(pack_file)) pack = Jason.decode!(File.read!(pack_file)),
{_, true} <- {:can_download?, can_download?(pack, pack_dir)} do
if can_download?(pack, pack_dir) do zip_result = make_archive(name, pack, pack_dir)
zip_result = make_archive(name, pack, pack_dir) send_download(conn, {:binary, zip_result}, filename: "#{name}.zip")
conn
|> send_download({:binary, zip_result}, filename: "#{name}.zip")
else
{:error,
conn
|> put_status(:forbidden)
|> text("Pack #{name} cannot be downloaded from this instance, either pack sharing\
was disabled for this pack or some files are missing")}
end
else else
{:error, {:can_download?, _} ->
conn conn
|> put_status(:not_found) |> put_status(:forbidden)
|> text("Pack #{name} does not exist")} |> text("Pack #{name} cannot be downloaded from this instance, either pack sharing\
was disabled for this pack or some files are missing")
{:exists?, _} ->
conn
|> put_status(:not_found)
|> text("Pack #{name} does not exist")
end end
end end