aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-03-13 17:46:37 +0000
committerlain <lain@soykaf.club>2018-03-14 08:53:29 +0100
commit59a76ea464998476f8c4814324647f4ae4a7f2cb (patch)
tree7615c7337003a55d79acd74c4ad3ea7f7eee351d /lib
parent68aa9a2826410463ce8056c7e42ba60013376f19 (diff)
downloadpleroma-59a76ea464998476f8c4814324647f4ae4a7f2cb.tar.gz
activitypub transmogrifier: rewrite non-http URLs using the object's external URL
Signed-off-by: lain <lain@soykaf.club>
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex20
1 files changed, 20 insertions, 0 deletions
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