X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fstatus_view.ex;h=a4539d47efa51bb0d7b4a65ed00ca337be129299;hb=37e5014d3ee571622d324cdadfc2bf7c345cc1fc;hp=4f395d0f7ab0ce9ad0a7e4aa6a9af33bfd098bb3;hpb=611ca385dea3d611a97579000311cc42684305e6;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 4f395d0f7..a4539d47e 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -4,9 +4,25 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   alias Pleroma.{User, Activity}
   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MediaProxy
+  alias Pleroma.Repo
+
+  # TODO: Add cached version.
+  defp get_replied_to_activities(activities) do
+    activities
+    |> Enum.map(fn
+      (%{data: %{"type" => "Create", "object" => %{"inReplyTo" => inReplyTo}}}) ->
+        (inReplyTo != "") && inReplyTo
+      _ -> nil
+    end)
+    |> Enum.filter(&(&1))
+    |> Activity.create_activity_by_object_id_query()
+    |> Repo.all
+    |> Enum.reduce(%{}, fn(activity, acc) -> Map.put(acc,activity.data["object"]["id"], activity) end)
+  end
 
   def render("index.json", opts) do
-    render_many(opts.activities, StatusView, "status.json", opts)
+    replied_to_activities = get_replied_to_activities(opts.activities)
+    render_many(opts.activities, StatusView, "status.json", Map.put(opts, :replied_to_activities, replied_to_activities))
   end
 
   def render("status.json", %{activity: %{data: %{"type" => "Announce", "object" => object}} = activity} = opts) do
@@ -16,7 +32,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     reblogged = Activity.get_create_activity_by_object_ap_id(object)
     reblogged = render("status.json", Map.put(opts, :activity, reblogged))
 
-    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)
@@ -51,6 +67,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     }
   end
 
+  def get_reply_to(activity, %{replied_to_activities: replied_to_activities}) do
+    id = activity.data["object"]["inReplyTo"]
+    replied_to_activities[activity.data["object"]["inReplyTo"]]
+  end
+
+  def get_reply_to(%{data: %{"object" => object}}, _) do
+    if object["inReplyTo"] && object["inReplyTo"] != "" do
+      Activity.get_create_activity_by_object_ap_id(object["inReplyTo"])
+    else
+      nil
+    end
+  end
+
   def render("status.json", %{activity: %{data: %{"object" => object}} = activity} = opts) do
     user = User.get_cached_by_ap_id(activity.data["actor"])
 
@@ -60,7 +89,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     tags = object["tag"] || []
     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)
@@ -72,12 +101,15 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
 
     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 = get_reply_to(activity, opts)
     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)
+    |> Enum.map(fn {name, url} ->
+      name = HtmlSanitizeEx.strip_tags(name)
+      url = HtmlSanitizeEx.strip_tags(url)
+      %{ shortcode: name, url: url, static_url: url }
+    end)
 
     %{
       id: to_string(activity.id),
@@ -127,6 +159,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     type = cond do
       String.contains?(media_type, "image") -> "image"
       String.contains?(media_type, "video") -> "video"
+      String.contains?(media_type, "audio") -> "audio"
       true -> "unknown"
     end