Commit 2dc0c419 authored by lain's avatar lain
Browse files

Merge branch 'fix/follow-import-by-uri' into 'develop'

Follow import: allow URI in addition to screen_name.

See merge request !96
parents 303289d7 e7ddda44
Pipeline #1115 passed with stage
in 2 minutes and 26 seconds
......@@ -182,13 +182,13 @@ def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) 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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment