From ca0643cb20ca8b7240a38a4865389b2dd6f70d42 Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Wed, 12 Apr 2023 23:27:34 +0000
Subject: [PATCH] Ignore errors when importing activities from outbox

---
 CHANGELOG.md                       | 4 ++++
 src/activitypub/fetcher/helpers.rs | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1186905..5f279ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+### Changed
+
+- Ignore errors when importing activities from outbox.
+
 ## [1.21.0] - 2023-04-12
 
 ### Added
diff --git a/src/activitypub/fetcher/helpers.rs b/src/activitypub/fetcher/helpers.rs
index a67a8fd..c600ce5 100644
--- a/src/activitypub/fetcher/helpers.rs
+++ b/src/activitypub/fetcher/helpers.rs
@@ -324,7 +324,13 @@ pub async fn import_from_outbox(
             db_client,
             &activity,
             true, // is authenticated
-        ).await?;
+        ).await.unwrap_or_else(|error| {
+            log::warn!(
+                "failed to process activity ({}): {}",
+                error,
+                activity,
+            );
+        });
     };
     Ok(())
 }