From 476376dcb0b886fef92b4add3757993f5ce66a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sat, 6 Sep 2014 03:26:07 +0200
Subject: [PATCH] Don't retry Diaspora::AuthorXMLAuthorMismatch

They're not healable and seem to only occur on
Friendica posts
---
 app/workers/base.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/workers/base.rb b/app/workers/base.rb
index 1e6d4718e..c43f60929 100644
--- a/app/workers/base.rb
+++ b/app/workers/base.rb
@@ -12,7 +12,9 @@ module Workers
     def suppress_annoying_errors(&block)
       yield
     rescue Diaspora::ContactRequiredUnlessRequest,
-           Diaspora::RelayableObjectWithoutParent => e
+           Diaspora::RelayableObjectWithoutParent,
+            # Friendica seems to provoke these
+           Diaspora::AuthorXMLAuthorMismatch => e
       Rails.logger.info("error on receive: #{e.class}")
     rescue ActiveRecord::RecordInvalid => e
       Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}")