X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer.ex;h=9e4ffaefe618511dde0fd38c59a7d395d2144e9b;hb=84c20128100ad5b074720c44a24375b809a0ce09;hp=05d1306390592abc836374a13be8363c5808c148;hpb=0dd337330421fb9efe580275485d948d60da328a;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 05d130639..9e4ffaefe 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -1,22 +1,59 @@
 defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
-  alias Pleroma.Web.TwitterAPI.Representers.UserRepresenter
+  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ObjectRepresenter}
   alias Pleroma.Activity
 
+
+  def to_map(%Activity{data: %{"type" => "Follow"}} = activity, %{user: user} = opts) do
+    created_at = get_in(activity.data, ["published"])
+    |> date_to_asctime
+
+    %{
+      "id" => activity.id,
+      "user" => UserRepresenter.to_map(user, opts),
+      "attentions" => [],
+      "statusnet_html" => "",  # TODO: add summary
+      "text" => "",
+      "is_local" => true,
+      "is_post_verb" => false,
+      "created_at" => created_at,
+      "in_reply_to_status_id" => nil,
+    }
+  end
+
   def to_map(%Activity{} = activity, %{user: user} = opts) do
     content = get_in(activity.data, ["object", "content"])
-    published = get_in(activity.data, ["object", "published"])
+    created_at = get_in(activity.data, ["object", "published"])
+    |> date_to_asctime
+
+    mentions = opts[:mentioned] || []
+
+    attentions = activity.data["to"]
+    |> Enum.map(fn (ap_id) -> Enum.find(mentions, fn(user) -> ap_id == user.ap_id end) end)
+    |> Enum.filter(&(&1))
+    |> Enum.map(fn (user) -> UserRepresenter.to_map(user, opts) end)
+
     %{
       "id" => activity.id,
       "user" => UserRepresenter.to_map(user, opts),
       "attentions" => [],
       "statusnet_html" => content,
-      "text" => content,
+      "text" => HtmlSanitizeEx.strip_tags(content),
       "is_local" => true,
       "is_post_verb" => true,
-      "created_at" => published,
+      "created_at" => created_at,
       "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"],
-      "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"]
+      "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"],
+      "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
+      "attentions" => attentions
     }
   end
+
+  defp date_to_asctime(date) do
+    with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do
+      Calendar.Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y")
+    else e ->
+      ""
+    end
+  end
 end