moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new frontend options to server-side config.

This commit is contained in:
scarlett 2018-12-10 23:15:01 +00:00
parent 37bd32e58b
commit 213176c3c3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.exs
View File

@ -126,7 +126,10 @@
formatting_options_enabled: false, formatting_options_enabled: false,
collapse_message_with_subject: false, collapse_message_with_subject: false,
hide_post_stats: 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, config :pleroma, :activitypub,
accept_blocks: true, accept_blocks: true,

5
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View File

@ -183,7 +183,10 @@ def config(conn, _params) do
formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled), formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled),
collapseMessageWithSubject: Keyword.get(instance_fe, :collapse_message_with_subject), collapseMessageWithSubject: Keyword.get(instance_fe, :collapse_message_with_subject),
hidePostStats: Keyword.get(instance_fe, :hide_post_stats), 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) managed_config = Keyword.get(instance, :managed_config)