diff options
| author | lain <lain@soykaf.club> | 2021-11-15 13:21:42 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-11-15 13:21:42 +0000 |
| commit | 6aff3d320478df678aeda9bc58b9d4e4b3afbf75 (patch) | |
| tree | 24db82c801dafdc31e0b884165a287483d6d9169 | |
| parent | 838da53ea72cba73fb4643194a102d55a90ea535 (diff) | |
| parent | 65514484cc5d8457a85e6c9d162da20f32210489 (diff) | |
Merge branch 'fix-object-deletion-timeout' into 'develop'
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
Closes #2704
See merge request pleroma/pleroma!3479
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/pleroma/activity.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a1ae9cb6..bab6c2580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,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` - Fixed rendering of JSON errors on ActivityPub endpoints. - Linkify: Parsing crash with URLs ending in unbalanced closed paren, no path separator, and no query parameters diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index 6a991c48e..b88f74f47 100644 --- 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 |