diff options
author | kaniini <nenolod@gmail.com> | 2019-01-03 18:53:30 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-01-03 18:53:30 +0000 |
commit | eaaf701319cc3faf49ddcee359c796ec682886d8 (patch) | |
tree | 11bbae90aed0f504f29c872074845939bb5ff219 /lib | |
parent | b73a1a33de76dc848037a5d0e951866bd21f92c4 (diff) | |
parent | eb1a18d22f0284cfee571e6a83d4ddf69042dba0 (diff) | |
download | pleroma-eaaf701319cc3faf49ddcee359c796ec682886d8.tar.gz |
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/user.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 892f4e483..1edded415 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -495,6 +495,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 -> !is_nil(u) end) |> Enum.filter(fn u -> !following?(u, user) end) {:ok, users} |