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

3 files changed, 12 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
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index f9723dd9f..6c48b5597 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -157,6 +157,12 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     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
     setup [:valid_user]
     test "without valid credentials", %{conn: conn} do