From efd4d049331462c234de7364ee194f5a0559e70f Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Feb 2018 10:28:38 +0100 Subject: [PATCH] Fix user upgrading code. --- lib/pleroma/web/activity_pub/transmogrifier.ex | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index a3bbae2a5..fcf3804d5 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -209,15 +209,18 @@ def upgrade_user_from_ap_id(ap_id) do # This could potentially take a long time, do it in the background Task.start(fn -> - q = from a in Activity, - where: ^old_follower_address in a.recipients, - update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]] - Repo.update_all(q, []) - q = from u in User, where: ^old_follower_address in u.following, update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]] Repo.update_all(q, []) + + # Only do this for recent activties, don't go through the whole db. + since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000 + q = from a in Activity, + where: ^old_follower_address in a.recipients, + where: a.id > ^since, + update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]] + Repo.update_all(q, []) end) {:ok, user}