Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
34bd4117
Commit
34bd4117
authored
Nov 08, 2018
by
lain
Browse files
Unify json ld header handling.
parent
3b02fd9f
Pipeline
#4326
passed with stages
in 6 minutes and 26 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/transmogrifier.ex
View file @
34bd4117
...
@@ -607,7 +607,7 @@ def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = obj
...
@@ -607,7 +607,7 @@ def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = obj
data
=
data
=
data
data
|>
Map
.
put
(
"object"
,
object
)
|>
Map
.
put
(
"object"
,
object
)
|>
Map
.
put
(
"@context"
,
"https://www.w3.org/ns/activitystreams"
)
|>
Map
.
merge
(
Utils
.
make_json_ld_header
()
)
{
:ok
,
data
}
{
:ok
,
data
}
end
end
...
@@ -626,7 +626,7 @@ def prepare_outgoing(%{"type" => "Accept"} = data) do
...
@@ -626,7 +626,7 @@ def prepare_outgoing(%{"type" => "Accept"} = data) do
data
=
data
=
data
data
|>
Map
.
put
(
"object"
,
object
)
|>
Map
.
put
(
"object"
,
object
)
|>
Map
.
put
(
"@context"
,
"https://www.w3.org/ns/activitystreams"
)
|>
Map
.
merge
(
Utils
.
make_json_ld_header
()
)
{
:ok
,
data
}
{
:ok
,
data
}
end
end
...
@@ -644,7 +644,7 @@ def prepare_outgoing(%{"type" => "Reject"} = data) do
...
@@ -644,7 +644,7 @@ def prepare_outgoing(%{"type" => "Reject"} = data) do
data
=
data
=
data
data
|>
Map
.
put
(
"object"
,
object
)
|>
Map
.
put
(
"object"
,
object
)
|>
Map
.
put
(
"@context"
,
"https://www.w3.org/ns/activitystreams"
)
|>
Map
.
merge
(
Utils
.
make_json_ld_header
()
)
{
:ok
,
data
}
{
:ok
,
data
}
end
end
...
@@ -654,7 +654,7 @@ def prepare_outgoing(%{"type" => _type} = data) do
...
@@ -654,7 +654,7 @@ def prepare_outgoing(%{"type" => _type} = data) do
data
=
data
=
data
data
|>
maybe_fix_object_url
|>
maybe_fix_object_url
|>
Map
.
put
(
"@context"
,
"https://www.w3.org/ns/activitystreams"
)
|>
Map
.
merge
(
Utils
.
make_json_ld_header
()
)
{
:ok
,
data
}
{
:ok
,
data
}
end
end
...
...
test/web/activity_pub/transmogrifier_test.exs
View file @
34bd4117
...
@@ -695,7 +695,9 @@ test "it adds the json-ld context and the conversation property" do
...
@@ -695,7 +695,9 @@ test "it adds the json-ld context and the conversation property" do
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"hey"
})
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"hey"
})
{
:ok
,
modified
}
=
Transmogrifier
.
prepare_outgoing
(
activity
.
data
)
{
:ok
,
modified
}
=
Transmogrifier
.
prepare_outgoing
(
activity
.
data
)
assert
modified
[
"@context"
]
==
"https://www.w3.org/ns/activitystreams"
assert
modified
[
"@context"
]
==
Pleroma
.
Web
.
ActivityPub
.
Utils
.
make_json_ld_header
()[
"@context"
]
assert
modified
[
"object"
][
"conversation"
]
==
modified
[
"context"
]
assert
modified
[
"object"
][
"conversation"
]
==
modified
[
"context"
]
end
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment