logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: eaaf701319cc3faf49ddcee359c796ec682886d8
parent: b73a1a33de76dc848037a5d0e951866bd21f92c4
Author: kaniini <nenolod@gmail.com>
Date:   Thu,  3 Jan 2019 18:53:30 +0000

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:

Mlib/pleroma/user.ex1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git 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}