squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Invalidation.enabled function is boolean

Browse Source
This commit is contained in:
Mark Felder 2020-06-09 10:19:55 -05:00
parent 2222b21eb7
commit acd7b7ada4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -277,7 +277,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
_ <- increase_replies_count_if_reply(create_data), _ <- increase_replies_count_if_reply(create_data),
_ <- increase_poll_votes_if_vote(create_data), _ <- increase_poll_votes_if_vote(create_data),
_ <- _ <-
maybe_remove_mediaproxy_invalidation(MediaProxy.Invalidation.enabled(), create_data), maybe_remove_mediaproxy_invalidation(MediaProxy.Invalidation.enabled?(), create_data),
{:quick_insert, false, activity} <- {:quick_insert, quick_insert?, activity}, {:quick_insert, false, activity} <- {:quick_insert, quick_insert?, activity},
{:ok, _actor} <- increase_note_count_if_public(actor, activity), {:ok, _actor} <- increase_note_count_if_public(actor, activity),
_ <- notify_and_stream(activity), _ <- notify_and_stream(activity),

5
lib/pleroma/web/media_proxy/invalidation.ex
View File

@ -10,13 +10,14 @@ defmodule Pleroma.Web.MediaProxy.Invalidation do
alias Pleroma.Config alias Pleroma.Config
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
def enabled, do: Config.get([:media_proxy, :invalidation, :enabled]) @spec enabled?() :: boolean()
def enabled?, do: Config.get([:media_proxy, :invalidation, :enabled])
@spec purge(list(String.t()) | String.t()) :: {:ok, list(String.t())} | {:error, String.t()} @spec purge(list(String.t()) | String.t()) :: {:ok, list(String.t())} | {:error, String.t()}
def purge(urls) do def purge(urls) do
prepared_urls = prepare_urls(urls) prepared_urls = prepare_urls(urls)
if enabled() do if enabled?() do
do_purge(prepared_urls) do_purge(prepared_urls)
else else
{:ok, prepared_urls} {:ok, prepared_urls}

4
lib/pleroma/workers/attachments_cleanup_worker.ex
View File

@ -52,7 +52,7 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
end end
end) end)
lock_attachments(MediaProxy.Invalidation.enabled(), hrefs -- exclude_urls) lock_attachments(MediaProxy.Invalidation.enabled?(), hrefs -- exclude_urls)
Enum.each(attachment_urls, fn href -> Enum.each(attachment_urls, fn href ->
href href
@ -62,7 +62,7 @@ defmodule Pleroma.Workers.AttachmentsCleanupWorker do
delete_objects(object_ids) delete_objects(object_ids)
cache_purge(MediaProxy.Invalidation.enabled(), hrefs -- exclude_urls) cache_purge(MediaProxy.Invalidation.enabled?(), hrefs -- exclude_urls)
{:ok, :success} {:ok, :success}
end end