Merge branch 'reserve-user-names' into 'develop'

Reserve a few user names See merge request pleroma/pleroma!594
2018-12-27 19:35:06 +00:00 · 2018-12-27 19:35:06 +00:00 · cff0292d4b
commit cff0292d4b
parent 02866a42af 1dd71026a1
5 changed files with 61 additions and 3 deletions
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@ -138,7 +138,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
        },
        accountActivationRequired: Keyword.get(instance, :account_activation_required, false),
        invitesEnabled: Keyword.get(instance, :invites_enabled, false),
-        features: features
+        features: features,
+        restrictedNicknames: Pleroma.Config.get([Pleroma.User, :restricted_nicknames])
      }
    }