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
1eb73188
Commit
1eb73188
authored
Jan 12, 2019
by
sxsdv1
Browse files
Prepare all types objects before serialising
Activities returned from inbox can include other types of objects like Article
parent
19b6a823
Changes
3
Show whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/transmogrifier.ex
View file @
1eb73188
...
...
@@ -641,7 +641,7 @@ def prepare_object(object) do
# internal -> Mastodon
# """
def
prepare_outgoing
(%{
"type"
=>
"Create"
,
"object"
=>
%{
"type"
=>
"Note"
}
=
object
}
=
data
)
do
def
prepare_outgoing
(%{
"type"
=>
"Create"
,
"object"
=>
object
}
=
data
)
do
object
=
object
|>
prepare_object
...
...
test/support/factory.ex
View file @
1eb73188
...
...
@@ -57,6 +57,11 @@ def direct_note_factory do
%
Pleroma
.
Object
{
data:
Map
.
merge
(
data
,
%{
"to"
=>
[
user2
.
ap_id
]})}
end
def
article_factory
do
note_factory
()
|>
Map
.
put
(
"type"
,
"Article"
)
end
def
tombstone_factory
do
data
=
%{
"type"
=>
"Tombstone"
,
...
...
@@ -110,6 +115,26 @@ def note_activity_factory do
}
end
def
article_activity_factory
do
article
=
insert
(
:article
)
data
=
%{
"id"
=>
Pleroma
.
Web
.
ActivityPub
.
Utils
.
generate_activity_id
(),
"type"
=>
"Create"
,
"actor"
=>
article
.
data
[
"actor"
],
"to"
=>
article
.
data
[
"to"
],
"object"
=>
article
.
data
,
"published"
=>
DateTime
.
utc_now
()
|>
DateTime
.
to_iso8601
(),
"context"
=>
article
.
data
[
"context"
]
}
%
Pleroma
.
Activity
{
data:
data
,
actor:
data
[
"actor"
],
recipients:
data
[
"to"
]
}
end
def
announce_activity_factory
do
note_activity
=
insert
(
:note_activity
)
user
=
insert
(
:user
)
...
...
test/web/activity_pub/transmogrifier_test.exs
View file @
1eb73188
...
...
@@ -835,6 +835,21 @@ test "it strips internal fields" do
assert
is_nil
(
modified
[
"object"
][
"announcement_count"
])
assert
is_nil
(
modified
[
"object"
][
"context_id"
])
end
test
"it strips internal fields of article"
do
activity
=
insert
(
:article_activity
)
{
:ok
,
modified
}
=
Transmogrifier
.
prepare_outgoing
(
activity
.
data
)
assert
length
(
modified
[
"object"
][
"tag"
])
==
2
assert
is_nil
(
modified
[
"object"
][
"emoji"
])
assert
is_nil
(
modified
[
"object"
][
"likes"
])
assert
is_nil
(
modified
[
"object"
][
"like_count"
])
assert
is_nil
(
modified
[
"object"
][
"announcements"
])
assert
is_nil
(
modified
[
"object"
][
"announcement_count"
])
assert
is_nil
(
modified
[
"object"
][
"context_id"
])
end
end
describe
"user upgrade"
do
...
...
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