Some servers send empty lease_seconds requests...

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

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 274111ac9fe31d1c559f3dce934a26f48f7b2666..c64bb3a3bbcdf65852da48ab0b25a1e4afebfd2e 100644 (file)
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -1,5 +1,6 @@
 defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   alias Pleroma.Activity
+  alias Pleroma.Web.OStatus.UserRepresenter
   require Logger
 
   defp get_in_reply_to(%{"object" => %{ "inReplyTo" => in_reply_to}}) do
@@ -8,7 +9,17 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
   defp get_in_reply_to(_), do: []
 
-  def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user) do
+  defp get_mentions(to) do
+    Enum.map(to, fn
+      ("https://www.w3.org/ns/activitystreams#Public") ->
+        {:link, [rel: "mentioned", "ostatus:object-type": "http://activitystrea.ms/schema/1.0/collection", href: "http://activityschema.org/collection/public"], []}
+      (id) ->
+        {:link, [rel: "mentioned", "ostatus:object-type": "http://activitystrea.ms/schema/1.0/person", href: id], []}
+    end)
+  end
+
+  def to_simple_form(activity, user, with_author \\ false)
+  def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user, with_author) do
     h = fn(str) -> [to_charlist(str)] end
 
     updated_at = activity.updated_at
@@ -22,6 +33,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     end)
 
     in_reply_to = get_in_reply_to(activity.data)
+    author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
+    mentions = activity.data["to"] |> get_mentions
 
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
@@ -33,8 +46,20 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
       {:updated, h.(updated_at)},
       {:"ostatus:conversation", [], h.(activity.data["context"])},
       {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}
-    ] ++ attachments ++ in_reply_to
+    ] ++ attachments ++ in_reply_to ++ author ++ mentions
+  end
+
+  def wrap_with_entry(simple_form) do
+    [{
+      :entry, [
+        xmlns: 'http://www.w3.org/2005/Atom',
+        "xmlns:thr": 'http://purl.org/syndication/thread/1.0',
+        "xmlns:activity": 'http://activitystrea.ms/spec/1.0/',
+        "xmlns:poco": 'http://portablecontacts.net/spec/1.0',
+        "xmlns:ostatus": 'http://ostatus.org/schema/1.0'
+      ], simple_form
+    }]
   end
 
-  def to_simple_form(_,_), do: nil
+  def to_simple_form(_,_,_), do: nil
 end