Merge branch 'develop' into feature/activitypub

[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 b2070ab23e1ecfb354a695e321445bc9ba954207..38f9fc478e381857a00663472bace236297a4d3e 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -4,7 +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
+  alias Pleroma.Web.CommonAPI
 
   @doc """
   Get the context for this note. Uses this:
@@ -52,6 +52,17 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
     |> 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
     [
       actor.follower_address
@@ -77,12 +88,14 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
     end
   end
 
+  # TODO: Clean this up a bit.
   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),
          inReplyTo <- (inReplyToActivity && inReplyToActivity.data["object"]["id"]) || inReplyTo,
@@ -92,15 +105,19 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
          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, []),
+         unlisted <- XML.string_from_xpath("//mastodon:scope", entry) == "unlisted",
+         cc <- if(unlisted, do: ["https://www.w3.org/ns/activitystreams#Public"], else: []),
+         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),
+         note <- note |> Map.put("cc", cc),
          # TODO: Handle this case in make_note_data
          note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note)
       do
-      res = ActivityPub.create(to, actor, context, note, %{}, date, false)
-      User.update_note_count(actor)
+      res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false, additional: %{"cc" => cc}})
+      User.increase_note_count(actor)
       res
     else
       %Activity{} = activity -> {:ok, activity}