add `cookies` and `.json()` to utils.http.Response objects

2 files changed, 20 insertions, 19 deletions

diff --git a/modules/fediverse/ap_actor.py b/modules/fediverse/ap_actor.py
index a2557e9b..f87069a5 100644
--- a/modules/fediverse/ap_actor.py
+++ b/modules/fediverse/ap_actor.py
@@ -14,10 +14,11 @@ class Actor(object):
     def load(self):
         response = ap_utils.activity_request(self.url)
         if response.code == 200:
-            self.username = response.data["preferredUsername"]
-            self.inbox = Inbox(response.data["inbox"])
-            self.outbox = Outbox(response.data["outbox"])
-            self.followers = response.data["followers"]
+            response = response.json()
+            self.username = response["preferredUsername"]
+            self.inbox = Inbox(response["inbox"])
+            self.outbox = Outbox(response["outbox"])
+            self.followers = response["followers"]
             return True
         return False
 
@@ -26,19 +27,19 @@ class Outbox(object):
         self._url = url
 
     def load(self):
-        outbox = ap_utils.activity_request(self._url)
+        outbox = ap_utils.activity_request(self._url).json()
 
         items = None
-        if "first" in outbox.data:
-            if type(outbox.data["first"]) == dict:
+        if "first" in outbox:
+            if type(outbox["first"]) == dict:
                 # pleroma
-                items = outbox.data["first"]["orderedItems"]
+                items = outbox["first"]["orderedItems"]
             else:
                 # mastodon
-                first = ap_utils.activity_request(outbox.data["first"])
-                items = first.data["orderedItems"]
+                first = ap_utils.activity_request(outbox["first"]).json()
+                items = first["orderedItems"]
         else:
-            items = outbox.data["orderedItems"]
+            items = outbox["orderedItems"]
         return items
 
 class Inbox(object):
@@ -58,5 +59,5 @@ class Inbox(object):
         headers.append(["signature", signature])
 
         return ap_utils.activity_request(self._url, activity.format(sender),
-            method="POST", headers=dict(headers)).data
+            method="POST", headers=dict(headers)).json()
 
diff --git a/modules/fediverse/ap_utils.py b/modules/fediverse/ap_utils.py
index bedc2f1b..fc6ea5fd 100644
--- a/modules/fediverse/ap_utils.py
+++ b/modules/fediverse/ap_utils.py
@@ -26,7 +26,7 @@ def activity_request(url, data=None, method="GET", type=ACTIVITY_TYPE,
         headers = {"Accept": type}
 
     request = utils.http.Request(url, headers=headers,
-        content_type=content_type, post_data=data, method=method, json=True,
+        content_type=content_type, post_data=data, method=method,
         json_body=True, fallback_encoding="utf8")
     return utils.http.request(request)
 
@@ -64,7 +64,7 @@ def find_actor(username, instance):
 
     actor_url = None
     if webfinger.code == 200:
-        for link in webfinger.data["links"]:
+        for link in webfinger.json()["links"]:
             if link["type"] == ACTIVITY_TYPE:
                 return link["href"]
     else:
@@ -128,15 +128,15 @@ def format_note(actor, note, type="Create"):
     if type == "Announce":
         retoot_url = note
         retoot_instance = urllib.parse.urlparse(retoot_url).hostname
-        retoot = activity_request(retoot_url)
-        retoot_url = retoot.data.get("url", retoot.data["id"])
+        retoot = activity_request(retoot_url).json()
+        retoot_url = retoot.get("url", retoot["id"])
 
-        original_tooter = ap_actor.Actor(retoot.data["attributedTo"])
+        original_tooter = ap_actor.Actor(retoot["attributedTo"])
         original_tooter.load()
         retooted_user = "@%s@%s" % (original_tooter.username, retoot_instance)
-        retoot_content = _content(retoot.data)
+        retoot_content = _content(retoot)
 
-        return (retoot.data.get("summary", None),  "%s (boost %s): %s" % (
+        return (retoot.get("summary", None),  "%s (boost %s): %s" % (
             actor.username, retooted_user, retoot_content), retoot_url)
 
     elif type == "Create":