From: Hakaba Hitoyo <hakabahitoyo@example.com>
Date: Thu, 19 Jul 2018 08:42:00 +0000 (+0900)
Subject: merge
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=cc9c062b553e20018e406dc605e6e504ad3134a6;p=akkoma

merge
---

cc9c062b553e20018e406dc605e6e504ad3134a6
diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 42d322f89,7c67bbf1c..f9a6d9c25
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@@ -44,12 -43,9 +44,14 @@@ defmodule Pleroma.Web.Nodeinfo.Nodeinfo
        },
        metadata: %{
          nodeName: Keyword.get(instance, :name),
+         nodeDescription: Keyword.get(instance, :description),
          mediaProxy: Keyword.get(media_proxy, :enabled),
 -        private: !Keyword.get(instance, :public, true)
++        private: !Keyword.get(instance, :public, true),
 +        suggestions: %{
 +          enabled: Keyword.get(suggestions, :enabled, false),
 +          thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""),
 +          timeout: Keyword.get(suggestions, :timeout, 5000)
 +        }
        }
      }