alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fetch user on externalprofile if we don't know him

This commit is contained in:
Roger Braun 2017-05-12 18:50:47 +02:00
parent dd12cf7296
commit 04544da8f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -2,6 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
alias Pleroma.{User, Activity, Repo, Object} alias Pleroma.{User, Activity, Repo, Object}
alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter} alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
alias Pleroma.Web.OStatus
import Ecto.Query import Ecto.Query
@ -352,10 +353,10 @@ def conversation_id_to_context(id) do
end end
def get_external_profile(for_user, uri) do 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})} {:ok, UserRepresenter.to_map(user, %{for: for_user})}
else _e -> else _e ->
{:error, "Couldn't find user"} {:error, "Couldn't find user"}
end end
end end
end end