ActivityPub: Refactor create function.

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

diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index e0e4afef690f6283d5a69c996692e441cdd16e35..7b7ed2d5a4a09078b1dd5761849867deefd918e7 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -4,18 +4,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
   alias Pleroma.{Object, User, Activity}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Utils
-  alias Pleroma.Web.TwitterAPI
-
-  def fetch_replied_to_activity(entry, inReplyTo) do
-    if inReplyTo && !Object.get_cached_by_ap_id(inReplyTo) do
-      inReplyToHref = XML.string_from_xpath("//thr:in-reply-to[1]/@href", entry)
-      if inReplyToHref do
-        OStatus.fetch_activity_from_html_url(inReplyToHref)
-      else
-        Logger.debug("Couldn't find a href link to #{inReplyTo}")
-      end
-    end
-  end
+  alias Pleroma.Web.CommonAPI
 
   @doc """
   Get the context for this note. Uses this:
@@ -24,7 +13,10 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
   3. A newly generated context id.
   """
   def get_context(entry, inReplyTo) do
-    context = (XML.string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim
+    context = (
+      XML.string_from_xpath("//ostatus:conversation[1]", entry)
+      || XML.string_from_xpath("//ostatus:conversation[1]/@ref", entry)
+      || "") |> String.trim
 
     with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do
       context
@@ -55,13 +47,25 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
   end
 
   def get_mentions(entry) do
-    get_people_mentions(entry)
-    ++ get_collection_mentions(entry)
+    (get_people_mentions(entry)
+      ++ get_collection_mentions(entry))
+    |> Enum.filter(&(&1))
+  end
+
+  def get_emoji(entry) do
+    try do
+      :xmerl_xpath.string('//link[@rel="emoji"]', entry)
+      |> Enum.reduce(%{}, fn(emoji, acc) ->
+        Map.put(acc, XML.string_from_xpath("@name", emoji), XML.string_from_xpath("@href", emoji))
+      end)
+    rescue
+      _e -> nil
+    end
   end
 
   def make_to_list(actor, mentions) do
     [
-      User.ap_followers(actor)
+      actor.follower_address
     ] ++ mentions
   end
 
@@ -70,29 +74,47 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
     Map.put(note, "external_url", url)
   end
 
+  def fetch_replied_to_activity(entry, inReplyTo) do
+    with %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(inReplyTo) do
+      activity
+    else
+      _e ->
+        with inReplyToHref when not is_nil(inReplyToHref) <- XML.string_from_xpath("//thr:in-reply-to[1]/@href", entry),
+             {:ok, [activity | _]} <- OStatus.fetch_activity_from_url(inReplyToHref) do
+          activity
+        else
+          _e -> nil
+        end
+    end
+  end
+
   def handle_note(entry, doc \\ nil) do
     with id <- XML.string_from_xpath("//id", entry),
          activity when is_nil(activity) <- Activity.get_create_activity_by_object_ap_id(id),
          [author] <- :xmerl_xpath.string('//author[1]', doc),
          {:ok, actor} <- OStatus.find_make_or_update_user(author),
          content_html <- OStatus.get_content(entry),
+         cw <- OStatus.get_cw(entry),
          inReplyTo <- XML.string_from_xpath("//thr:in-reply-to[1]/@ref", entry),
-         _inReplyToActivity <- fetch_replied_to_activity(entry, inReplyTo),
-         inReplyToActivity <- Activity.get_create_activity_by_object_ap_id(inReplyTo),
+         inReplyToActivity <- fetch_replied_to_activity(entry, inReplyTo),
+         inReplyTo <- (inReplyToActivity && inReplyToActivity.data["object"]["id"]) || inReplyTo,
          attachments <- OStatus.get_attachments(entry),
          context <- get_context(entry, inReplyTo),
          tags <- OStatus.get_tags(entry),
          mentions <- get_mentions(entry),
          to <- make_to_list(actor, mentions),
          date <- XML.string_from_xpath("//published", entry),
-         note <- TwitterAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, []),
+         note <- CommonAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, [], cw),
          note <- note |> Map.put("id", id) |> Map.put("tag", tags),
          note <- note |> Map.put("published", date),
+         note <- note |> Map.put("emoji", get_emoji(entry)),
          note <- add_external_url(note, entry),
          # TODO: Handle this case in make_note_data
          note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note)
       do
-      ActivityPub.create(to, actor, context, note, %{}, date, false)
+      res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false})
+      User.increase_note_count(actor)
+      res
     else
       %Activity{} = activity -> {:ok, activity}
       e -> {:error, e}