diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 20:14:28 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 20:14:28 +0300 |
| commit | 6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9 (patch) | |
| tree | 6b8e22663fd5b6d5cdf3afaa4b306775d59b503a /lib/pleroma/activity.ex | |
| parent | 49bb0a130f93476d32d3177d7a989b7a98a063f2 (diff) | |
| parent | af5fef1f228a1781d7d9cad490d3b3a783389f5e (diff) | |
| download | pleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.tar.gz | |
Merge branch 'develop' into issue/1276
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"]) |