Merge remote-tracking branch 'upstream/develop' into restrict-origin

[akkoma] / lib / pleroma / web / twitter_api / controllers / util_controller.ex

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 76f4bb8f4243d9839d588701b7c035ac74837a89..70b0fbd546f32ddaeb62a3110b83c7d81d5dfd94 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -18,14 +18,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
 
   plug(Pleroma.Web.FederatingPlug when action == :remote_subscribe)
 
-  plug(
-    OAuthScopesPlug,
-    %{scopes: ["follow", "write:follows"]}
-    when action == :follow_import
-  )
-
-  plug(OAuthScopesPlug, %{scopes: ["follow", "write:blocks"]} when action == :blocks_import)
-
   plug(
     OAuthScopesPlug,
     %{scopes: ["write:accounts"]}
@@ -81,21 +73,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
     end
   end
 
-  # Deprecated in favor of `/nodeinfo`
-  # https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2327
-  # https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1084
-  def config(conn, _params) do
-    json(conn, %{
-      site: %{
-        textlimit: to_string(Config.get([:instance, :limit])),
-        vapidPublicKey: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
-      }
-    })
-  end
-
   def frontend_configurations(conn, _params) do
     config =
-      Pleroma.Config.get(:frontend_configurations, %{})
+      Config.get(:frontend_configurations, %{})
       |> Enum.into(%{})
 
     json(conn, config)
@@ -116,33 +96,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
-    followed_identifiers =
-      list
-      |> String.split("\n")
-      |> Enum.map(&(&1 |> String.split(",") |> List.first()))
-      |> List.delete("Account address")
-      |> Enum.map(&(&1 |> String.trim() |> String.trim_leading("@")))
-      |> Enum.reject(&(&1 == ""))
-
-    User.follow_import(follower, followed_identifiers)
-    json(conn, "job started")
-  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
-    blocked_identifiers = list |> String.split() |> Enum.map(&String.trim_leading(&1, "@"))
-    User.blocks_import(blocker, blocked_identifiers)
-    json(conn, "job started")
-  end
-
   def change_password(%{assigns: %{user: user}} = conn, params) do
     case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
       {:ok, user} ->