diff options
author | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
---|---|---|
committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
commit | 5469fb9561bb886deb8434e545dfb711eb20f341 (patch) | |
tree | 78ab675afd6169e2497b5c47882725cc1d2f2326 /lib/pleroma/user.ex | |
parent | c06a5af386a3cdfeda0b2c21963d9200fb7d6c89 (diff) | |
parent | d93789dfde3c44c76a56732088a897ddddfe9716 (diff) | |
download | pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.tar.gz |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 94f16c3c0..df22d29a8 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -607,7 +607,7 @@ defmodule Pleroma.User do |> Enum.each(fn activity -> case activity.data["type"] do "Create" -> - ActivityPub.delete(Object.get_by_ap_id(activity.data["object"]["id"])) + ActivityPub.delete(Object.normalize(activity.data["object"])) # TODO: Do something with likes, follows, repeats. _ -> |