logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 4f004ab92e6d824140e1f87155c3f91a6eedcb09
parent: b12f3064730648de992f934cf5a23cadb5206b9d
Author: lain <lain@soykaf.club>
Date:   Tue, 28 Jan 2020 12:40:00 +0000

Merge branch 'fix/attachments-cleanup' into 'develop'

Fix/attachments cleanup

See merge request pleroma/pleroma!2148

Diffstat:

Mlib/pleroma/workers/attachments_cleanup_worker.ex9++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/workers/attachments_cleanup_worker.ex b/lib/pleroma/workers/attachments_cleanup_worker.ex @@ -12,7 +12,10 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do @impl Oban.Worker def perform( - %{"object" => %{"data" => %{"attachment" => [_ | _] = attachments, "actor" => actor}}}, + %{ + "op" => "cleanup_attachments", + "object" => %{"data" => %{"attachment" => [_ | _] = attachments, "actor" => actor}} + }, _job ) do hrefs = @@ -37,7 +40,7 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do ) # The query above can be time consumptive on large instances until we # 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 # files if there are more than 1 object for it |> Enum.reduce(%{}, fn %{ @@ -84,5 +87,5 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do |> Repo.delete_all() end - def perform(%{"object" => _object}, _job), do: :ok + def perform(%{"op" => "cleanup_attachments", "object" => _object}, _job), do: :ok end