X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Ftransmogrifier.ex;h=d759ca2b2faf21a65074a0a09d7fac1cc21dc6b4;hb=3fcdfb75d03efa27903ba5fdd5c78f2b93a4d55b;hp=8b1a26ae5110e67a404d55d4e72654ab0d762b16;hpb=30d65639c1bea2471752ed9c142ada63437f6d09;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 8b1a26ae5..d759ca2b2 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -210,11 +210,31 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   def prepare_outgoing(%{"type" => type} = data) do
     data = data
+    |> maybe_fix_object_url
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
 
     {:ok, data}
   end
 
+  def maybe_fix_object_url(data) do
+    if is_binary(data["object"]) and not String.starts_with?(data["object"], "http") do
+      case ActivityPub.fetch_object_from_id(data["object"]) do
+        {:ok, relative_object} ->
+          if relative_object.data["external_url"] do
+            data = data
+            |> Map.put("object", relative_object.data["external_url"])
+          else
+            data
+          end
+        e ->
+          Logger.error("Couldn't fetch #{data["object"]} #{inspect(e)}")
+          data
+      end
+    else
+      data
+    end
+  end
+
   def add_hashtags(object) do
     tags = (object["tag"] || [])
     |> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end