From 5cfc9efad3a26730f65b389511fa845ccad7857e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Oct 2016 14:46:34 +0200
Subject: [PATCH] Update OStatus2 to handle malformed Salmon without raising
 unexpected exceptions

---
 Gemfile.lock                                | 6 ++----
 app/services/process_interaction_service.rb | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 82e3bdaf4f..8e33e85ce9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,12 +166,11 @@ GEM
     minitest (5.9.0)
     multi_json (1.12.1)
     nio4r (1.2.1)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     oj (2.17.3)
     orm_adapter (0.5.0)
-    ostatus2 (0.3.1)
+    ostatus2 (0.3.2)
       addressable (~> 2.4)
       http (~> 2.0)
       nokogiri (~> 1.6)
@@ -187,7 +186,6 @@ GEM
     parser (2.3.1.2)
       ast (~> 2.2)
     pg (0.18.4)
-    pkg-config (1.1.7)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 31c7c46a53..0768579ef4 100644
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -35,7 +35,7 @@ class ProcessInteractionService < BaseService
         delete_post!(xml, account)
       end
     end
-  rescue Goldfinger::Error, HTTP::Error
+  rescue Goldfinger::Error, HTTP::Error, OStatus2::BadSalmonError
     nil
   end