diff options
| author | feld <feld@feld.me> | 2020-03-24 19:10:32 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-03-24 19:10:32 +0000 |
| commit | 8eebc75c152ee339bac347350266e3bc6536016b (patch) | |
| tree | d575bbef65b51f9691f944e917c5ae4444c9ca4e /lib | |
| parent | 1d75d0ed7acb93c84b53d8fff41ffc66a61541ef (diff) | |
| parent | d1a9716a988fe9f670033ad46cc9637038fbd1e8 (diff) | |
| download | pleroma-8eebc75c152ee339bac347350266e3bc6536016b.tar.gz pleroma-8eebc75c152ee339bac347350266e3bc6536016b.zip | |
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 30e282840..974231925 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -583,6 +583,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end end + defp do_delete(%Object{data: %{"type" => "Tombstone", "id" => ap_id}}, _) do + activity = + ap_id + |> Activity.Queries.by_object_id() + |> Activity.Queries.by_type("Delete") + |> Repo.one() + + {:ok, activity} + end + @spec block(User.t(), User.t(), String.t() | nil, boolean()) :: {:ok, Activity.t()} | {:error, any()} def block(blocker, blocked, activity_id \\ nil, local \\ true) do |