From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 17 Nov 2018 20:13:38 +0000 (+0000)
Subject: activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c88533209c20eeae51dcdc029db9483f8e69d096;p=akkoma

activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 98e9e2120..ed579e336 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -628,9 +628,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def fetch_and_prepare_user_from_ap_id(ap_id) do
-    with {:ok, %{status_code: 200, body: body}} <-
-           @httpoison.get(ap_id, [Accept: "application/activity+json"], follow_redirect: true),
-         {:ok, data} <- Jason.decode(body) do
+    with {:ok, data} <- fetch_and_contain_remote_object_from_id(ap_id) do
       user_data_from_user_object(data)
     else
       e -> Logger.error("Could not decode user at fetch #{ap_id}, #{inspect(e)}")