pleroma

commit: 2999a08e3590c43c623730b0cbf6b93045ac08c1
parent: 37bd32e58b4c7b5005b05138d6bbe832dd171095
Author: scarlett <nia@netbsd.org>
Date:   Mon, 10 Dec 2018 23:32:29 +0000

Merge branch 'new-fe-options' into 'develop'

Add new frontend options to server-side config.

See merge request pleroma/pleroma!535
Diffstat:
M
config/config.exs
5
++++-
M
config/config.md
6
++++++
M
lib/pleroma/web/twitter_api/controllers/util_controller.ex
5
++++-

3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -126,7 +126,10 @@ config :pleroma, :fe,
   formatting_options_enabled: false,
   collapse_message_with_subject: false,
   hide_post_stats: false,
-  hide_user_stats: false
+  hide_user_stats: false,
+  scope_copy: true,
+  subject_line_behavior: "email",
+  always_show_subject_input: true
 
 config :pleroma, :activitypub,
   accept_blocks: true,
diff --git a/config/config.md b/config/config.md
@@ -57,6 +57,12 @@ This filter replaces the filename (not the path) of an upload. For complete obfu
 * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML)
 * `finmoji_enabled`: Whenether to enable the finmojis in the custom emojis.
 * `mrf_transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
+* `scope_copy`: Copy the scope (private/unlisted/public) in replies to posts by default.
+* `subject_line_behavior`: Allows changing the default behaviour of subject lines in replies. Valid values:
+  * "email": Copy and preprend re:, as in email.
+  * "masto": Copy verbatim, as in Mastodon.
+  * "noop": Don't copy the subject.
+* `always_show_subject_input`: When set to false, auto-hide the subject field when it's empty.
 
 ## :fe
 This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:instance`` is set to false.
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -183,7 +183,10 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
           formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled),
           collapseMessageWithSubject: Keyword.get(instance_fe, :collapse_message_with_subject),
           hidePostStats: Keyword.get(instance_fe, :hide_post_stats),
-          hideUserStats: Keyword.get(instance_fe, :hide_user_stats)
+          hideUserStats: Keyword.get(instance_fe, :hide_user_stats),
+          scopeCopy: Keyword.get(instance_fe, :scope_copy),
+          subjectLineBehavior: Keyword.get(instance_fe, :subject_line_behavior),
+          alwaysShowSubjectInput: Keyword.get(instance_fe, :always_show_subject_input)
         }
 
         managed_config = Keyword.get(instance, :managed_config)