From: lain <lain@soykaf.club>
Date: Sat, 24 Mar 2018 14:02:43 +0000 (+0100)
Subject: Unify user fetching.
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=c7be7a94544ef2dda687feea4d5c19ac06fc1d0e;p=akkoma

Unify user fetching.
---

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 987a960bb..61b11681a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -328,7 +328,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def get_external_profile(for_user, uri) do
-    with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do
+    IO.inspect(uri)
+    with %User{} = user <- User.get_or_fetch_by_nickname(uri) do
       spawn(fn ->
         with url <- user.info["topic"],
              {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do