diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-05 15:52:40 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-05 15:52:40 +0000 |
| commit | 3f6da9c45aeb6954a857566731f483cd3da8d068 (patch) | |
| tree | b5ebea21c1fe2348d76ec8c219ea318b703e535e /lib/pleroma/user.ex | |
| parent | a511d2f9003870d267c143ee1aa12a0dfd805f8e (diff) | |
| parent | e1370ba1316734f61d8326200df1cb0789a4686f (diff) | |
| download | pleroma-3f6da9c45aeb6954a857566731f483cd3da8d068.tar.gz | |
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index d9f7e14b0..9449a88d0 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -324,14 +324,6 @@ defmodule Pleroma.User do end end - def maybe_follow(%User{} = follower, %User{info: _info} = followed) do - if not following?(follower, followed) do - follow(follower, followed) - else - {:ok, follower} - end - end - @doc "A mass follow for local users. Respects blocks in both directions but does not create activities." @spec follow_all(User.t(), list(User.t())) :: {atom(), User.t()} def follow_all(follower, followeds) do |