extend reject MRF to check if originating instance is blocked

[akkoma] / lib / pleroma / config / holder.ex

diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index d4fe892af73c36becca3658d27149574d1384b8d..d6bf948ae7c952b6221e0d5ce1ec1d7a12a7561b 100644 (file)
--- a/lib/pleroma/config/holder.ex
+++ b/lib/pleroma/config/holder.ex
@@ -1,16 +1,42 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.Holder do
-  @config Pleroma.Config.Loader.load_and_merge()
+  @config Pleroma.Config.Loader.default_config()
 
-  @spec config() :: keyword()
-  def config, do: @config
+  @spec save_default() :: :ok
+  def save_default do
+    default_config =
+      if System.get_env("RELEASE_NAME") do
+        Pleroma.Config.Loader.merge(@config, release_defaults())
+      else
+        @config
+      end
 
-  @spec config(atom()) :: any()
-  def config(group), do: @config[group]
+    Pleroma.Config.put(:default_config, default_config)
+  end
 
-  @spec config(atom(), atom()) :: any()
-  def config(group, key), do: @config[group][key]
+  @spec default_config() :: keyword()
+  def default_config, do: get_default()
+
+  @spec default_config(atom()) :: keyword()
+  def default_config(group), do: Keyword.get(get_default(), group)
+
+  @spec default_config(atom(), atom()) :: keyword()
+  def default_config(group, key), do: get_in(get_default(), [group, key])
+
+  defp get_default, do: Pleroma.Config.get(:default_config)
+
+  @spec release_defaults() :: keyword()
+  def release_defaults do
+    [
+      pleroma: [
+        {:instance, [static_dir: "/var/lib/akkoma/static"]},
+        {Pleroma.Uploaders.Local, [uploads: "/var/lib/akkoma/uploads"]},
+        {:modules, [runtime_dir: "/var/lib/akkoma/modules"]},
+        {:release, true}
+      ]
+    ]
+  end
 end