Add delete activity representer.

[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 cbbe8ba0daa7f96885f0317a283c904c5f02f5ae..54c9e85d553dd12c3fb6fac6c6c0e985ebfbf0ed 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler 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)
+        OStatus.fetch_activity_from_url(inReplyToHref)
       else
         Logger.debug("Couldn't find a href link to #{inReplyTo}")
       end
@@ -24,7 +24,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
@@ -37,18 +40,40 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
     end
   end
 
-  def get_mentions(entry) do
+  def get_people_mentions(entry) do
     :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry)
     |> Enum.map(fn(person) -> XML.string_from_xpath("@href", person) end)
   end
 
+  def get_collection_mentions(entry) do
+    transmogrify = fn
+      ("http://activityschema.org/collection/public") ->
+        "https://www.w3.org/ns/activitystreams#Public"
+      (group) ->
+        group
+    end
+
+    :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"]', entry)
+    |> Enum.map(fn(collection) -> XML.string_from_xpath("@href", collection) |> transmogrify.() end)
+  end
+
+  def get_mentions(entry) do
+    (get_people_mentions(entry)
+      ++ get_collection_mentions(entry))
+    |> Enum.filter(&(&1))
+  end
+
   def make_to_list(actor, mentions) do
     [
-      "https://www.w3.org/ns/activitystreams#Public",
-      User.ap_followers(actor)
+      actor.follower_address
     ] ++ mentions
   end
 
+  def add_external_url(note, entry) do
+    url = XML.string_from_xpath("//link[@rel='alternate' and @type='text/html']/@href", entry)
+    Map.put(note, "external_url", url)
+  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),
@@ -66,10 +91,14 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
          date <- XML.string_from_xpath("//published", entry),
          note <- TwitterAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, []),
          note <- note |> Map.put("id", id) |> Map.put("tag", tags),
+         note <- note |> Map.put("published", date),
+         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, actor, context, note, %{}, date, false)
+      User.update_note_count(actor)
+      res
     else
       %Activity{} = activity -> {:ok, activity}
       e -> {:error, e}