summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-26 17:59:45 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-26 17:59:45 +0400
commit94a6590e3cb9d5c340bfd589880c19717160706f (patch)
tree612bf103b655beba97d5c4a5c65900e7fe4930dd
parent1c3f3a12edcdd4f11433e9ed5422b381afd3c5c4 (diff)
downloadpleroma-94a6590e3cb9d5c340bfd589880c19717160706f.tar.gz
pleroma-94a6590e3cb9d5c340bfd589880c19717160706f.zip
Partially restore `/api/statusnet/config.json`
-rw-r--r--lib/pleroma/web/router.ex3
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex12
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index c3ea7b626..322b074c2 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -482,6 +482,9 @@ defmodule Pleroma.Web.Router do
pipe_through(:config)
get("/pleroma/frontend_configurations", TwitterAPI.UtilController, :frontend_configurations)
+
+ # Deprecated
+ get("/statusnet/config", TwitterAPI.UtilController, :config)
end
scope "/api", Pleroma.Web do
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index bb08f5426..2fc60da5a 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -88,6 +88,18 @@ 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, %{})