Merge branch 'develop' into feature/thread-muting

priv/repo/migrations/20190203185340_split_hide_network.exs

@@ -0,0 +1,12 @@
+defmodule Pleroma.Repo.Migrations.SplitHideNetwork do
+  use Ecto.Migration
+
+  def up do
+    execute("UPDATE users SET info = jsonb_set(info, '{hide_network}'::text[], 'false'::jsonb) WHERE NOT(info::jsonb ? 'hide_network')")
+    execute("UPDATE users SET info = jsonb_set(info, '{hide_followings}'::text[], info->'hide_network')")
+    execute("UPDATE users SET info = jsonb_set(info, '{hide_followers}'::text[], info->'hide_network')")
+  end
+
+  def down do
+  end
+end

priv/repo/migrations/20190204200237_add_correct_dm_index.exs

@@ -0,0 +1,30 @@
+defmodule Pleroma.Repo.Migrations.AddCorrectDMIndex do
+  use Ecto.Migration
+  @disable_ddl_transaction true
+
+  def up do
+    drop_if_exists(
+      index(:activities, ["activity_visibility(actor, recipients, data)"],
+        name: :activities_visibility_index
+      )
+    )
+
+    create(
+      index(:activities, ["activity_visibility(actor, recipients, data)", "id DESC NULLS LAST"],
+        name: :activities_visibility_index,
+        concurrently: true,
+        where: "data->>'type' = 'Create'"
+      )
+    )
+  end
+
+  def down do
+    drop(
+      index(:activities, ["activity_visibility(actor, recipients, data)", "id DESC"],
+        name: :activities_visibility_index,
+        concurrently: true,
+        where: "data->>'type' = 'Create'"
+      )
+    )
+  end
+end