pleroma

commit: bcae57afd2f932db4b3c4ee28428ed101f0fec1f
parent: aaf3fc1575badd13ccbce267895492fa0b708bbb
Author: kaniini <nenolod@gmail.com>
Date:   Tue, 23 Oct 2018 00:50:28 +0000

Merge branch 'new-frontend-options' into 'develop'

New frontend options

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

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -121,7 +121,9 @@ config :pleroma, :fe,
   show_instance_panel: true,
   scope_options_enabled: false,
   formatting_options_enabled: false,
-  collapse_message_with_subject: false
+  collapse_message_with_subject: false,
+  hide_post_stats: false,
+  hide_user_stats: 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
@@ -177,7 +177,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
           showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
           scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_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),
+          hideUserStats: Keyword.get(@instance_fe, :hide_user_stats)
         }
 
         managed_config = Keyword.get(@instance, :managed_config)