Add an endpoint for deleting emoji packs
This commit is contained in:
parent
3a8669b487
commit
2d4b8f3d20
|
@ -210,4 +210,16 @@ def download_from(conn, %{"instance_address" => address, "pack_name" => name} =
|
||||||
conn |> put_status(:internal_server_error) |> text(e)
|
conn |> put_status(:internal_server_error) |> text(e)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def delete(conn, %{"name" => name}) do
|
||||||
|
pack_dir = Path.join(@emoji_dir_path, name)
|
||||||
|
|
||||||
|
case File.rm_rf(pack_dir) do
|
||||||
|
{:ok, _} ->
|
||||||
|
conn |> text("ok")
|
||||||
|
|
||||||
|
{:error, _} ->
|
||||||
|
conn |> put_status(:internal_server_error) |> text("Couldn't delete the pack #{name}")
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -218,6 +218,7 @@ defmodule Pleroma.Web.Router do
|
||||||
# Modifying packs
|
# Modifying packs
|
||||||
pipe_through([:admin_api, :oauth_write])
|
pipe_through([:admin_api, :oauth_write])
|
||||||
|
|
||||||
|
delete("/delete/:name", EmojiAPIController, :delete)
|
||||||
post("/download_from", EmojiAPIController, :download_from)
|
post("/download_from", EmojiAPIController, :download_from)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ test "downloading a shared pack from download_shared" do
|
||||||
assert Enum.find(arch, fn {n, _} -> n == 'blank.png' end)
|
assert Enum.find(arch, fn {n, _} -> n == 'blank.png' end)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "downloading a shared pack from another instance via download_from" do
|
test "downloading a shared pack from another instance via download_from, deleting it" do
|
||||||
on_exit(fn ->
|
on_exit(fn ->
|
||||||
File.rm_rf!("test/instance_static/emoji/test_pack2")
|
File.rm_rf!("test/instance_static/emoji/test_pack2")
|
||||||
end)
|
end)
|
||||||
|
@ -94,5 +94,12 @@ test "downloading a shared pack from another instance via download_from" do
|
||||||
|
|
||||||
assert File.exists?("test/instance_static/emoji/test_pack2/pack.yml")
|
assert File.exists?("test/instance_static/emoji/test_pack2/pack.yml")
|
||||||
assert File.exists?("test/instance_static/emoji/test_pack2/blank.png")
|
assert File.exists?("test/instance_static/emoji/test_pack2/blank.png")
|
||||||
|
|
||||||
|
assert conn
|
||||||
|
|> assign(:user, admin)
|
||||||
|
|> delete(emoji_api_path(conn, :delete, "test_pack2"))
|
||||||
|
|> response(200) == "ok"
|
||||||
|
|
||||||
|
refute File.exists?("test/instance_static/emoji/test_pack2")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue