X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fupload.ex;h=d22421d37049d8d4892037b83c89b90718a995a5;hb=8075badafe60d396c236d8d6d911cbb60ae9c5b6;hp=fdda2634e84f90294722cb3c11a46812729d1cf7;hpb=e7dc39e40cde5599f2e1e0dd1715670fd1e76720;p=akkoma

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index fdda2634e..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,13 +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)
-
-    protocol = Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.fetch!(:protocol)
-
-    "#{protocol}://#{host}/media/#{file}"
+    "#{Pleroma.Web.base_url()}/media/#{file}"
   end
 end