pleroma

commit: b4a502fc8b0f7efb1ef973548fec20661038a18a
parent: 98af7b59e478752e9e8294e03c3993f3145fd750
Author: feld <feld@feld.me>
Date:   Tue, 23 Jun 2020 18:51:37 +0000

Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'

Moving to mrf namespace migration fix

See merge request pleroma/pleroma!2676
Diffstat:
M
priv/repo/migrations/20200323122421_mrf_config_move_from_instance_namespace.exs
20
++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/priv/repo/migrations/20200323122421_mrf_config_move_from_instance_namespace.exs b/priv/repo/migrations/20200323122421_mrf_config_move_from_instance_namespace.exs
@@ -5,13 +5,11 @@ defmodule Pleroma.Repo.Migrations.MrfConfigMoveFromInstanceNamespace do
 
   @old_keys [:rewrite_policy, :mrf_transparency, :mrf_transparency_exclusions]
   def change do
-    config = ConfigDB.get_by_params(%{group: ":pleroma", key: ":instance"})
+    config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
 
     if config do
-      old_instance = ConfigDB.from_binary(config.value)
-
       mrf =
-        old_instance
+        config.value
         |> Keyword.take(@old_keys)
         |> Keyword.new(fn
           {:rewrite_policy, policies} -> {:policies, policies}
@@ -21,15 +19,17 @@ defmodule Pleroma.Repo.Migrations.MrfConfigMoveFromInstanceNamespace do
 
       if mrf != [] do
         {:ok, _} =
-          ConfigDB.create(
-            %{group: ":pleroma", key: ":mrf", value: ConfigDB.to_binary(mrf)},
-            false
-          )
+          %ConfigDB{}
+          |> ConfigDB.changeset(%{group: :pleroma, key: :mrf, value: mrf})
+          |> Pleroma.Repo.insert()
 
-        new_instance = Keyword.drop(old_instance, @old_keys)
+        new_instance = Keyword.drop(config.value, @old_keys)
 
         if new_instance != [] do
-          {:ok, _} = ConfigDB.update(config, %{value: ConfigDB.to_binary(new_instance)}, false)
+          {:ok, _} =
+            config
+            |> ConfigDB.changeset(%{value: new_instance})
+            |> Pleroma.Repo.update()
         else
           {:ok, _} = ConfigDB.delete(config)
         end