diff options
author | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
commit | 0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8 (patch) | |
tree | 45a693814a7f1f7bd2d6108732f2b75086f1fa0a /lib/pleroma/user.ex | |
parent | 30261772063a30ca0ef299f441cfed4630ffb630 (diff) | |
parent | 3448b434f54e8b4749524e3ccd876359a6501845 (diff) | |
download | pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.tar.gz |
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
Diffstat (limited to 'lib/pleroma/user.ex')
-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 748fdbca4..3bcfcdd91 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 |