diff options
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 18 | ||||
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 20 |
2 files changed, 19 insertions, 19 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex new file mode 100644 index 000000000..6d6fd2202 --- /dev/null +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -0,0 +1,18 @@ +defmodule Pleroma.Web.TwitterAPI.UtilController do + use Pleroma.Web, :controller + alias Pleroma.Web + + def help_test(conn, _params) do + json(conn, "ok") + end + + def config(conn, _params) do + json(conn, %{ + site: %{ + name: Web.base_url, + server: Web.base_url, + textlimit: -1 + } + }) + end +end diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index c3ab5ae8c..56b2f7cfa 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -2,7 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView} alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter - alias Pleroma.{Web, Repo, Activity} + alias Pleroma.{Repo, Activity} alias Pleroma.Web.ActivityPub.ActivityPub alias Ecto.Changeset @@ -122,30 +122,12 @@ 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 |> json_reply(200, response) end - def config(conn, _params) do - response = %{ - site: %{ - name: Web.base_url, - server: Web.base_url, - textlimit: -1 - } - } - |> Poison.encode! - - conn - |> json_reply(200, response) - end - def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do activity = Repo.get(Activity, id) {:ok, status} = TwitterAPI.favorite(user, activity) |