X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fstatus_view.ex;h=bf9862419c0a5ebc29f66127aabb037011aa9735;hb=b58b35bf5619bd3b4d89a224e3b032c230c01884;hp=45e7d45f42db9105700a99b84b179113d1be4ebb;hpb=2b7efff71bc6a59f235de9cfea0ad244f201ba25;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 45e7d45f4..bf9862419 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     render_many(opts.activities, StatusView, "status.json", opts)
   end
 
-  def render("status.json", %{activity: %{data: %{"object" => object}} = activity}) do
+  def render("status.json", %{activity: %{data: %{"object" => object}} = activity} = opts) do
     user = User.get_cached_by_ap_id(activity.data["actor"])
 
     like_count = object["like_count"] || 0
@@ -21,6 +21,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     |> Enum.filter(&(&1))
     |> Enum.map(fn (user) -> AccountView.render("mention.json", %{user: user}) end)
 
+    repeated = opts[:for] && opts[:for].ap_id in (object["announcements"] || [])
+    favorited = opts[:for] && opts[:for].ap_id in (object["likes"] || [])
+
+    attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
+
     %{
       id: activity.id,
       uri: object["id"],
@@ -33,17 +38,37 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       created_at: object["published"],
       reblogs_count: announcement_count,
       favourites_count: like_count,
-      reblogged: false,
-      favourited: false, # fix
+      reblogged: !!repeated,
+      favourited: !!favorited,
       muted: false,
       sensitive: sensitive,
       spoiler_text: "",
       visibility: "public",
-      media_attachments: [], # fix
+      media_attachments: attachments,
       mentions: mentions,
       tags: [], # fix,
       application: nil,
       language: nil
     }
   end
+
+  def render("attachment.json", %{attachment: attachment}) do
+    [%{"mediaType" => media_type, "href" => href} | _] = attachment["url"]
+
+    type = cond do
+      String.contains?(media_type, "image") -> "image"
+      String.contains?(media_type, "video") -> "video"
+      true -> "unknown"
+    end
+
+    << hash_id::32, _rest::binary >> = :crypto.hash(:md5, href)
+
+    %{
+      id: attachment["id"] || hash_id,
+      url: href,
+      remote_url: href,
+      preview_url: href,
+      type: type
+    }
+  end
 end