From: scarlett Date: Mon, 10 Dec 2018 23:15:01 +0000 (+0000) Subject: Add new frontend options to server-side config. X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=213176c3c33088794ec2557fe54b10481ed603ed;p=akkoma Add new frontend options to server-side config. --- 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)