X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=7aa1ac4acfd8d5882f16ff8d6b1a7339107ee547;hb=018a1a390fdb72652c615c28ac36f1b9a6a84d82;hp=f8e33bc7e220aa27d6026596a28bb977c4b746b9;hpb=8a0d2b33d8c9a1cef347c5daf5589a2245eb01b0;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index f8e33bc7e..7aa1ac4ac 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -3,7 +3,7 @@ defmodule Pleroma.Web.OStatus do
   import Pleroma.Web.XML
   require Logger
 
-  alias Pleroma.{Repo, User, Web}
+  alias Pleroma.{Repo, User, Web, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.{WebFinger, Websub}
 
@@ -28,8 +28,9 @@ defmodule Pleroma.Web.OStatus do
 
       case object_type do
         'http://activitystrea.ms/schema/1.0/note' ->
-          {:ok, activity} = handle_note(entry, doc)
-          activity
+          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
         _ ->
           Logger.error("Couldn't parse incoming document")
           nil
@@ -38,20 +39,24 @@ defmodule Pleroma.Web.OStatus do
     {:ok, activities}
   end
 
-  # TODO
-  # wire up replies
   def handle_note(entry, doc \\ nil) do
     content_html = string_from_xpath("/entry/content[1]", entry)
 
-    uri = string_from_xpath("/entry/author/uri[1]", entry) || string_from_xpath("/feed/author/uri[1]", doc)
-    {:ok, actor} = find_or_make_user(uri)
+    [author] = :xmerl_xpath.string('//author[1]', doc)
+    {:ok, actor} = find_make_or_update_user(author)
+    inReplyTo = string_from_xpath("/entry/thr:in-reply-to[1]/@ref", entry)
 
-    context = string_from_xpath("/entry/ostatus:conversation[1]", entry) |> String.trim
-    context = if String.length(context) > 0 do
-      context
-    else
-      ActivityPub.generate_context_id
-    end
+    context = (string_from_xpath("/entry/ostatus:conversation[1]", entry) || "") |> String.trim
+
+    context = with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do
+                context
+              else _e ->
+                if String.length(context) > 0 do
+                  context
+                else
+                  ActivityPub.generate_context_id
+                end
+              end
 
     to = [
       "https://www.w3.org/ns/activitystreams#Public"
@@ -66,6 +71,7 @@ defmodule Pleroma.Web.OStatus do
     id = string_from_xpath("/entry/id", entry)
 
     object = %{
+      "id" => id,
       "type" => "Note",
       "to" => to,
       "content" => content_html,
@@ -74,15 +80,31 @@ defmodule Pleroma.Web.OStatus do
       "actor" => actor.ap_id
     }
 
-    inReplyTo = string_from_xpath("/entry/thr:in-reply-to[1]/@href", entry)
-
     object = if inReplyTo do
       Map.put(object, "inReplyTo", inReplyTo)
     else
       object
     end
 
-    ActivityPub.create(to, actor, context, object, %{"id" => id}, date)
+    # TODO: Bail out sooner and use transaction.
+    if Object.get_by_ap_id(id) do
+      {:error, "duplicate activity"}
+    else
+      ActivityPub.create(to, actor, context, object, %{}, date, false)
+    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.avatar != avatar do
+        change = Ecto.Changeset.change(user, %{avatar: avatar})
+        Repo.update(change)
+      else
+        {:ok, user}
+      end
+    end
   end
 
   def find_or_make_user(uri) do
@@ -105,7 +127,8 @@ defmodule Pleroma.Web.OStatus do
         name: info.name,
         nickname: info.nickname <> "@" <> info.host,
         ap_id: info.uri,
-        info: info
+        info: info,
+        avatar: info.avatar
       }
       # TODO: Make remote user changeset
       # SHould enforce fqn nickname
@@ -114,9 +137,9 @@ defmodule Pleroma.Web.OStatus do
   end
 
   # TODO: Just takes the first one for now.
-  defp make_avatar_object(author_doc) do
-    href = string_from_xpath("/author[1]/link[@rel=\"avatar\"]/@href", author_doc)
-    type = string_from_xpath("/author[1]/link[@rel=\"avatar\"]/@type", author_doc)
+  def make_avatar_object(author_doc) do
+    href = string_from_xpath("//author[1]/link[@rel=\"avatar\"]/@href", author_doc)
+    type = string_from_xpath("//author[1]/link[@rel=\"avatar\"]/@type", author_doc)
 
     if href do
       %{