moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests.

This commit is contained in:
lain 2018-03-24 15:09:09 +01:00
parent c7be7a9454
commit 847cb15626
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/user.ex
View File

@ -458,4 +458,12 @@ def insert_or_update_user(data) do
def ap_enabled?(%User{info: info}), do: info["ap_enabled"] def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
def ap_enabled?(_), do: false def ap_enabled?(_), do: false
def get_or_fetch(uri_or_nickname) do
if String.starts_with?(uri_or_nickname, "http") do
get_or_fetch_by_ap_id(uri_or_nickname)
else
get_or_fetch_by_nickname(uri_or_nickname)
end
end
end end

3
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -328,8 +328,7 @@ def conversation_id_to_context(id) do
end end
def get_external_profile(for_user, uri) do def get_external_profile(for_user, uri) do
IO.inspect(uri) with %User{} = user <- User.get_or_fetch(uri) do
with %User{} = user <- User.get_or_fetch_by_nickname(uri) do
spawn(fn -> spawn(fn ->
with url <- user.info["topic"], with url <- user.info["topic"],
{:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do