Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'

Fix MigrateOldBookmarks migration crashing on deleted activities

See merge request pleroma/pleroma!1106
This commit is contained in:
rinpatch 2019-04-29 18:33:06 +00:00
commit 32a4501d2d

View file

@ -18,7 +18,7 @@ defmodule Pleroma.Repo.Migrations.MigrateOldBookmarks do
|> Enum.each(fn %{id: user_id, bookmarks: bookmarks} -> |> Enum.each(fn %{id: user_id, bookmarks: bookmarks} ->
Enum.each(bookmarks, fn ap_id -> Enum.each(bookmarks, fn ap_id ->
activity = Activity.get_create_by_object_ap_id(ap_id) activity = Activity.get_create_by_object_ap_id(ap_id)
{:ok, _} = Bookmark.create(user_id, activity.id) unless is_nil(activity), do: {:ok, _} = Bookmark.create(user_id, activity.id)
end) end)
end) end)