Browse Source

Fix tests.

tags/v0.9.9
lain 6 years ago
parent
commit
847cb15626
2 changed files with 9 additions and 2 deletions
  1. +8
    -0
      lib/pleroma/user.ex
  2. +1
    -2
      lib/pleroma/web/twitter_api/twitter_api.ex

+ 8
- 0
lib/pleroma/user.ex View File

@@ -458,4 +458,12 @@ defmodule Pleroma.User do

def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
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

+ 1
- 2
lib/pleroma/web/twitter_api/twitter_api.ex View File

@@ -328,8 +328,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end

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


Loading…
Cancel
Save