X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Fcontrollers%2Futil_controller.ex;h=9ead0d6263a1b6078cf09a7d46d32f7dbb73c992;hb=4ead0d564fa60b1a908f6237474250d6bda85ae9;hp=537f9f778aa967b7618bf96e1eb7657002d8dc16;hpb=e999c67cee65cfe07de6dc76ad18f213c0252bb3;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 537f9f778..9ead0d626 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -11,28 +11,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   alias Pleroma.Emoji
   alias Pleroma.Healthcheck
   alias Pleroma.Notification
-  alias Pleroma.Plugs.OAuthScopesPlug
   alias Pleroma.User
-  alias Pleroma.Web
   alias Pleroma.Web.CommonAPI
+  alias Pleroma.Web.Plugs.OAuthScopesPlug
   alias Pleroma.Web.WebFinger
 
-  plug(Pleroma.Web.FederatingPlug when action == :remote_subscribe)
-
-  plug(
-    OAuthScopesPlug,
-    %{scopes: ["follow", "write:follows"]}
-    when action == :follow_import
-  )
-
-  # Note: follower can submit the form (with password auth) not being signed in (having no token)
-  plug(
-    OAuthScopesPlug,
-    %{fallback: :proceed_unauthenticated, scopes: ["follow", "write:follows"]}
-    when action == :do_remote_follow
-  )
-
-  plug(OAuthScopesPlug, %{scopes: ["follow", "write:blocks"]} when action == :blocks_import)
+  plug(Pleroma.Web.Plugs.FederatingPlug when action == :remote_subscribe)
 
   plug(
     OAuthScopesPlug,
@@ -48,12 +32,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
 
   plug(OAuthScopesPlug, %{scopes: ["write:notifications"]} when action == :notifications_read)
 
-  plug(Pleroma.Plugs.SetFormatPlug when action in [:config, :version])
-
-  def help_test(conn, _params) do
-    json(conn, "ok")
-  end
-
   def remote_subscribe(conn, %{"nickname" => nick, "profile" => _}) do
     with %User{} = user <- User.get_cached_by_nickname(nick),
          avatar = User.avatar_url(user) do
@@ -95,88 +73,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
     end
   end
 
-  def config(%{assigns: %{format: "xml"}} = conn, _params) do
-    instance = Pleroma.Config.get(:instance)
-
-    response = """
-    <config>
-    <site>
-    <name>#{Keyword.get(instance, :name)}</name>
-    <site>#{Web.base_url()}</site>
-    <textlimit>#{Keyword.get(instance, :limit)}</textlimit>
-    <closed>#{!Keyword.get(instance, :registrations_open)}</closed>
-    </site>
-    </config>
-    """
-
-    conn
-    |> put_resp_content_type("application/xml")
-    |> send_resp(200, response)
-  end
-
-  def config(conn, _params) do
-    instance = Pleroma.Config.get(:instance)
-
-    vapid_public_key = Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
-
-    uploadlimit = %{
-      uploadlimit: to_string(Keyword.get(instance, :upload_limit)),
-      avatarlimit: to_string(Keyword.get(instance, :avatar_upload_limit)),
-      backgroundlimit: to_string(Keyword.get(instance, :background_upload_limit)),
-      bannerlimit: to_string(Keyword.get(instance, :banner_upload_limit))
-    }
-
-    data = %{
-      name: Keyword.get(instance, :name),
-      description: Keyword.get(instance, :description),
-      server: Web.base_url(),
-      textlimit: to_string(Keyword.get(instance, :limit)),
-      uploadlimit: uploadlimit,
-      closed: bool_to_val(Keyword.get(instance, :registrations_open), "0", "1"),
-      private: bool_to_val(Keyword.get(instance, :public, true), "0", "1"),
-      vapidPublicKey: vapid_public_key,
-      accountActivationRequired:
-        bool_to_val(Keyword.get(instance, :account_activation_required, false)),
-      invitesEnabled: bool_to_val(Keyword.get(instance, :invites_enabled, false)),
-      safeDMMentionsEnabled: bool_to_val(Pleroma.Config.get([:instance, :safe_dm_mentions]))
-    }
-
-    managed_config = Keyword.get(instance, :managed_config)
-
-    data =
-      if managed_config do
-        pleroma_fe = Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
-        Map.put(data, "pleromafe", pleroma_fe)
-      else
-        data
-      end
-
-    json(conn, %{site: data})
-  end
-
-  defp bool_to_val(true), do: "1"
-  defp bool_to_val(_), do: "0"
-  defp bool_to_val(true, val, _), do: val
-  defp bool_to_val(_, _, val), do: val
-
   def frontend_configurations(conn, _params) do
-    config =
-      Pleroma.Config.get(:frontend_configurations, %{})
-      |> Enum.into(%{})
-
-    json(conn, config)
-  end
-
-  def version(%{assigns: %{format: "xml"}} = conn, _params) do
-    version = Pleroma.Application.named_version()
-
-    conn
-    |> put_resp_content_type("application/xml")
-    |> send_resp(200, "<version>#{version}</version>")
-  end
-
-  def version(conn, _params) do
-    json(conn, Pleroma.Application.named_version())
+    render(conn, "frontend_configurations.json")
   end
 
   def emoji(conn, _params) do
@@ -194,33 +92,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
     end
   end
 
-  def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do
-    follow_import(conn, %{"list" => File.read!(listfile.path)})
-  end
-
-  def follow_import(%{assigns: %{user: follower}} = conn, %{"list" => list}) do
-    with lines <- String.split(list, "\n"),
-         followed_identifiers <-
-           Enum.map(lines, fn line ->
-             String.split(line, ",") |> List.first()
-           end)
-           |> List.delete("Account address") do
-      User.follow_import(follower, followed_identifiers)
-      json(conn, "job started")
-    end
-  end
-
-  def blocks_import(conn, %{"list" => %Plug.Upload{} = listfile}) do
-    blocks_import(conn, %{"list" => File.read!(listfile.path)})
-  end
-
-  def blocks_import(%{assigns: %{user: blocker}} = conn, %{"list" => list}) do
-    with blocked_identifiers <- String.split(list) do
-      User.blocks_import(blocker, blocked_identifiers)
-      json(conn, "job started")
-    end
-  end
-
   def change_password(%{assigns: %{user: user}} = conn, params) do
     case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
       {:ok, user} ->