From: dtluna <dtluna@openmailbox.org>
Date: Thu, 13 Apr 2017 12:15:09 +0000 (+0300)
Subject: Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=84c20128100ad5b074720c44a24375b809a0ce09;p=akkoma

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
---

84c20128100ad5b074720c44a24375b809a0ce09
diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 8163897e7,3f299a941..766da6c93
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@@ -83,10 -83,20 +83,24 @@@ defmodule Pleroma.Web.TwitterAPI.Contro
      |> send_resp(200, response)
    end
  
-   def help_test(conn, _) do
++  def help_test(conn, _params) do
 +    conn |> json_reply(200, Poison.encode!("ok"))
 +  end
 +
+   def config(conn, _params) do
+     response = %{
+       site: %{
+         name: Pleroma.Web.base_url,
+         server: Pleroma.Web.base_url,
+         textlimit: -1
+       }
+     }
+     |> Poison.encode!
+ 
+     conn
+     |> json_reply(200, response)
+   end
+ 
    defp json_reply(conn, status, json) do
      conn
      |> put_resp_content_type("application/json")