logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: c7140c67c7eed28222a4351c1132b44faf1f7ce7
parent: c93571b87e6c47fadf8fc1d65a1f8324ab355ce8
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Wed, 17 Oct 2018 04:24:13 +0000

Merge branch 'import-maybe-direct-follow' into 'develop'

Use maybe_direct_follow for follow imports

See merge request pleroma/pleroma!378

Diffstat:

Mlib/pleroma/web/twitter_api/controllers/util_controller.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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)}")