Attachment parsing, better magic key fetching.

[akkoma] / lib / pleroma / web / ostatus / ostatus.ex

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 4c72e9cd190eb0c386581975db882bde493d7230..f81751a256a4ae0e9089498f1fd39ad7bc89d88c 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -39,18 +39,44 @@ defmodule Pleroma.Web.OStatus do
     {:ok, activities}
   end
 
+  def get_attachments(entry) do
+    :xmerl_xpath.string('/entry/link[@rel="enclosure"]', entry)
+    |> Enum.map(fn (enclosure) ->
+      with href when not is_nil(href) <- string_from_xpath("/link/@href", enclosure),
+           type when not is_nil(type) <- string_from_xpath("/link/@type", enclosure) do
+        %{
+          "type" => "Attachment",
+          "url" => [%{
+                       "type" => "Link",
+                       "mediaType" => type,
+                       "href" => href
+                    }]
+        }
+      end
+    end)
+    |> Enum.filter(&(&1))
+  end
+
   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
+
+    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
+                  ActivityPub.generate_context_id
+                end
+              end
 
     to = [
       "https://www.w3.org/ns/activitystreams#Public"
@@ -71,11 +97,10 @@ defmodule Pleroma.Web.OStatus do
       "content" => content_html,
       "published" => date,
       "context" => context,
-      "actor" => actor.ap_id
+      "actor" => actor.ap_id,
+      "attachment" => attachments
     }
 
-    inReplyTo = string_from_xpath("/entry/thr:in-reply-to[1]/@ref", entry)
-
     object = if inReplyTo do
       Map.put(object, "inReplyTo", inReplyTo)
     else
@@ -120,11 +145,11 @@ defmodule Pleroma.Web.OStatus do
     with {:ok, info} <- gather_user_info(uri) do
       data = %{
         local: false,
-        name: info.name,
-        nickname: info.nickname <> "@" <> info.host,
-        ap_id: info.uri,
+        name: info["name"],
+        nickname: info["nickname"] <> "@" <> info["host"],
+        ap_id: info["uri"],
         info: info,
-        avatar: info.avatar
+        avatar: info["avatar"]
       }
       # TODO: Make remote user changeset
       # SHould enforce fqn nickname
@@ -154,8 +179,8 @@ defmodule Pleroma.Web.OStatus do
 
   def gather_user_info(username) do
     with {:ok, webfinger_data} <- WebFinger.finger(username),
-         {:ok, feed_data} <- Websub.gather_feed_data(webfinger_data.topic) do
-      {:ok, Map.merge(webfinger_data, feed_data) |> Map.put(:fqn, username)}
+         {:ok, feed_data} <- Websub.gather_feed_data(webfinger_data["topic"]) do
+      {:ok, Map.merge(webfinger_data, feed_data) |> Map.put("fqn", username)}
     else e ->
       Logger.debug("Couldn't gather info for #{username}")
       {:error, e}