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 f675901b208305f5551b2cf4a4999a4b0eb007cf..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
@@ -55,8 +58,9 @@ 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 make_to_list(actor, mentions) do
@@ -92,7 +96,9 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
          # 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}