aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-12-09 15:52:31 +0000
committerlain <lain@soykaf.club>2020-12-09 15:52:31 +0000
commit1436a2fa2dfd5fef6d61d1bba9ba074b359b40a3 (patch)
tree7d66eb9efe5d24dc39aacc35e42ff7254da090a0 /lib/pleroma/user.ex
parente73d878b381f28abbd50e3d4e4894ff56669231d (diff)
parent97068196a9ef4faa929208681ab3b2f3bbd4cbd3 (diff)
downloadpleroma-1436a2fa2dfd5fef6d61d1bba9ba074b359b40a3.tar.gz
Merge branch 'stream-follow-updates' into 'develop'
Stream follow updates Closes #2299 See merge request pleroma/pleroma!3183
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 4b3a9d690..6174687c8 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -894,7 +894,7 @@ defmodule Pleroma.User do
if not ap_enabled?(followed) do
follow(follower, followed)
else
- {:ok, follower}
+ {:ok, follower, followed}
end
end
@@ -920,11 +920,6 @@ defmodule Pleroma.User do
true ->
FollowingRelationship.follow(follower, followed, state)
-
- {:ok, _} = update_follower_count(followed)
-
- follower
- |> update_following_count()
end
end
@@ -948,11 +943,6 @@ defmodule Pleroma.User do
case get_follow_state(follower, followed) do
state when state in [:follow_pending, :follow_accept] ->
FollowingRelationship.unfollow(follower, followed)
- {:ok, followed} = update_follower_count(followed)
-
- {:ok, follower} = update_following_count(follower)
-
- {:ok, follower, followed}
nil ->
{:error, "Not subscribed!"}