From 24a4fbe1f820e6ce13a969f39dd7676894987532 Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Sat, 17 Dec 2022 12:29:48 -0700
Subject: Catch all possible request errors

---
 activities/models/fan_out.py | 66 +++++++++++++++++++++++++++-----------------
 activities/models/post.py    |  2 +-
 2 files changed, 42 insertions(+), 26 deletions(-)

(limited to 'activities/models')

diff --git a/activities/models/fan_out.py b/activities/models/fan_out.py
index fd52acd..c522938 100644
--- a/activities/models/fan_out.py
+++ b/activities/models/fan_out.py
@@ -1,3 +1,4 @@
+import httpx
 from asgiref.sync import sync_to_async
 from django.db import models
 
@@ -52,21 +53,27 @@ class FanOutStates(StateGraph):
             case (FanOut.Types.post, False):
                 post = await fan_out.subject_post.afetch_full()
                 # Sign it and send it
-                await post.author.signed_request(
-                    method="post",
-                    uri=fan_out.identity.inbox_uri,
-                    body=canonicalise(post.to_create_ap()),
-                )
+                try:
+                    await post.author.signed_request(
+                        method="post",
+                        uri=fan_out.identity.inbox_uri,
+                        body=canonicalise(post.to_create_ap()),
+                    )
+                except httpx.RequestError:
+                    return
 
             # Handle sending remote posts update
             case (FanOut.Types.post_edited, False):
                 post = await fan_out.subject_post.afetch_full()
                 # Sign it and send it
-                await post.author.signed_request(
-                    method="post",
-                    uri=fan_out.identity.inbox_uri,
-                    body=canonicalise(post.to_update_ap()),
-                )
+                try:
+                    await post.author.signed_request(
+                        method="post",
+                        uri=fan_out.identity.inbox_uri,
+                        body=canonicalise(post.to_update_ap()),
+                    )
+                except httpx.RequestError:
+                    return
 
             # Handle deleting local posts
             case (FanOut.Types.post_deleted, True):
@@ -82,11 +89,14 @@ class FanOutStates(StateGraph):
             case (FanOut.Types.post_deleted, False):
                 post = await fan_out.subject_post.afetch_full()
                 # Send it to the remote inbox
-                await post.author.signed_request(
-                    method="post",
-                    uri=fan_out.identity.inbox_uri,
-                    body=canonicalise(post.to_delete_ap()),
-                )
+                try:
+                    await post.author.signed_request(
+                        method="post",
+                        uri=fan_out.identity.inbox_uri,
+                        body=canonicalise(post.to_delete_ap()),
+                    )
+                except httpx.RequestError:
+                    return
 
             # Handle local boosts/likes
             case (FanOut.Types.interaction, True):
@@ -101,11 +111,14 @@ class FanOutStates(StateGraph):
             case (FanOut.Types.interaction, False):
                 interaction = await fan_out.subject_post_interaction.afetch_full()
                 # Send it to the remote inbox
-                await interaction.identity.signed_request(
-                    method="post",
-                    uri=fan_out.identity.inbox_uri,
-                    body=canonicalise(interaction.to_ap()),
-                )
+                try:
+                    await interaction.identity.signed_request(
+                        method="post",
+                        uri=fan_out.identity.inbox_uri,
+                        body=canonicalise(interaction.to_ap()),
+                    )
+                except httpx.RequestError:
+                    return
 
             # Handle undoing local boosts/likes
             case (FanOut.Types.undo_interaction, True):  # noqa:F841
@@ -121,11 +134,14 @@ class FanOutStates(StateGraph):
             case (FanOut.Types.undo_interaction, False):  # noqa:F841
                 interaction = await fan_out.subject_post_interaction.afetch_full()
                 # Send an undo to the remote inbox
-                await interaction.identity.signed_request(
-                    method="post",
-                    uri=fan_out.identity.inbox_uri,
-                    body=canonicalise(interaction.to_undo_ap()),
-                )
+                try:
+                    await interaction.identity.signed_request(
+                        method="post",
+                        uri=fan_out.identity.inbox_uri,
+                        body=canonicalise(interaction.to_undo_ap()),
+                    )
+                except httpx.RequestError:
+                    return
 
             case _:
                 raise ValueError(
diff --git a/activities/models/post.py b/activities/models/post.py
index 8a9aabb..d6914c9 100644
--- a/activities/models/post.py
+++ b/activities/models/post.py
@@ -727,7 +727,7 @@ class Post(StatorModel):
                     response = async_to_sync(SystemActor().signed_request)(
                         method="get", uri=object_uri
                     )
-                except (httpx.RequestError, httpx.ConnectError):
+                except httpx.RequestError:
                     raise cls.DoesNotExist(f"Could not fetch {object_uri}")
                 if response.status_code in [404, 410]:
                     raise cls.DoesNotExist(f"No post at {object_uri}")
-- 
cgit v1.2.3