X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fostatus%2Factivity_representer.ex;h=66e9b0ec23e21450e04355ed048329c8c6417be7;hb=60b4b0d725aefdca3eedd2d7708b0c96ee60c5f4;hp=dc7526598ce8e581f64eb84d96acde45b80ca867;hpb=5d7831ee3e1ff62c2e54fe47aa1a6cf3474e8578;p=akkoma

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index dc7526598..66e9b0ec2 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -3,7 +3,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   alias Pleroma.Web.OStatus.UserRepresenter
   require Logger
 
-  defp get_in_reply_to(%{"object" => %{ "inReplyTo" => in_reply_to}}) do
+  defp get_in_reply_to(%{"object" => %{"inReplyTo" => in_reply_to}}) do
     [{:"thr:in-reply-to", [ref: to_charlist(in_reply_to)], []}]
   end
 
@@ -114,11 +114,38 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
       {:"ostatus:conversation", [], h.(activity.data["context"])},
       {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
       {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []},
-      {:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []},
       {:"activity:object", retweeted_xml}
     ] ++ mentions ++ author
   end
 
+  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
+
+    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/activity']},
+      {:"activity:verb", ['http://activitystrea.ms/schema/1.0/follow']},
+      {:id, h.(activity.data["id"])},
+      {:title, ['#{user.nickname} started following #{activity.data["object"]}']},
+      {:content, [type: 'html'], ['#{user.nickname} started following #{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.(activity.data["object"])},
+        {:uri, h.(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, [
@@ -131,5 +158,5 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     }]
   end
 
-  def to_simple_form(_,_,_), do: nil
+  def to_simple_form(_, _, _), do: nil
 end