X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fstatus_view.ex;h=55675ae1c38b624f71db2e4df5ee76b020a0a0b4;hb=0300bc5569a6fd8b728659dc5198896d25f41c80;hp=686ffd29de26e6d4db5f2c6c554095ff163f591d;hpb=2b21c05105d550d09d85807246be696a1aed4b32;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 686ffd29d..55675ae1c 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -1,12 +1,56 @@
 defmodule Pleroma.Web.MastodonAPI.StatusView do
   use Pleroma.Web, :view
   alias Pleroma.Web.MastodonAPI.{AccountView, StatusView}
-  alias Pleroma.User
+  alias Pleroma.{User, Activity}
+  alias Pleroma.Web.CommonAPI.Utils
+  alias Pleroma.Web.MediaProxy
 
   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.recipients
+    |> 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"])
 
@@ -14,9 +58,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     announcement_count = object["announcement_count"] || 0
 
     tags = object["tag"] || []
-    sensitive = Enum.member?(tags, "nsfw")
+    sensitive = object["sensitive"] || Enum.member?(tags, "nsfw")
 
-    mentions = activity.data["to"]
+    mentions = activity.recipients
     |> 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)
@@ -26,32 +70,57 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
 
     attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
 
+    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: object["inReplyToStatusId"],
-      in_reply_to_account_id: nil,
+      in_reply_to_id: reply_to && reply_to.id,
+      in_reply_to_account_id: reply_to_user && reply_to_user.id,
       reblog: nil,
       content: HtmlSanitizeEx.basic_html(object["content"]),
-      created_at: object["published"],
+      created_at: created_at,
       reblogs_count: announcement_count,
       favourites_count: like_count,
       reblogged: !!repeated,
       favourited: !!favorited,
       muted: false,
       sensitive: sensitive,
-      spoiler_text: "",
-      visibility: "public",
-      media_attachments: attachments,
+      spoiler_text: object["summary"] || "",
+      visibility: get_visibility(object),
+      media_attachments: attachments |> Enum.take(4),
       mentions: mentions,
       tags: [], # fix,
-      application: nil,
-      language: nil
+      application: %{
+        name: "Web",
+        website: nil
+      },
+      language: nil,
+      emojis: emojis
     }
   end
 
+  def get_visibility(object) do
+    public = "https://www.w3.org/ns/activitystreams#Public"
+    to = object["to"] || []
+    cc = object["cc"] || []
+    cond do
+      public in to -> "public"
+      public in cc -> "unlisted"
+      Enum.any?(to, &(String.contains?(&1, "/followers"))) -> "private"
+      true -> "direct"
+    end
+  end
+
   def render("attachment.json", %{attachment: attachment}) do
     [%{"mediaType" => media_type, "href" => href} | _] = attachment["url"]
 
@@ -61,11 +130,14 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       true -> "unknown"
     end
 
+    << hash_id::signed-32, _rest::binary >> = :crypto.hash(:md5, href)
+
     %{
-      id: attachment["uuid"],
-      url: href,
+      id: to_string(attachment["id"] || hash_id),
+      url: MediaProxy.url(href),
       remote_url: href,
-      preview_url: href,
+      preview_url: MediaProxy.url(href),
+      text_url: href,
       type: type
     }
   end