logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c7be7a94544ef2dda687feea4d5c19ac06fc1d0e
parent e3a81fe58f42935c6116ccc59c73ae41e99ecaae
Author: lain <lain@soykaf.club>
Date:   Sat, 24 Mar 2018 15:02:43 +0100

Unify user fetching.

Diffstat:

Mlib/pleroma/web/twitter_api/twitter_api.ex3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 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