From c3dfa1970f33db5df8eca36cadbf18ccd7229240 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 1 Aug 2017 12:41:46 +0200
Subject: [PATCH] Don't crash on activity handling problems.

---
 lib/pleroma/web/ostatus/ostatus.ex | 43 ++++++++++++++++++------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 4187afa9d..d9a5924dc 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -32,25 +32,34 @@ def handle_incoming(xml_string) do
       {:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
       Logger.debug("Handling #{verb}")
 
-      case verb do
-        'http://activitystrea.ms/schema/1.0/follow' ->
-          with {:ok, activity} <- FollowHandler.handle(entry, doc), do: activity
-        'http://activitystrea.ms/schema/1.0/share' ->
-          with {:ok, activity, retweeted_activity} <- handle_share(entry, doc), do: [activity, retweeted_activity]
-        'http://activitystrea.ms/schema/1.0/favorite' ->
-          with {:ok, activity, favorited_activity} <- handle_favorite(entry, doc), do: [activity, favorited_activity]
-        _ ->
-          case object_type do
-            'http://activitystrea.ms/schema/1.0/note' ->
-              with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
-            'http://activitystrea.ms/schema/1.0/comment' ->
-              with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
-            _ ->
-              Logger.error("Couldn't parse incoming document")
-              nil
-          end
+      try do
+        case verb do
+          'http://activitystrea.ms/schema/1.0/follow' ->
+            with {:ok, activity} <- FollowHandler.handle(entry, doc), do: activity
+          'http://activitystrea.ms/schema/1.0/share' ->
+            with {:ok, activity, retweeted_activity} <- handle_share(entry, doc), do: [activity, retweeted_activity]
+          'http://activitystrea.ms/schema/1.0/favorite' ->
+            with {:ok, activity, favorited_activity} <- handle_favorite(entry, doc), do: [activity, favorited_activity]
+          _ ->
+            case object_type do
+              'http://activitystrea.ms/schema/1.0/note' ->
+                with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
+              'http://activitystrea.ms/schema/1.0/comment' ->
+                with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
+              _ ->
+                Logger.error("Couldn't parse incoming document")
+                nil
+            end
+        end
+      rescue
+        e ->
+          Logger.error("Error occured while handling activity")
+          Logger.error(inspect(e))
+          nil
       end
     end)
+    |> Enum.filter(&(&1))
+
     {:ok, activities}
   end