X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer.ex;h=f2bf93abb26c5ba84879bc653aa36144dd6a7b1d;hb=a9b2ad17596d1b6deca646239a95e94dc644ebf3;hp=b0dd85bbb77870c01d2a94df661e2bb6266f8bff;hpb=7469616f44ddca66858e6d64040b24b7986a742e;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 b0dd85bbb..f2bf93abb 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -3,7 +3,56 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
   alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ObjectRepresenter}
   alias Pleroma.Activity
 
+
+  defp user_by_ap_id(user_list, ap_id) do
+    Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end)
+  end
+
+  def to_map(%Activity{data: %{"type" => "Announce", "actor" => actor}} = activity, %{users: users, announced_activity: announced_activity} = opts) do
+    user = user_by_ap_id(users, actor)
+    created_at = get_in(activity.data, ["published"])
+    |> date_to_asctime
+
+    text = "#{user.nickname} retweeted a status."
+
+    announced_user = user_by_ap_id(users, announced_activity.data["actor"])
+    retweeted_status = to_map(announced_activity, Map.merge(%{user: announced_user}, opts))
+    %{
+      "id" => activity.id,
+      "user" => UserRepresenter.to_map(user, opts),
+      "statusnet_html" => text,
+      "text" => text,
+      "is_local" => true,
+      "is_post_verb" => false,
+      "uri" => "tag:#{activity.data["id"]}:objectType=note",
+      "created_at" => created_at,
+      "retweeted_status" => retweeted_status
+    }
+  end
+
+  def to_map(%Activity{data: %{"type" => "Like"}} = activity, %{user: user, liked_activity: liked_activity} = opts) do
+    created_at = get_in(activity.data, ["published"])
+    |> date_to_asctime
+
+    text = "#{user.nickname} favorited a status."
+
+    %{
+      "id" => activity.id,
+      "user" => UserRepresenter.to_map(user, opts),
+      "statusnet_html" => text,  # TODO: add summary
+      "text" => text,
+      "is_local" => true,
+      "is_post_verb" => false,
+      "uri" => "tag:#{activity.data["id"]}:objectType=Favourite",
+      "created_at" => created_at,
+      "in_reply_to_status_id" => liked_activity.id,
+    }
+  end
+
   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),
@@ -12,14 +61,19 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "text" => "",
       "is_local" => true,
       "is_post_verb" => false,
-      "created_at" => get_in(activity.data, ["published"]),
+      "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
+    like_count = get_in(activity.data, ["object", "like_count"]) || 0
+    announcement_count = get_in(activity.data, ["object", "announcement_count"]) || 0
+    favorited = opts[:for] && opts[:for].ap_id in (activity.data["object"]["likes"] || [])
+    repeated = opts[:for] && opts[:for].ap_id in (activity.data["object"]["announcements"] || [])
 
     mentions = opts[:mentioned] || []
 
@@ -36,11 +90,23 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "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"],
       "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
-      "attentions" => attentions
+      "attentions" => attentions,
+      "fave_num" => like_count,
+      "repeat_num" => announcement_count,
+      "favorited" => !!favorited,
+      "repeated" => !!repeated,
     }
   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