aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-04-07 08:23:13 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-05-18 11:39:38 +0200
commit71c95dfc1ccb61ffdb4f0266edca9b75289f4053 (patch)
tree00eb5f1c77081c26d7eac0cdfc110a8a898dbcca /lib/pleroma/user.ex
parent636b99c55250eda5a79cb18577dcfb68a7a1500c (diff)
downloadpleroma-bugfix/non-ap_enabled-direct_follow.tar.gz
Keep only pure-federation side-effects of user.ap_enabledbugfix/non-ap_enabled-direct_follow
Only parts kept are: - Do not push to non AP-enabled actors - Upgrade actors to AP-enabled when receiving an Activity from them
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index cba391072..273b76dd0 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -704,12 +704,8 @@ defmodule Pleroma.User do
follow(follower, followed)
end
- def maybe_direct_follow(%User{} = follower, %User{} = followed) do
- if not ap_enabled?(followed) do
- follow(follower, followed)
- else
- {:ok, follower}
- end
+ def maybe_direct_follow(%User{} = follower, _followed) do
+ {:ok, follower}
end
@doc "A mass follow for local users. Respects blocks in both directions but does not create activities."