aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscarlett <nia@netbsd.org>2018-12-10 23:15:01 +0000
committerscarlett <nia@netbsd.org>2018-12-10 23:15:01 +0000
commit213176c3c33088794ec2557fe54b10481ed603ed (patch)
tree75a344b052907142e6d992c6b410377156aec22f
parent37bd32e58b4c7b5005b05138d6bbe832dd171095 (diff)
downloadpleroma-213176c3c33088794ec2557fe54b10481ed603ed.tar.gz
Add new frontend options to server-side config.
-rw-r--r--config/config.exs5
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex5
2 files changed, 8 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 8d2fdd40d..1401b0a3d 100644
--- 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/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 0ed519ea6..b1e4c77e8 100644
--- 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)