mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
activitypub transmogrifier: rewrite non-http URLs using the object's external URL
Signed-off-by: lain <lain@soykaf.club>
This commit is contained in:
parent
68aa9a2826
commit
59a76ea464
2 changed files with 33 additions and 0 deletions
|
@ -210,11 +210,31 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
|
||||||
|
|
||||||
def prepare_outgoing(%{"type" => type} = data) do
|
def prepare_outgoing(%{"type" => type} = data) do
|
||||||
data = data
|
data = data
|
||||||
|
|> maybe_fix_object_url
|
||||||
|> Map.put("@context", "https://www.w3.org/ns/activitystreams")
|
|> Map.put("@context", "https://www.w3.org/ns/activitystreams")
|
||||||
|
|
||||||
{:ok, data}
|
{:ok, data}
|
||||||
end
|
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
|
def add_hashtags(object) do
|
||||||
tags = (object["tag"] || [])
|
tags = (object["tag"] || [])
|
||||||
|> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end
|
|> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
alias Pleroma.Web.ActivityPub.Transmogrifier
|
alias Pleroma.Web.ActivityPub.Transmogrifier
|
||||||
|
alias Pleroma.Web.OStatus
|
||||||
alias Pleroma.Activity
|
alias Pleroma.Activity
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Repo
|
alias Pleroma.Repo
|
||||||
|
@ -220,6 +221,18 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|
||||||
|
|
||||||
assert modified["object"]["actor"] == modified["object"]["attributedTo"]
|
assert modified["object"]["actor"] == modified["object"]["attributedTo"]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it translates ostatus IDs to external URLs" do
|
||||||
|
incoming = File.read!("test/fixtures/incoming_note_activity.xml")
|
||||||
|
{:ok, [referent_activity]} = OStatus.handle_incoming(incoming)
|
||||||
|
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, activity, _} = CommonAPI.favorite(referent_activity.id, user)
|
||||||
|
{:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
|
||||||
|
|
||||||
|
assert modified["object"] == "http://gs.example.org:4040/index.php/notice/29"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "user upgrade" do
|
describe "user upgrade" do
|
||||||
|
|
Loading…
Reference in a new issue