mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 16:40:29 +00:00
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup See merge request pleroma/pleroma!2148
This commit is contained in:
commit
4f004ab92e
1 changed files with 6 additions and 3 deletions
|
@ -12,7 +12,10 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
|
||||||
|
|
||||||
@impl Oban.Worker
|
@impl Oban.Worker
|
||||||
def perform(
|
def perform(
|
||||||
%{"object" => %{"data" => %{"attachment" => [_ | _] = attachments, "actor" => actor}}},
|
%{
|
||||||
|
"op" => "cleanup_attachments",
|
||||||
|
"object" => %{"data" => %{"attachment" => [_ | _] = attachments, "actor" => actor}}
|
||||||
|
},
|
||||||
_job
|
_job
|
||||||
) do
|
) do
|
||||||
hrefs =
|
hrefs =
|
||||||
|
@ -37,7 +40,7 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
|
||||||
)
|
)
|
||||||
# The query above can be time consumptive on large instances until we
|
# The query above can be time consumptive on large instances until we
|
||||||
# refactor how uploads are stored
|
# refactor how uploads are stored
|
||||||
|> Repo.all(timout: :infinity)
|
|> Repo.all(timeout: :infinity)
|
||||||
# we should delete 1 object for any given attachment, but don't delete
|
# we should delete 1 object for any given attachment, but don't delete
|
||||||
# files if there are more than 1 object for it
|
# files if there are more than 1 object for it
|
||||||
|> Enum.reduce(%{}, fn %{
|
|> Enum.reduce(%{}, fn %{
|
||||||
|
@ -84,5 +87,5 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
|
||||||
|> Repo.delete_all()
|
|> Repo.delete_all()
|
||||||
end
|
end
|
||||||
|
|
||||||
def perform(%{"object" => _object}, _job), do: :ok
|
def perform(%{"op" => "cleanup_attachments", "object" => _object}, _job), do: :ok
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue