diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-10-17 04:24:13 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-10-17 04:24:13 +0000 |
| commit | c7140c67c7eed28222a4351c1132b44faf1f7ce7 (patch) | |
| tree | 0928282e199a46cadf26c21fe3c482c453f47f42 /lib | |
| parent | c93571b87e6c47fadf8fc1d65a1f8324ab355ce8 (diff) | |
| parent | 7562912f6a1bd642bc4a3bee52f0375d1e067180 (diff) | |
| download | pleroma-c7140c67c7eed28222a4351c1132b44faf1f7ce7.tar.gz | |
Merge branch 'import-maybe-direct-follow' into 'develop'
Use maybe_direct_follow for follow imports
See merge request pleroma/pleroma!378
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 4aaf28869..109704d00 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -223,7 +223,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do |> Enum.map(fn account -> with %User{} = follower <- User.get_cached_by_ap_id(user.ap_id), %User{} = followed <- User.get_or_fetch(account), - {:ok, follower} <- User.follow(follower, followed) do + {:ok, follower} <- User.maybe_direct_follow(follower, followed) do ActivityPub.follow(follower, followed) else err -> Logger.debug("follow_import: following #{account} failed with #{inspect(err)}") |