projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
user
/
import.ex
diff --git
a/lib/pleroma/user/import.ex
b/lib/pleroma/user/import.ex
index e458021c87b1fdb35a1369238bd96c3c4e002dec..86b49d8ae36cfdd08cfd0fc5362d3f7b96d69614 100644
(file)
--- a/
lib/pleroma/user/import.ex
+++ b/
lib/pleroma/user/import.ex
@@
-45,7
+45,7
@@
defmodule Pleroma.User.Import do
identifiers,
fn identifier ->
with {:ok, %User{} = followed} <- User.get_or_fetch(identifier),
identifiers,
fn identifier ->
with {:ok, %User{} = followed} <- User.get_or_fetch(identifier),
- {:ok, follower} <- User.maybe_direct_follow(follower, followed),
+ {:ok, follower
, followed
} <- User.maybe_direct_follow(follower, followed),
{:ok, _, _, _} <- CommonAPI.follow(follower, followed) do
followed
else
{:ok, _, _, _} <- CommonAPI.follow(follower, followed) do
followed
else