X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=fa8c086d618b82f5d9751b899a504d4c6021c5a7;hb=95aa6a3c651fed9810889d3446f2a1d710efb55e;hp=7fd3a5eddd127bdcc82f09ce30828499518df3c0;hpb=5ff4a5eee3e76ba05dc80868350bb7b3698113d0;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 7fd3a5edd..fa8c086d6 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -9,7 +9,7 @@ defmodule Pleroma.Web.OStatus do
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.{WebFinger, Websub}
-  alias Pleroma.Web.OStatus.{FollowHandler, NoteHandler}
+  alias Pleroma.Web.OStatus.{FollowHandler, NoteHandler, DeleteHandler}
 
   def feed_path(user) do
     "#{user.ap_id}/feed.atom"
@@ -24,33 +24,48 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def handle_incoming(xml_string) do
-    doc = parse_document(xml_string)
-    entries = :xmerl_xpath.string('//entry', doc)
-
-    activities = Enum.map(entries, fn (entry) ->
-      {:xmlObj, :string, object_type} = :xmerl_xpath.string('string(/entry/activity:object-type[1])', entry)
-      {:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
-
-      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
+    with doc when doc != :error <- parse_document(xml_string) do
+      entries = :xmerl_xpath.string('//entry', doc)
+
+      activities = Enum.map(entries, fn (entry) ->
+        {:xmlObj, :string, object_type} = :xmerl_xpath.string('string(/entry/activity:object-type[1])', entry)
+        {:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
+        Logger.debug("Handling #{verb}")
+
+        try do
+          case verb do
+            'http://activitystrea.ms/schema/1.0/delete' ->
+              with {:ok, activity} <- DeleteHandler.handle_delete(entry, doc), do: activity
+            '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]
             _ ->
-              Logger.error("Couldn't parse incoming document")
-              nil
+              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
-      end
-    end)
-    {:ok, activities}
+        rescue
+          e ->
+            Logger.error("Error occured while handling activity")
+          Logger.error(inspect(e))
+          nil
+        end
+      end)
+      |> Enum.filter(&(&1))
+
+      {:ok, activities}
+    else
+      _e -> {:error, []}
+    end
   end
 
   def make_share(entry, doc, retweeted_activity) do
@@ -99,7 +114,7 @@ defmodule Pleroma.Web.OStatus do
     else e ->
         Logger.debug("Couldn't get, will try to fetch")
         with href when not is_nil(href) <- string_from_xpath("//activity:object[1]/link[@type=\"text/html\"]/@href", entry),
-             {:ok, [favorited_activity]} <- fetch_activity_from_html_url(href) do
+             {:ok, [favorited_activity]} <- fetch_activity_from_url(href) do
           {:ok, favorited_activity}
         else e -> Logger.debug("Couldn't find href: #{inspect(e)}")
         end
@@ -161,9 +176,9 @@ defmodule Pleroma.Web.OStatus do
 
     with false <- user.local,
          avatar <- make_avatar_object(doc),
-         bio when not is_nil(bio) <- string_from_xpath("//author[1]/summary", doc),
-         name when not is_nil(name) <- string_from_xpath("//author[1]/poco:displayName", doc),
-         new_data <- %{avatar: avatar, name: name, bio: bio},
+         bio <- string_from_xpath("//author[1]/summary", doc),
+         name <- string_from_xpath("//author[1]/poco:displayName", doc),
+         new_data <- %{avatar: avatar || old_data.avatar, name: name || old_data.name, bio: bio || old_data.bio},
          false <- new_data == old_data do
       change = Ecto.Changeset.change(user, new_data)
       Repo.update(change)
@@ -192,6 +207,11 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
+  def insert_or_update_user(data) do
+    cs = User.remote_user_creation(data)
+    Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
+  end
+
   def make_user(uri) do
     with {:ok, info} <- gather_user_info(uri) do
       data = %{
@@ -204,9 +224,7 @@ defmodule Pleroma.Web.OStatus do
       }
       with %User{} = user <- User.get_by_ap_id(data.ap_id) do
         {:ok, user}
-      else _e ->
-        cs = User.remote_user_creation(data)
-        Repo.insert(cs)
+      else _e -> insert_or_update_user(data)
       end
     end
   end
@@ -263,14 +281,30 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
+  def fetch_activity_from_atom_url(url) do
+    with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(url, [Accept: "application/atom+xml"], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
+      Logger.debug("Got document from #{url}, handling...")
+      handle_incoming(body)
+    else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+    end
+  end
+
   def fetch_activity_from_html_url(url) do
     Logger.debug("Trying to fetch #{url}")
     with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
-         {:ok, atom_url} <- get_atom_url(body),
-         {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
-      Logger.debug("Got document from #{url}, handling...")
-      handle_incoming(body)
+         {:ok, atom_url} <- get_atom_url(body) do
+        fetch_activity_from_atom_url(atom_url)
     else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
     end
   end
+
+  def fetch_activity_from_url(url) do
+    with {:ok, activities} when length(activities) > 0 <- fetch_activity_from_atom_url(url) do
+      {:ok, activities}
+    else
+      _e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do
+              {:ok, activities}
+            end
+    end
+  end
 end