diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-04-17 11:37:21 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-04-17 11:37:21 +0200 |
| commit | a185ea63af8ae00800763bd3ac0d3e6cf6548311 (patch) | |
| tree | 34bea6a0a5be7bfd35eed9758d75c729af629a29 /lib | |
| parent | 6bfd521974ea30a044874dbc6dd6f422925d0055 (diff) | |
| parent | 9a8f05e96dd42e820a849b98e0fa7bc019290207 (diff) | |
| download | pleroma-a185ea63af8ae00800763bd3ac0d3e6cf6548311.tar.gz | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 2d7c25b50..0446f622b 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -21,6 +21,8 @@ defmodule Pleroma.Web.Router do scope "/api", Pleroma.Web do pipe_through :api + + get "/help/test", TwitterAPI.Controller, :help_test get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index b0287a7f4..6014aedc4 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -85,6 +85,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do |> send_resp(200, response) end + def help_test(conn, _params) do + conn |> json_reply(200, Poison.encode!("ok")) + end + def upload_json(conn, %{"media" => media}) do response = TwitterAPI.upload(media, "json") conn |