potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Clear AP cache when content is updated or deleted

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-12-16 11:47:31 +01:00
parent 14176ccc89
commit 039846d465
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/mobilizon/actors/actors.ex
View file

@ -249,6 +249,7 @@ defmodule Mobilizon.Actors do
case transaction do case transaction do
{:ok, %{actor: %Actor{} = actor}} -> {:ok, %{actor: %Actor{} = actor}} ->
{:ok, true} = Cachex.del(:activity_pub, "actor_#{actor.preferred_username}")
{:ok, actor} {:ok, actor}
{:error, remove, error, _} when remove in [:remove_banner, :remove_avatar] -> {:error, remove, error, _} when remove in [:remove_banner, :remove_avatar] ->

4
lib/service/activity_pub/activity_pub.ex
View file

@ -328,6 +328,7 @@ defmodule Mobilizon.Service.ActivityPub do
with audience <- with audience <-
Audience.calculate_to_and_cc_from_mentions(event), Audience.calculate_to_and_cc_from_mentions(event),
{:ok, %Event{} = event} <- Events.delete_event(event), {:ok, %Event{} = event} <- Events.delete_event(event),
{:ok, true} <- Cachex.del(:activity_pub, "event_#{event.uuid}"),
{:ok, %Tombstone{} = _tombstone} <- {:ok, %Tombstone{} = _tombstone} <-
Tombstone.create_tombstone(%{uri: event.url, actor_id: actor.id}), Tombstone.create_tombstone(%{uri: event.url, actor_id: actor.id}),
Share.delete_all_by_uri(event.url), Share.delete_all_by_uri(event.url),
@ -350,6 +351,7 @@ defmodule Mobilizon.Service.ActivityPub do
with audience <- with audience <-
Audience.calculate_to_and_cc_from_mentions(comment), Audience.calculate_to_and_cc_from_mentions(comment),
{:ok, %Comment{} = comment} <- Events.delete_comment(comment), {:ok, %Comment{} = comment} <- Events.delete_comment(comment),
{:ok, true} <- Cachex.del(:activity_pub, "comment_#{comment.uuid}"),
{:ok, %Tombstone{} = _tombstone} <- {:ok, %Tombstone{} = _tombstone} <-
Tombstone.create_tombstone(%{uri: comment.url, actor_id: actor.id}), Tombstone.create_tombstone(%{uri: comment.url, actor_id: actor.id}),
Share.delete_all_by_uri(comment.url), Share.delete_all_by_uri(comment.url),
@ -730,6 +732,7 @@ defmodule Mobilizon.Service.ActivityPub do
) do ) do
with args <- prepare_args_for_event(args), with args <- prepare_args_for_event(args),
{:ok, %Event{} = new_event} <- Events.update_event(old_event, args), {:ok, %Event{} = new_event} <- Events.update_event(old_event, args),
{:ok, true} <- Cachex.del(:activity_pub, "event_#{new_event.uuid}"),
event_as_data <- Convertible.model_to_as(new_event), event_as_data <- Convertible.model_to_as(new_event),
audience <- audience <-
Audience.calculate_to_and_cc_from_mentions(new_event), Audience.calculate_to_and_cc_from_mentions(new_event),
@ -748,6 +751,7 @@ defmodule Mobilizon.Service.ActivityPub do
defp update_actor(%Actor{} = old_actor, args, additional) do defp update_actor(%Actor{} = old_actor, args, additional) do
with {:ok, %Actor{} = new_actor} <- Actors.update_actor(old_actor, args), with {:ok, %Actor{} = new_actor} <- Actors.update_actor(old_actor, args),
actor_as_data <- Convertible.model_to_as(new_actor), actor_as_data <- Convertible.model_to_as(new_actor),
{:ok, true} <- Cachex.del(:activity_pub, "actor_#{new_actor.preferred_username}"),
audience <- audience <-
Audience.calculate_to_and_cc_from_mentions(new_actor), Audience.calculate_to_and_cc_from_mentions(new_actor),
additional <- Map.merge(additional, %{"actor" => old_actor.url}), additional <- Map.merge(additional, %{"actor" => old_actor.url}),