X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fupload.ex;h=d22421d37049d8d4892037b83c89b90718a995a5;hb=129e30f4658312e8bb1737fd5577497107fbdeb1;hp=43ebe98e3d709288b572ead2b035c404fa262ff4;hpb=08fdbd6f3ab15ac8312073d832324516b723b81a;p=akkoma

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 43ebe98e3..d22421d37 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -8,7 +8,11 @@ defmodule Pleroma.Upload do
 
     %{
       "type" => "Image",
-      "href" => url_for(Path.join(uuid, file.filename)),
+      "url" => [%{
+        "type" => "Link",
+        "mediaType" => file.content_type,
+        "href" => url_for(Path.join(uuid, file.filename))
+      }],
       "name" => file.filename,
       "uuid" => uuid
     }
@@ -20,11 +24,6 @@ defmodule Pleroma.Upload do
   end
 
   defp url_for(file) do
-    host =
-      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
-      |> Keyword.fetch!(:url)
-      |> Keyword.fetch!(:host)
-
-    "https://#{host}/media/#{file}"
+    "#{Pleroma.Web.base_url()}/media/#{file}"
   end
 end