Fix tests.

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5da146014717f54da80ff68558bf0e3ba8d9d370..e92b85f52c2baea89ecc9c96f4bf8f4064e07d5a 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -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

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 61b11681a08589744c4d278d9e49bf82e13b55e5..6e1f141f335b417627b22439f66bdf997b03d4f3 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -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