Output proper published data in ostatus.

[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 076ead41adff3cd0244312bd1cfb7eb8e469dfbc..aa13cd62bb5860e1f32754caae3cb83c6aa7c72d 100644 (file)
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -28,10 +28,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   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
-    |> NaiveDateTime.to_iso8601
-    inserted_at = activity.inserted_at
-    |> NaiveDateTime.to_iso8601
+    updated_at = activity.data["published"]
+    inserted_at = activity.data["published"]
 
     attachments = Enum.map(activity.data["object"]["attachment"] || [], fn(attachment) ->
       url = hd(attachment["url"])
@@ -42,6 +40,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
     mentions = activity.data["to"] |> get_mentions
 
+    categories = (activity.data["object"]["tag"] || [])
+    |> Enum.map(fn (tag) -> {:category, [term: to_charlist(tag)], []} end)
+
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
       {:"activity:verb", ['http://activitystrea.ms/schema/1.0/post']},
@@ -53,16 +54,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
       {:"ostatus:conversation", [], h.(activity.data["context"])},
       {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
       {:link, [type: ['application/atom+xml'], href: h.(activity.data["object"]["id"]), rel: 'self'], []}
-    ] ++ attachments ++ in_reply_to ++ author ++ mentions
+    ] ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions
   end
 
   def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) do
     h = fn(str) -> [to_charlist(str)] end
 
-    updated_at = activity.updated_at
-    |> NaiveDateTime.to_iso8601
-    inserted_at = activity.inserted_at
-    |> NaiveDateTime.to_iso8601
+    updated_at = activity.data["published"]
+    inserted_at = activity.data["published"]
 
     in_reply_to = get_in_reply_to(activity.data)
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
@@ -89,10 +88,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_author) do
     h = fn(str) -> [to_charlist(str)] end
 
-    updated_at = activity.updated_at
-    |> NaiveDateTime.to_iso8601
-    inserted_at = activity.inserted_at
-    |> NaiveDateTime.to_iso8601
+    updated_at = activity.data["published"]
+    inserted_at = activity.data["published"]
 
     in_reply_to = get_in_reply_to(activity.data)
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
@@ -121,14 +118,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   def to_simple_form(%{data: %{"type" => "Follow"}} = activity, user, with_author) do
     h = fn(str) -> [to_charlist(str)] end
 
-    updated_at = activity.updated_at
-    |> NaiveDateTime.to_iso8601
-    inserted_at = activity.inserted_at
-    |> NaiveDateTime.to_iso8601
+    updated_at = activity.data["published"]
+    inserted_at = activity.data["published"]
 
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
 
-    mentions = activity.data["to"] |> get_mentions
+    mentions = (activity.data["to"] || []) |> get_mentions
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
       {:"activity:verb", ['http://activitystrea.ms/schema/1.0/follow']},
@@ -146,6 +141,34 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     ] ++ mentions ++ author
   end
 
+  # Only undos of follow for now. Will need to get redone once there are more
+  def to_simple_form(%{data: %{"type" => "Undo"}} = activity, user, with_author) do
+    h = fn(str) -> [to_charlist(str)] end
+
+    updated_at = activity.data["published"]
+    inserted_at = activity.data["published"]
+
+    author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
+    follow_activity = Activity.get_by_ap_id(activity.data["object"])
+
+    mentions = (activity.data["to"] || []) |> get_mentions
+    [
+      {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
+      {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},
+      {:id, h.(activity.data["id"])},
+      {:title, ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
+      {:content, [type: 'html'], ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
+      {:published, h.(inserted_at)},
+      {:updated, h.(updated_at)},
+      {:"activity:object", [
+        {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/person']},
+        {:id, h.(follow_activity.data["object"])},
+        {:uri, h.(follow_activity.data["object"])},
+      ]},
+      {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []},
+    ] ++ mentions ++ author
+  end
+
   def wrap_with_entry(simple_form) do
     [{
       :entry, [