X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Frepresenters%2Fobject_representer.ex;h=d5291a397ca5d0b5ebd67d902cd43c430ef7d7f7;hb=42ef7cd227ba075fbd05e9625dc880feddee4417;hp=c39b607605421449f49d4015be75920e49bcd7c9;hpb=73df2f8e5e2d0e2b125df8848c2dd7f2a73f1c03;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/representers/object_representer.ex b/lib/pleroma/web/twitter_api/representers/object_representer.ex
index c39b60760..d5291a397 100644
--- a/lib/pleroma/web/twitter_api/representers/object_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/object_representer.ex
@@ -2,17 +2,32 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
   alias Pleroma.Object
 
-  def to_map(%Object{} = object, _opts) do
+  def to_map(%Object{data: %{"url" => [url | _]}} = object, _opts) do
     data = object.data
-    url = List.first(data["url"])
+
+    %{
+      url: url["href"] |> Pleroma.Web.MediaProxy.url(),
+      mimetype: url["mediaType"] || url["mimeType"],
+      id: data["uuid"],
+      oembed: false,
+      description: data["name"]
+    }
+  end
+
+  def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
     %{
-      url: url["href"],
-      mimetype: url["mediaType"],
+      url: url |> Pleroma.Web.MediaProxy.url(),
+      mimetype: data["mediaType"] || data["mimeType"],
       id: data["uuid"],
-      oembed: false
+      oembed: false,
+      description: data["name"]
     }
   end
 
+  def to_map(%Object{}, _opts) do
+    %{}
+  end
+
   # If we only get the naked data, wrap in an object
   def to_map(%{} = data, opts) do
     to_map(%Object{data: data}, opts)