X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=3e2acdd0facba28119100c3a043c05709f33124b;hb=a441ee7d21de38b27004afe11fd8ee5d0f865ccf;hp=949b36664d921722ce08d0894afa84ce41cfd36b;hpb=70024632ba32121bd63a439b2d708d4b4ff1a190;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 949b36664..3e2acdd0f 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
+  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} <- handle_note(entry, doc), do: activity
-            'http://activitystrea.ms/schema/1.0/comment' ->
-              with {:ok, activity} <- 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
@@ -63,8 +78,7 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def handle_share(entry, doc) do
-    with [object] <- :xmerl_xpath.string('/entry/activity:object', entry),
-         {:ok, retweeted_activity} <-  handle_note(object, object),
+    with {:ok, retweeted_activity} <- get_or_build_object(entry),
          {:ok, activity} <- make_share(entry, doc, retweeted_activity) do
       {:ok, activity, retweeted_activity}
     else
@@ -81,6 +95,17 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
+  def get_or_build_object(entry) do
+    with {:ok, activity} <- get_or_try_fetching(entry) do
+      {:ok, activity}
+    else
+      _e ->
+        with [object] <- :xmerl_xpath.string('/entry/activity:object', entry) do
+          NoteHandler.handle_note(object, object)
+        end
+    end
+  end
+
   def get_or_try_fetching(entry) do
     Logger.debug("Trying to get entry from db")
     with id when not is_nil(id) <- string_from_xpath("//activity:object[1]/id", entry),
@@ -89,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
@@ -123,6 +148,10 @@ defmodule Pleroma.Web.OStatus do
     |> Enum.filter(&(&1))
   end
 
+  @doc """
+    Gets the content from a an entry. Will add the cw text to the body for cw'd
+    Mastodon notes.
+  """
   def get_content(entry) do
     base_content = string_from_xpath("//content", entry)
 
@@ -133,84 +162,35 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
-  def handle_note(entry, doc \\ nil) do
-    content_html = get_content(entry)
-
-    [author] = :xmerl_xpath.string('//author[1]', doc)
-    {:ok, actor} = find_make_or_update_user(author)
-    inReplyTo = string_from_xpath("//thr:in-reply-to[1]/@ref", entry)
-
-    if inReplyTo && !Object.get_cached_by_ap_id(inReplyTo) do
-      inReplyToHref = string_from_xpath("//thr:in-reply-to[1]/@href", entry)
-      if inReplyToHref do
-        fetch_activity_from_html_url(inReplyToHref)
-      else
-        Logger.debug("Couldn't find a href link to #{inReplyTo}")
-      end
-    end
-
-    context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim
-
-    attachments = get_attachments(entry)
-
-    context = with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do
-                context
-              else _e ->
-                if String.length(context) > 0 do
-                  context
-                else
-                  Utils.generate_context_id
-                end
-              end
-
-    to = [
-      "https://www.w3.org/ns/activitystreams#Public",
-      User.ap_followers(actor)
-    ]
-
-    mentions = :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry)
-    |> Enum.map(fn(person) -> string_from_xpath("@href", person) end)
-
-    to = to ++ mentions
-
-    date = string_from_xpath("//published", entry)
-    id = string_from_xpath("//id", entry)
+  def get_tags(entry) do
+    :xmerl_xpath.string('//category', entry)
+    |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) |> String.downcase end)
+  end
 
-    object = %{
-      "id" => id,
-      "type" => "Note",
-      "to" => to,
-      "content" => content_html,
-      "published" => date,
-      "context" => context,
-      "actor" => actor.ap_id,
-      "attachment" => attachments
+  def maybe_update(doc, user) do
+    old_data = %{
+      avatar: user.avatar,
+      bio: user.bio,
+      name: user.name
     }
 
-    object = if inReplyTo do
-      Map.put(object, "inReplyTo", inReplyTo)
-    else
-      object
-    end
-
-    # TODO: Bail out sooner and use transaction.
-    if Object.get_by_ap_id(id) do
-      {:ok, Activity.get_create_activity_by_object_ap_id(id)}
-    else
-      ActivityPub.create(to, actor, context, object, %{}, date, false)
+    with false <- user.local,
+         avatar <- make_avatar_object(doc),
+         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)
+    else e ->
+      {:ok, user}
     end
   end
 
   def find_make_or_update_user(doc) do
     uri = string_from_xpath("//author/uri[1]", doc)
     with {:ok, user} <- find_or_make_user(uri) do
-      avatar = make_avatar_object(doc)
-      if !user.local && user.avatar != avatar do
-        change = Ecto.Changeset.change(user, %{avatar: avatar})
-        Repo.update(change)
-      else
-        {:ok, user}
-      end
+      maybe_update(doc, user)
     end
   end
 
@@ -227,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 = %{
@@ -234,13 +219,12 @@ defmodule Pleroma.Web.OStatus do
         nickname: info["nickname"] <> "@" <> info["host"],
         ap_id: info["uri"],
         info: info,
-        avatar: info["avatar"]
+        avatar: info["avatar"],
+        bio: info["bio"]
       }
       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
@@ -297,14 +281,30 @@ defmodule Pleroma.Web.OStatus do
     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),
-         {: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) do
+  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) 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} <- 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