hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix salmon tests.

Browse source
This commit is contained in:
lain 2018-02-25 17:06:12 +01:00
commit d3b0167854
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/user.ex
View file

@ -410,8 +410,15 @@ defmodule Pleroma.User do
if user = get_by_ap_id(ap_id) do
user
else
with {:ok, user} <- ActivityPub.make_user_from_ap_id(ap_id) do
user
ap_try = ActivityPub.make_user_from_ap_id(ap_id)
case ap_try do
{:ok, user} -> user
_ ->
case OStatus.make_user(ap_id) do
{:ok, user} -> user
_ -> {:error, "Could not fetch by ap id"}
end
end
end
end