moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oh no! More fixes!

This commit is contained in:
lain 2018-02-24 10:51:15 +01:00
parent 01d5ef65fa
commit 541a4cbbb6
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mix/tasks/fix_ap_users.ex
View File

@ -14,7 +14,7 @@ def run([]) do
Enum.each(users, fn(user) -> Enum.each(users, fn(user) ->
IO.puts("Fetching #{user.nickname}") IO.puts("Fetching #{user.nickname}")
Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id) Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id, false)
end) end)
end end
end end

40
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -197,31 +197,39 @@ def prepare_attachments(object) do
|> Map.put("attachment", attachments) |> Map.put("attachment", attachments)
end end
def upgrade_user_from_ap_id(ap_id) do defp user_upgrade_task(user) do
old_follower_address = User.ap_followers(user)
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
def upgrade_user_from_ap_id(ap_id, async \\ true) do
with %User{} = user <- User.get_by_ap_id(ap_id), with %User{} = user <- User.get_by_ap_id(ap_id),
{:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do {:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do
data = data data = data
|> Map.put(:info, Map.merge(user.info, data[:info])) |> Map.put(:info, Map.merge(user.info, data[:info]))
old_follower_address = User.ap_followers(user)
{:ok, user} = User.upgrade_changeset(user, data) {:ok, user} = User.upgrade_changeset(user, data)
|> Repo.update() |> Repo.update()
# This could potentially take a long time, do it in the background # This could potentially take a long time, do it in the background
Task.start(fn -> if async do
q = from u in User, Task.start(fn ->
where: ^old_follower_address in u.following, user_upgrade_task(user)
update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]] end)
Repo.update_all(q, []) else
user_upgrade_task(user)
# Only do this for recent activties, don't go through the whole db. end
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} {:ok, user}
else else