From 741ab533b1acef1af02ee6ba8e9a26e1f9c8c346 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 31 Mar 2018 18:41:35 +0200
Subject: [PATCH] Added proper header when querying activity pub actor

---
 api/funkwhale_api/federation/actors.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/api/funkwhale_api/federation/actors.py b/api/funkwhale_api/federation/actors.py
index 823d163f9..56a3fc1fa 100644
--- a/api/funkwhale_api/federation/actors.py
+++ b/api/funkwhale_api/federation/actors.py
@@ -10,10 +10,18 @@ from . import utils
 
 
 def get_actor_data(actor_url):
-    response = requests.get(actor_url)
+    response = requests.get(
+        actor_url,
+        headers={
+            'Accept': 'application/activity+json',
+        }
+    )
     response.raise_for_status()
-    return response.json()
-
+    try:
+        return response.json()
+    except:
+        raise ValueError(
+            'Invalid actor payload: {}'.format(response.text))
 
 SYSTEM_ACTORS = {
     'library': {