aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEkaterina Vaartis <vaartis@cock.li>2019-09-11 21:50:55 +0300
committerEkaterina Vaartis <vaartis@cock.li>2019-09-19 00:16:33 +0300
commit6cd651a38be898456c06d8fee7fd15f1b406848c (patch)
tree00afd967f2f8b0cdaa8ff74118595c136a0cc134
parent3971bf9c5f00d12a0a2048eb3676069d58a9f243 (diff)
downloadpleroma-6cd651a38be898456c06d8fee7fd15f1b406848c.tar.gz
Make the emoji controller api more RESTy
-rw-r--r--lib/pleroma/web/router.ex10
-rw-r--r--test/web/emoji_api_controller_test.exs2
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 17f7406fd..bae25c60a 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -220,17 +220,17 @@ defmodule Pleroma.Web.Router do
post("/import_from_fs", EmojiAPIController, :import_from_fs)
- post("/update_file/:pack_name", EmojiAPIController, :update_file)
- post("/update_metadata/:pack_name", EmojiAPIController, :update_metadata)
- post("/create/:name", EmojiAPIController, :create)
- delete("/delete/:name", EmojiAPIController, :delete)
+ post("/:pack_name/update_file", EmojiAPIController, :update_file)
+ post("/:pack_name/update_metadata", EmojiAPIController, :update_metadata)
+ put("/:name", EmojiAPIController, :create)
+ delete("/:name", EmojiAPIController, :delete)
post("/download_from", EmojiAPIController, :download_from)
end
scope "/packs" do
# Pack info / downloading
get("/", EmojiAPIController, :list_packs)
- get("/download_shared/:name", EmojiAPIController, :download_shared)
+ get("/:name/download_shared/", EmojiAPIController, :download_shared)
end
end
diff --git a/test/web/emoji_api_controller_test.exs b/test/web/emoji_api_controller_test.exs
index 7942a7b01..e92e92f74 100644
--- a/test/web/emoji_api_controller_test.exs
+++ b/test/web/emoji_api_controller_test.exs
@@ -343,7 +343,7 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest do
assert conn
|> put_req_header("content-type", "application/json")
- |> post(
+ |> put(
emoji_api_path(
conn,
:create,