moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop

This commit is contained in:
Roger Braun 2017-04-17 11:37:21 +02:00
parent 6bfd521974 9a8f05e96d
commit a185ea63af
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,8 @@ def user_fetcher(username) do
scope "/api", Pleroma.Web do scope "/api", Pleroma.Web do
pipe_through :api pipe_through :api
get "/help/test", TwitterAPI.Controller, :help_test
get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status

4
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View File

@ -85,6 +85,10 @@ def upload(conn, %{"media" => media}) do
|> send_resp(200, response) |> send_resp(200, response)
end end
def help_test(conn, _params) do
conn |> json_reply(200, Poison.encode!("ok"))
end
def upload_json(conn, %{"media" => media}) do def upload_json(conn, %{"media" => media}) do
response = TwitterAPI.upload(media, "json") response = TwitterAPI.upload(media, "json")
conn conn

6
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -157,6 +157,12 @@ test "with credentials", %{conn: conn, user: current_user} do
end end
end end
describe "GET /help/test.json" do
test "returns \"ok\"", %{conn: conn} do
conn = get conn, "/api/help/test.json"
assert json_response(conn, 200) == "ok"
end
describe "POST /api/qvitter/update_avatar.json" do describe "POST /api/qvitter/update_avatar.json" do
setup [:valid_user] setup [:valid_user]
test "without valid credentials", %{conn: conn} do test "without valid credentials", %{conn: conn} do