diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
| commit | f2fa09c50fde8db4e619872ef6121e90a69324a6 (patch) | |
| tree | 4d34037c5fc6d1a3c05a0b061f5279caef1bd671 /lib/pleroma/web/ostatus/handlers/delete_handler.ex | |
| parent | 718882b326f00c8315bca5acc439b92aa37bf021 (diff) | |
| parent | 5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e (diff) | |
| download | pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.tar.gz pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.zip | |
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
Diffstat (limited to 'lib/pleroma/web/ostatus/handlers/delete_handler.ex')
| -rw-r--r-- | lib/pleroma/web/ostatus/handlers/delete_handler.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/handlers/delete_handler.ex b/lib/pleroma/web/ostatus/handlers/delete_handler.ex index 4f3016b65..6330d7f64 100644 --- a/lib/pleroma/web/ostatus/handlers/delete_handler.ex +++ b/lib/pleroma/web/ostatus/handlers/delete_handler.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.OStatus.DeleteHandler do 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), + %Object{} = object <- Object.normalize(id), {:ok, delete} <- ActivityPub.delete(object, false) do delete end |