From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 24 Aug 2018 18:03:41 +0000 (+0000)
Subject: fe config: add collapse_message_with_subject fe option
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=09cb40220336f464e63ad4f56370c284028ccc94;p=akkoma

fe config: add collapse_message_with_subject fe option
---

diff --git a/config/config.exs b/config/config.exs
index 839e6bde6..08d2381b2 100644
--- 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
index 24ebdf007..7dbac620e 100644
--- 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)
             }
           }
         })