squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the emoji controller api more RESTy

Browse Source
This commit is contained in:
Ekaterina Vaartis 2019-09-11 21:50:55 +03:00
parent 3971bf9c5f
commit 6cd651a38b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/web/router.ex
View File

@ -220,17 +220,17 @@ defmodule Pleroma.Web.Router do
post("/import_from_fs", EmojiAPIController, :import_from_fs) post("/import_from_fs", EmojiAPIController, :import_from_fs)
post("/update_file/:pack_name", EmojiAPIController, :update_file) post("/:pack_name/update_file", EmojiAPIController, :update_file)
post("/update_metadata/:pack_name", EmojiAPIController, :update_metadata) post("/:pack_name/update_metadata", EmojiAPIController, :update_metadata)
post("/create/:name", EmojiAPIController, :create) put("/:name", EmojiAPIController, :create)
delete("/delete/:name", EmojiAPIController, :delete) delete("/:name", EmojiAPIController, :delete)
post("/download_from", EmojiAPIController, :download_from) post("/download_from", EmojiAPIController, :download_from)
end end
scope "/packs" do scope "/packs" do
# Pack info / downloading # Pack info / downloading
get("/", EmojiAPIController, :list_packs) get("/", EmojiAPIController, :list_packs)
get("/download_shared/:name", EmojiAPIController, :download_shared) get("/:name/download_shared/", EmojiAPIController, :download_shared)
end end
end end

2
test/web/emoji_api_controller_test.exs
View File

@ -343,7 +343,7 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest do
assert conn assert conn
|> put_req_header("content-type", "application/json") |> put_req_header("content-type", "application/json")
|> post( |> put(
emoji_api_path( emoji_api_path(
conn, conn,
:create, :create,