config: make instance description configurable

diff --git a/config/config.exs b/config/config.exs
index 0616fe4fb19d48a5ad288749c42af5a0fb64e49e..51b953a94b826300bb75d01b3b7e2e8a73e02e5b 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -52,6 +52,7 @@ config :pleroma, :instance,
   version: version,
   name: "Pleroma",
   email: "example@example.com",
+  description: "A Pleroma instance, an alternative fediverse server",
   limit: 5000,
   upload_limit: 16_000_000,
   registrations_open: true,

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 09e6b0b59ce22db8518a05a3eafbd0dd7e41c2d5..f521960c259f72c30046f5634a6e2ba08d655f34 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -125,7 +125,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     response = %{
       uri: Web.base_url(),
       title: Keyword.get(@instance, :name),
-      description: "A Pleroma instance, an alternative fediverse server",
+      description: Keyword.get(@instance, :description),
       version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})",
       email: Keyword.get(@instance, :email),
       urls: %{

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 12aca4a10d12634c28467a3fbef7522825045b0d..7c67bbf1c6f237c1107b6898edf7279716e9d589 100644 (file)
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -43,7 +43,9 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
       },
       metadata: %{
         nodeName: Keyword.get(instance, :name),
-        mediaProxy: Keyword.get(media_proxy, :enabled)
+        nodeDescription: Keyword.get(instance, :description),
+        mediaProxy: Keyword.get(media_proxy, :enabled),
+        private: !Keyword.get(instance, :public, true)
       }
     }