Merge branch 'feature/longfox' into 'develop'

[akkoma] / lib / pleroma / web / mastodon_api / views / status_view.ex

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index a0acdb0ac652f0e5dd0661a1284b2c8ccca90d29..64f3155975ccf6968a258373fb33a798909451d7 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   alias Pleroma.Web.MastodonAPI.{AccountView, StatusView}
   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)
@@ -46,7 +47,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         website: nil
       },
       language: nil,
-      emoji: []
+      emojis: []
     }
   end
 
@@ -96,7 +97,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       sensitive: sensitive,
       spoiler_text: object["summary"] || "",
       visibility: "public",
-      media_attachments: attachments,
+      media_attachments: attachments |> Enum.take(4),
       mentions: mentions,
       tags: [], # fix,
       application: %{
@@ -120,10 +121,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     << hash_id::signed-32, _rest::binary >> = :crypto.hash(:md5, href)
 
     %{
-      id: attachment["id"] || hash_id,
-      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
     }