CHANGELOG: fixed user deletion database timeout

Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
2021-07-12 16:59:54 -05:00 · 2021-07-12 16:23:06 -05:00 · 2021-07-12 16:20:15 -05:00
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Checking activated Upload Filters for required commands.
 - Remote users can no longer reappear after being deleted.
 - Deactivated users may now be deleted.
 - Deleting an activity with a lot of likes/boosts no longer causes a database timeout.
 - Mix task `pleroma.database prune_objects`
 - Linkify: Parsing crash with URLs ending in unbalanced closed paren, no path separator, and no query parameters
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@ -302,7 +302,7 @@ defmodule Pleroma.Activity do
    |> Queries.by_object_id()
    |> Queries.exclude_type("Delete")
    |> select([u], u)
-    |> Repo.delete_all()
+    |> Repo.delete_all(timeout: :infinity)
    |> elem(1)
    |> Enum.find(fn
      %{data: %{"type" => "Create", "object" => ap_id}} when is_binary(ap_id) -> ap_id == id
Author	SHA1	Message	Date
Alex Gleason	65514484cc	CHANGELOG: fixed user deletion database timeout	2021-07-12 16:59:54 -05:00
Alex Gleason	e40b58fd56	Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout	2021-07-12 16:23:06 -05:00
Alex Gleason	9a0cb34c8c	Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted	2021-07-12 16:20:15 -05:00