pleroma

commit: e4079abab8245c5b5a0987fbce9ab7cfd724f2d5
parent: 2e2f4587050da652fb0c4b8822d912301a8be273
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Sat,  1 Sep 2018 21:47:35 +0000

Merge branch 'feature/disable-config-management' into 'develop'

config: add ability to disable Pleroma FE config management (closes #276)

Closes #276

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

2 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -70,7 +70,8 @@ config :pleroma, :instance,
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
-  quarantined_instances: []
+  quarantined_instances: [],
+  managed_config: true
 
 config :pleroma, :fe,
   theme: "pleroma-dark",
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -156,30 +156,39 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
         |> send_resp(200, response)
 
       _ ->
-        json(conn, %{
-          site: %{
-            name: Keyword.get(@instance, :name),
-            description: Keyword.get(@instance, :description),
-            server: Web.base_url(),
-            textlimit: to_string(Keyword.get(@instance, :limit)),
-            closed: if(Keyword.get(@instance, :registrations_open), do: "0", else: "1"),
-            private: if(Keyword.get(@instance, :public, true), do: "0", else: "1"),
-            pleromafe: %{
-              theme: Keyword.get(@instance_fe, :theme),
-              background: Keyword.get(@instance_fe, :background),
-              logo: Keyword.get(@instance_fe, :logo),
-              logoMask: Keyword.get(@instance_fe, :logo_mask),
-              logoMargin: Keyword.get(@instance_fe, :logo_margin),
-              redirectRootNoLogin: Keyword.get(@instance_fe, :redirect_root_no_login),
-              redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
-              chatDisabled: !Keyword.get(@instance_chat, :enabled),
-              showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
-              scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
-              collapseMessageWithSubject:
-                Keyword.get(@instance_fe, :collapse_message_with_subject)
-            }
-          }
-        })
+        data = %{
+          name: Keyword.get(@instance, :name),
+          description: Keyword.get(@instance, :description),
+          server: Web.base_url(),
+          textlimit: to_string(Keyword.get(@instance, :limit)),
+          closed: if(Keyword.get(@instance, :registrations_open), do: "0", else: "1"),
+          private: if(Keyword.get(@instance, :public, true), do: "0", else: "1")
+        }
+
+        pleroma_fe = %{
+          theme: Keyword.get(@instance_fe, :theme),
+          background: Keyword.get(@instance_fe, :background),
+          logo: Keyword.get(@instance_fe, :logo),
+          logoMask: Keyword.get(@instance_fe, :logo_mask),
+          logoMargin: Keyword.get(@instance_fe, :logo_margin),
+          redirectRootNoLogin: Keyword.get(@instance_fe, :redirect_root_no_login),
+          redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
+          chatDisabled: !Keyword.get(@instance_chat, :enabled),
+          showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
+          scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
+          collapseMessageWithSubject: Keyword.get(@instance_fe, :collapse_message_with_subject)
+        }
+
+        managed_config = Keyword.get(@instance, :managed_config)
+
+        data =
+          if managed_config do
+            data |> Map.put("pleromafe", pleroma_fe)
+          else
+            data
+          end
+
+        json(conn, %{site: data})
     end
   end