X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fstatus_view.ex;h=d97b2acb4c502d712c475416893b9bc17e8c95ac;hb=08bc31674218cd7ce634b008b7766b48e49c52e3;hp=550ecb74f6f11e82dec90450504cda45539061eb;hpb=3aaf6608c65a1d10058b4fc5b08038b3f630a143;p=akkoma

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 550ecb74f..d97b2acb4 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -2,11 +2,54 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   use Pleroma.Web, :view
   alias Pleroma.Web.MastodonAPI.{AccountView, StatusView}
   alias Pleroma.{User, Activity}
+  alias Pleroma.Web.CommonAPI.Utils
 
   def render("index.json", opts) do
     render_many(opts.activities, StatusView, "status.json", opts)
   end
 
+  def render("status.json", %{activity: %{data: %{"type" => "Announce", "object" => object}} = activity} = opts) do
+    user = User.get_cached_by_ap_id(activity.data["actor"])
+    created_at = Utils.to_masto_date(activity.data["published"])
+
+    reblogged = Activity.get_create_activity_by_object_ap_id(object)
+    reblogged = render("status.json", Map.put(opts, :activity, reblogged))
+
+    mentions = activity.data["to"]
+    |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
+    |> Enum.filter(&(&1))
+    |> Enum.map(fn (user) -> AccountView.render("mention.json", %{user: user}) end)
+
+    %{
+      id: to_string(activity.id),
+      uri: object,
+      url: nil, # TODO: This might be wrong, check with mastodon.
+      account: AccountView.render("account.json", %{user: user}),
+      in_reply_to_id: nil,
+      in_reply_to_account_id: nil,
+      reblog: reblogged,
+      content: reblogged[:content],
+      created_at: created_at,
+      reblogs_count: 0,
+      favourites_count: 0,
+      reblogged: false,
+      favourited: false,
+      muted: false,
+      sensitive: false,
+      spoiler_text: "",
+      visibility: "public",
+      media_attachments: [],
+      mentions: mentions,
+      tags: [],
+      application: %{
+        name: "Web",
+        website: nil
+      },
+      language: nil,
+      emojis: []
+    }
+  end
+
   def render("status.json", %{activity: %{data: %{"object" => object}} = activity} = opts) do
     user = User.get_cached_by_ap_id(activity.data["actor"])
 
@@ -26,19 +69,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
 
     attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
 
-    created_at = (object["published"] || "")
-    |> NaiveDateTime.from_iso8601!
-    |> NaiveDateTime.to_iso8601
-    |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
+    created_at = Utils.to_masto_date(object["published"])
 
     # TODO: Add cached version.
     reply_to = Activity.get_create_activity_by_object_ap_id(object["inReplyTo"])
     reply_to_user = reply_to && User.get_cached_by_ap_id(reply_to.data["actor"])
 
+    emojis = (activity.data["object"]["emoji"] || [])
+    |> Enum.map(fn {name, url} -> %{ shortcode: name, url: url, static_url: url } end)
+
     %{
-      id: activity.id,
+      id: to_string(activity.id),
       uri: object["id"],
-      url: object["external_url"],
+      url: object["external_url"] || object["id"],
       account: AccountView.render("account.json", %{user: user}),
       in_reply_to_id: reply_to && reply_to.id,
       in_reply_to_account_id: reply_to_user && reply_to_user.id,
@@ -51,7 +94,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       favourited: !!favorited,
       muted: false,
       sensitive: sensitive,
-      spoiler_text: "",
+      spoiler_text: object["summary"] || "",
       visibility: "public",
       media_attachments: attachments,
       mentions: mentions,
@@ -60,7 +103,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         name: "Web",
         website: nil
       },
-      language: nil
+      language: nil,
+      emojis: emojis
     }
   end