X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fstatus_view.ex;h=3012344121240b3737272c3336b159a09b956985;hb=9aabff48835d55cf284229298ad86c07fa1fce30;hp=5585a560572e582f7bb67483a7e3dd1ba7add741;hpb=1625021a9cd01127171709324f165899a52acfe5;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 5585a5605..301234412 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -3,27 +3,59 @@ 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
+  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
+  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)
+    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.
+      # TODO: This might be wrong, check with mastodon.
+      url: nil,
       account: AccountView.render("account.json", %{user: user}),
       in_reply_to_id: nil,
       in_reply_to_account_id: nil,
@@ -57,26 +89,36 @@ 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"]
-    |> 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)
+    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)
 
     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)
+    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 = 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)
+    emojis =
+      (activity.data["object"]["emoji"] || [])
+      |> Enum.map(fn {name, url} ->
+        name = HtmlSanitizeEx.strip_tags(name)
+
+        url =
+          HtmlSanitizeEx.strip_tags(url)
+          |> MediaProxy.url()
+
+        %{shortcode: name, url: url, static_url: url}
+      end)
 
     %{
       id: to_string(activity.id),
@@ -95,10 +137,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       muted: false,
       sensitive: sensitive,
       spoiler_text: object["summary"] || "",
-      visibility: "public",
+      visibility: get_visibility(object),
       media_attachments: attachments |> Enum.take(4),
       mentions: mentions,
-      tags: [], # fix,
+      # fix,
+      tags: [],
       application: %{
         name: "Web",
         website: nil
@@ -111,21 +154,50 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   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
+    type =
+      cond do
+        String.contains?(media_type, "image") -> "image"
+        String.contains?(media_type, "video") -> "video"
+        String.contains?(media_type, "audio") -> "audio"
+        true -> "unknown"
+      end
 
-    << hash_id::signed-32, _rest::binary >> = :crypto.hash(:md5, href)
+    <<hash_id::signed-32, _rest::binary>> = :crypto.hash(:md5, href)
 
     %{
       id: to_string(attachment["id"] || hash_id),
-      url: href,
+      url: MediaProxy.url(href),
       remote_url: href,
-      preview_url: href,
+      preview_url: MediaProxy.url(href),
       text_url: href,
       type: type
     }
   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 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"
+	  # this should use the sql for the object's activity
+      Enum.any?(to, &String.contains?(&1, "/followers")) -> "private"
+      true -> "direct"
+    end
+  end
 end