X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=priv%2Frepo%2Fmigrations%2F20190414125034_migrate_old_bookmarks.exs;h=b6f0ac66b3dde98f6a1e95d9b38edeceed381788;hb=b6891fe190d3ae186d777ab34c4778c5f48fa18a;hp=ce45909541b6b0e35c9824ef9418d0a78776d966;hpb=85c7916c94017c6a3657a3540f1e6c3afcb78225;p=akkoma

diff --git a/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs b/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs
index ce4590954..b6f0ac66b 100644
--- a/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs
+++ b/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs
@@ -3,22 +3,25 @@ defmodule Pleroma.Repo.Migrations.MigrateOldBookmarks do
   import Ecto.Query
   alias Pleroma.Activity
   alias Pleroma.Bookmark
-  alias Pleroma.User
   alias Pleroma.Repo
 
   def up do
     query =
-      from(u in User,
+      from(u in "users",
         where: u.local == true,
-        where: fragment("array_length(bookmarks, 1)") > 0,
-        select: %{id: u.id, bookmarks: fragment("bookmarks")}
+        where: fragment("array_length(?, 1)", u.bookmarks) > 0,
+        select: %{id: u.id, bookmarks: u.bookmarks}
       )
 
     Repo.stream(query)
     |> Enum.each(fn %{id: user_id, bookmarks: bookmarks} ->
       Enum.each(bookmarks, fn ap_id ->
-        activity = Activity.get_create_by_object_ap_id(ap_id)
-	      unless is_nil(activity), do: {:ok, _} = Bookmark.create(user_id, activity.id)
+        activity =
+          ap_id
+          |> Activity.create_by_object_ap_id()
+          |> Repo.one()
+
+        unless is_nil(activity), do: {:ok, _} = Bookmark.create(user_id, activity.id)
       end)
     end)
 
@@ -29,7 +32,7 @@ defmodule Pleroma.Repo.Migrations.MigrateOldBookmarks do
 
   def down do
     alter table(:users) do
-      add :bookmarks, {:array, :string}, null: false, default: []
+      add(:bookmarks, {:array, :string}, null: false, default: [])
     end
   end
 end