From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Tue, 8 Jan 2019 09:11:03 +0000 (+0700)
Subject: add default configuration for the pinned statuses and some doc
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6428ef77adef6aa3fca1fbcdcfffc5db5fc953d5;p=akkoma

add default configuration for the pinned statuses and some doc
---

diff --git a/docs/config.md b/docs/config.md
index 1c3219efe..c903b53bf 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -93,6 +93,7 @@ config :pleroma, Pleroma.Mailer,
 * `always_show_subject_input`: When set to false, auto-hide the subject field when it's empty.
 * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
     older software for theses nicknames.
+* `max_pinned_statuses`: The maximum number of pinned statuses. `0` will disable the feature.
 
 ## :fe
 This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:instance`` is set to false.
diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex
index 740b9f8d1..59c2c4fba 100644
--- a/lib/mix/tasks/pleroma/sample_config.eex
+++ b/lib/mix/tasks/pleroma/sample_config.eex
@@ -14,7 +14,8 @@ config :pleroma, :instance,
   email: "<%= email %>",
   limit: 5000,
   registrations_open: true,
-  dedupe_media: false
+  dedupe_media: false,
+  max_pinned_statuses: 1
 
 config :pleroma, :media_proxy,
   enabled: false,