diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-04-16 10:25:38 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-04-16 10:25:38 -0400 |
| commit | 9a8f05e96dd42e820a849b98e0fa7bc019290207 (patch) | |
| tree | aa545ad989ae70367aff25e1dfe970f28e88e55a /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | e158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff) | |
| parent | 85bd480be333896ca9cc0ade0e68ea99e10aaaa7 (diff) | |
| download | pleroma-9a8f05e96dd42e820a849b98e0fa7bc019290207.tar.gz | |
Merge branch 'feature/help-test' into 'develop'
Add help/test resource
See merge request !3
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
1 files changed, 4 insertions, 0 deletions
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 |