aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-12 18:50:47 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-12 18:50:47 +0200
commit04544da8f1f8f7e8f2f629c7b6d8cc09e1c03618 (patch)
tree0ac09dc6ae35dec98a571d32f2e4f0f6186e9176
parentdd12cf7296566be206ca17044281ab2460fb7b9e (diff)
downloadpleroma-04544da8f1f8f7e8f2f629c7b6d8cc09e1c03618.tar.gz
Fetch user on externalprofile if we don't know him
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex5
1 files 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
index d048d07c3..6503d7222 100644
--- 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