diff options
author | Roger Braun <roger@rogerbraun.net> | 2017-09-04 18:47:46 +0200 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2017-09-04 18:47:46 +0200 |
commit | 2348b272e020bd22520a4306be5f2fdc8469cfd1 (patch) | |
tree | 4fad2ba8adb16b33d206fd2fcd9921e3094b5339 /lib | |
parent | 5db535c0b10c27a487b12d5dcc0c015b91753fed (diff) | |
download | pleroma-2348b272e020bd22520a4306be5f2fdc8469cfd1.tar.gz |
Create deletes activities for incoming deletes.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/ostatus/handlers/delete_handler.ex | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pleroma/web/ostatus/handlers/delete_handler.ex b/lib/pleroma/web/ostatus/handlers/delete_handler.ex index f54a037a0..29fe4052c 100644 --- a/lib/pleroma/web/ostatus/handlers/delete_handler.ex +++ b/lib/pleroma/web/ostatus/handlers/delete_handler.ex @@ -2,14 +2,13 @@ defmodule Pleroma.Web.OStatus.DeleteHandler do require Logger alias Pleroma.Web.{XML, OStatus} alias Pleroma.{Activity, Object, Repo} + alias Pleroma.Web.ActivityPub.ActivityPub def handle_delete(entry, doc \\ nil) do with id <- XML.string_from_xpath("//id", entry), - object when not is_nil(object) <- Object.get_by_ap_id(id) do - Repo.delete(object) - Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)) - Repo.delete_all(Activity.all_by_object_ap_id_q(id)) - nil + object when not is_nil(object) <- Object.get_by_ap_id(id), + {:ok, delete} <- ActivityPub.delete(object, false) do + delete end end end |