Merge remote-tracking branch 'upstream/develop' into aliases

[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..f02c4075c404b320c73ae694bc38e865f421af3a 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -81,21 +81,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)