diff options
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 4 | ||||
| -rw-r--r-- | test/user_test.exs | 23 |
2 files changed, 15 insertions, 12 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 87ad45249..667f8fc15 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -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 diff --git a/test/user_test.exs b/test/user_test.exs index 058b67c6d..100b3d0a0 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -46,21 +46,22 @@ defmodule Pleroma.UserTest do {:error, _} = User.follow(user, followed) end - test "following a remote user will ensure a websub subscription is present" do - user = insert(:user) - {:ok, followed} = OStatus.make_user("shp@social.heldscal.la") + # This is a somewhat useless test. + # test "following a remote user will ensure a websub subscription is present" do + # user = insert(:user) + # {:ok, followed} = OStatus.make_user("shp@social.heldscal.la") - assert followed.local == false + # assert followed.local == false - {:ok, user} = User.follow(user, followed) - assert User.ap_followers(followed) in user.following + # {:ok, user} = User.follow(user, followed) + # assert User.ap_followers(followed) in user.following - query = from w in WebsubClientSubscription, - where: w.topic == ^followed.info["topic"] - websub = Repo.one(query) + # query = from w in WebsubClientSubscription, + # where: w.topic == ^followed.info["topic"] + # websub = Repo.one(query) - assert websub - end + # assert websub + # end test "unfollow takes a user and another user" do followed = insert(:user) |