sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'config/fe-collapse-subject' into 'develop'

Browse Source 
fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289
This commit is contained in:
kaniini 2018-08-24 18:27:43 +00:00
commit 9ded0ee1a5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.exs
View File

@ -76,7 +76,8 @@
who_to_follow_provider: who_to_follow_provider:
"https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}", "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}", who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
scope_options_enabled: false scope_options_enabled: false,
collapse_message_with_subject: false
config :pleroma, :activitypub, config :pleroma, :activitypub,
accept_blocks: true, accept_blocks: true,

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

@ -175,7 +175,9 @@ def config(conn, _params) do
showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel), showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel),
scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled), scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider), whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider),
whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link) whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link),
collapseMessageWithSubject:
Keyword.get(@instance_fe, :collapse_message_with_subject)
} }
} }
}) })