hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Emoji.Pack: Implement empty name and directory creation failure handling

Browse source
This commit is contained in:
Lain Soykaf 2025-08-08 15:44:30 +04:00
commit 80e0f07240
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/emoji/pack.ex
View file

@ -230,15 +230,23 @@ defmodule Pleroma.Emoji.Pack do
:ok <- validate_new_pack(name), :ok <- validate_new_pack(name),
{:ok, archive_data} <- fetch_archive_data(opts), {:ok, archive_data} <- fetch_archive_data(opts),
pack_path <- path_join_name_safe(emoji_path(), name), pack_path <- path_join_name_safe(emoji_path(), name),
:ok <- File.mkdir_p(pack_path), :ok <- create_pack_dir(pack_path),
:ok <- safe_unzip(archive_data, pack_path) do :ok <- safe_unzip(archive_data, pack_path) do
ensure_pack_json(pack_path, archive_data, opts) ensure_pack_json(pack_path, archive_data, opts)
else else
{:error, :empty_values} -> {:error, "Pack name cannot be empty"}
{:error, reason} when is_binary(reason) -> {:error, reason} {:error, reason} when is_binary(reason) -> {:error, reason}
_ -> {:error, "Could not process pack"} _ -> {:error, "Could not process pack"}
end end
end end
defp create_pack_dir(pack_path) do
case File.mkdir_p(pack_path) do
:ok -> :ok
{:error, _} -> {:error, "Could not create the pack directory"}
end
end
defp safe_unzip(archive_data, pack_path) do defp safe_unzip(archive_data, pack_path) do
case SafeZip.unzip_data(archive_data, pack_path) do case SafeZip.unzip_data(archive_data, pack_path) do
{:ok, _} -> :ok {:ok, _} -> :ok