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

Fix specs.

Browse source
This commit is contained in:
lain 2018-02-25 16:52:33 +01:00
commit 4d13cc0dc6
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -314,7 +314,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id) do
User.insert_or_update_user(data)
else
e -> e
e -> {:error, e}
end
end
end
@ -322,6 +322,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def make_user_from_nickname(nickname) do
with {:ok, %{"ap_id" => ap_id}} when not is_nil(ap_id) <- WebFinger.finger(nickname) do
make_user_from_ap_id(ap_id)
else
_e -> {:error, "No ap id in webfinger"}
end
end