aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controllers/util_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-04-07 16:41:47 +0200
committerlain <lain@soykaf.club>2018-04-07 16:41:47 +0200
commit8f9bcc4ab0b16efa9168f49f6e2cc14bc424d398 (patch)
tree220581b9c5d2dd92285943c2b948789b9bf4699c /lib/pleroma/web/twitter_api/controllers/util_controller.ex
parent70bcdf32bdf98c02d9f44c07cbcf74d4c59ed299 (diff)
parentd41bfd1d47587c95450c5953b9fb4374008ecb8c (diff)
downloadpleroma-8f9bcc4ab0b16efa9168f49f6e2cc14bc424d398.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 8f452c31c..c7b1a5b95 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -182,13 +182,13 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
def follow_import(%{assigns: %{user: user}} = conn, %{"list" => list}) do
Task.start(fn ->
String.split(list)
- |> Enum.map(fn nick ->
+ |> Enum.map(fn account ->
with %User{} = follower <- User.get_cached_by_ap_id(user.ap_id),
- %User{} = followed <- User.get_or_fetch_by_nickname(nick),
+ %User{} = followed <- User.get_or_fetch(account),
{:ok, follower} <- User.follow(follower, followed) do
ActivityPub.follow(follower, followed)
else
- _e -> Logger.debug("follow_import: following #{nick} failed")
+ _e -> Logger.debug("follow_import: following #{account} failed")
end
end)
end)