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

remove_deleted_attachements_from_cache -> maybe_remove_mediaproxy_invalidation

Browse Source
This commit is contained in:
Maksim Pechnikov 2020-05-30 09:09:44 +03:00
parent dc5647d4da
commit 5402fa9fb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,8 +88,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp check_remote_limit(_), do: true defp check_remote_limit(_), do: true
@spec remove_deleted_attachements_from_cache(boolean(), map()) :: :ok @spec maybe_remove_mediaproxy_invalidation(boolean, map()) :: :ok
def remove_deleted_attachements_from_cache(true, %{ def maybe_remove_mediaproxy_invalidation(true, %{
"object" => %{"attachment" => [_ | _] = attachments} "object" => %{"attachment" => [_ | _] = attachments}
}) do }) do
Task.start(fn -> Task.start(fn ->
@ -104,7 +104,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
:ok :ok
end end
def remove_deleted_attachements_from_cache(_, _), do: :ok def maybe_remove_mediaproxy_invalidation(_, _), do: :ok
def increase_note_count_if_public(actor, object) do def increase_note_count_if_public(actor, object) do
if is_public?(object), do: User.increase_note_count(actor), else: {:ok, actor} if is_public?(object), do: User.increase_note_count(actor), else: {:ok, actor}
@ -295,7 +295,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),
_ <- _ <-
remove_deleted_attachements_from_cache(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),