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/user.ex | |
| parent | 718882b326f00c8315bca5acc439b92aa37bf021 (diff) | |
| parent | 5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e (diff) | |
| download | pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.tar.gz | |
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 94f16c3c0..fa0ea171d 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -398,6 +398,7 @@ defmodule Pleroma.User do Enum.map(reqs, fn req -> req.actor end) |> Enum.uniq() |> Enum.map(fn ap_id -> get_by_ap_id(ap_id) end) + |> Enum.filter(fn u -> !following?(u, user) end) {:ok, users} end @@ -607,7 +608,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. _ -> |