pleroma

commit: 9ded0ee1a5ac5b60dfca983fee3875690336fa70
parent: cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6
Author: kaniini <nenolod@gmail.com>
Date:   Fri, 24 Aug 2018 18:27:43 +0000

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

fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289
Diffstat:
M
config/config.exs
3
++-
M
lib/pleroma/web/twitter_api/controllers/util_controller.ex
4
+++-

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -76,7 +76,8 @@ config :pleroma, :fe,
   who_to_follow_provider:
     "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{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,
   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
@@ -175,7 +175,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
               showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel),
               scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
               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)
             }
           }
         })