commit: 04544da8f1f8f7e8f2f629c7b6d8cc09e1c03618
parent: dd12cf7296566be206ca17044281ab2460fb7b9e
Author: Roger Braun <roger@rogerbraun.net>
Date: Fri, 12 May 2017 18:50:47 +0200
Fetch user on externalprofile if we don't know him
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -2,6 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
alias Pleroma.{User, Activity, Repo, Object}
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
+ alias Pleroma.Web.OStatus
import Ecto.Query
@@ -352,10 +353,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def get_external_profile(for_user, uri) do
- with %User{} = user <- User.get_cached_by_ap_id(uri) do
+ with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do
{:ok, UserRepresenter.to_map(user, %{for: for_user})}
else _e ->
- {:error, "Couldn't find user"}
+ {:error, "Couldn't find user"}
end
end
end