Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250
This commit is contained in:
commit
3f6da9c45a
9 changed files with 143 additions and 35 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue