From d3b01678545dc4ebb9f5ad883b734f25fd74328c Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 25 Feb 2018 17:06:12 +0100 Subject: Fix salmon tests. --- lib/pleroma/user.ex | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index b16c1e342..c3fce17de 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -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 -- cgit v1.2.3