diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-05 02:50:38 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-05 21:45:57 +0300 |
| commit | 9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23 (patch) | |
| tree | 7c3a223f274994f4f22bf9aafd88b78d50dcc9ec /lib/pleroma/activity.ex | |
| parent | 228bf4d214abe3bb62c52128d3bc145e396b174d (diff) | |
| download | pleroma-9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23.tar.gz | |
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
Diffstat (limited to 'lib/pleroma/activity.ex')
| -rw-r--r-- | lib/pleroma/activity.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index f180c1e33..480b261cf 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -241,9 +241,10 @@ defmodule Pleroma.Activity do def normalize(ap_id) when is_binary(ap_id), do: get_by_ap_id_with_object(ap_id) def normalize(_), do: nil - def delete_by_ap_id(id) when is_binary(id) do + def delete_all_by_object_ap_id(id) when is_binary(id) do id |> Queries.by_object_id() + |> Queries.exclude_type("Delete") |> select([u], u) |> Repo.delete_all() |> elem(1) @@ -255,7 +256,7 @@ defmodule Pleroma.Activity do |> purge_web_resp_cache() end - def delete_by_ap_id(_), do: nil + def delete_all_by_object_ap_id(_), do: nil defp purge_web_resp_cache(%Activity{} = activity) do %{path: path} = URI.parse(activity.data["id"]) |