hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix adding language to json ld header, add transmogrifier test

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-03-07 14:05:45 +01:00
commit a6e066a77d
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -751,12 +751,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
object_id object_id
|> Object.normalize(fetch: false) |> Object.normalize(fetch: false)
|> Map.get(:data) |> Map.get(:data)
|> prepare_object
data = data =
data data
|> Map.put("object", object) |> Map.put("object", prepare_object(object))
|> Map.merge(Utils.make_json_ld_header(data)) |> Map.merge(Utils.make_json_ld_header(object))
|> Map.delete("bcc") |> Map.delete("bcc")
{:ok, data} {:ok, data}
@ -764,14 +763,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def prepare_outgoing(%{"type" => "Update", "object" => %{"type" => objtype} = object} = data) def prepare_outgoing(%{"type" => "Update", "object" => %{"type" => objtype} = object} = data)
when objtype in Pleroma.Constants.updatable_object_types() do when objtype in Pleroma.Constants.updatable_object_types() do
object =
object
|> prepare_object
data = data =
data data
|> Map.put("object", object) |> Map.put("object", prepare_object(object))
|> Map.merge(Utils.make_json_ld_header(data)) |> Map.merge(Utils.make_json_ld_header(object))
|> Map.delete("bcc") |> Map.delete("bcc")
{:ok, data} {:ok, data}
@ -792,7 +787,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data = data =
data data
|> strip_internal_fields |> strip_internal_fields
|> Map.merge(Utils.make_json_ld_header(data)) |> Map.merge(Utils.make_json_ld_header())
|> Map.delete("bcc") |> Map.delete("bcc")
{:ok, data} {:ok, data}
@ -812,7 +807,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data = data =
data data
|> Map.put("object", object) |> Map.put("object", object)
|> Map.merge(Utils.make_json_ld_header(data)) |> Map.merge(Utils.make_json_ld_header())
{:ok, data} {:ok, data}
end end
@ -830,7 +825,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data = data =
data data
|> Map.put("object", object) |> Map.put("object", object)
|> Map.merge(Utils.make_json_ld_header(data)) |> Map.merge(Utils.make_json_ld_header())
{:ok, data} {:ok, data}
end end

18
test/pleroma/web/activity_pub/transmogrifier_test.exs
View file

@ -384,6 +384,24 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
assert modified["object"]["quoteUrl"] == quote_id assert modified["object"]["quoteUrl"] == quote_id
assert modified["object"]["quoteUri"] == quote_id assert modified["object"]["quoteUri"] == quote_id
end end
test "it adds language of the object to its json-ld context" do
user = insert(:user)
{:ok, activity} = CommonAPI.post(user, %{status: "Cześć", language: "pl"})
{:ok, modified} = Transmogrifier.prepare_outgoing(activity.object.data)
assert [_, _, %{"@language" => "pl"}] = modified["@context"]
end
test "it adds language of the object to Create activity json-ld context" do
user = insert(:user)
{:ok, activity} = CommonAPI.post(user, %{status: "Cześć", language: "pl"})
{:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
assert [_, _, %{"@language" => "pl"}] = modified["@context"]
end
end end
describe "actor rewriting" do describe "actor rewriting" do