diff options
author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
tree | c0d68f476442b8dd86fca1e182d5c09553800810 /lib/pleroma/web/twitter_api/twitter_api.ex | |
parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index d04a81cd4..faecebde0 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -316,10 +316,12 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do def get_external_profile(for_user, uri) do with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do - with url <- user.info["topic"], - {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do - OStatus.handle_incoming(body) - end + spawn(fn -> + with url <- user.info["topic"], + {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do + OStatus.handle_incoming(body) + end + end) {:ok, UserView.render("show.json", %{user: user, for: for_user})} else _e -> {:error, "Couldn't find user"} |