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
ba6049aa
Verified
Commit
ba6049aa
authored
Aug 14, 2021
by
Alex Gleason
Browse files
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
parent
a2eacfc5
Pipeline
#37147
passed with stages
in 9 minutes and 53 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/builder.ex
View file @
ba6049aa
...
...
@@ -126,7 +126,9 @@ def create(actor, object, recipients) do
|>
Pleroma
.
Maps
.
put_if_present
(
"context"
,
context
),
[]}
end
@spec
note
(
ActivityDraft
.
t
())
::
{
:ok
,
map
(),
keyword
()}
def
note
(%
ActivityDraft
{}
=
draft
)
do
data
=
%{
"type"
=>
"Note"
,
"to"
=>
draft
.
to
,
...
...
@@ -141,6 +143,8 @@ def note(%ActivityDraft{} = draft) do
}
|>
add_in_reply_to
(
draft
.
in_reply_to
)
|>
Map
.
merge
(
draft
.
extra
)
{
:ok
,
data
,
[]}
end
defp
add_in_reply_to
(
object
,
nil
),
do
:
object
...
...
lib/pleroma/web/common_api/activity_draft.ex
View file @
ba6049aa
...
...
@@ -214,8 +214,10 @@ defp object(draft) do
emoji
=
Map
.
merge
(
emoji
,
summary_emoji
)
{
:ok
,
note_data
,
_meta
}
=
Builder
.
note
(
draft
)
object
=
Builder
.
note
(
draft
)
note_data
|>
Map
.
put
(
"emoji"
,
emoji
)
|>
Map
.
put
(
"source"
,
draft
.
status
)
|>
Map
.
put
(
"generator"
,
draft
.
params
[
:generator
])
...
...
test/pleroma/web/activity_pub/builder_test.exs
View file @
ba6049aa
...
...
@@ -28,7 +28,7 @@ test "returns note data" do
extra:
%{
"custom_tag"
=>
"test"
}
}
assert
Builder
.
note
(
draft
)
=
=
%{
expected
=
%{
"actor"
=>
user
.
ap_id
,
"attachment"
=>
[],
"cc"
=>
[
user3
.
ap_id
],
...
...
@@ -41,6 +41,8 @@ test "returns note data" do
"type"
=>
"Note"
,
"custom_tag"
=>
"test"
}
assert
{
:ok
,
^
expected
,
[]}
=
Builder
.
note
(
draft
)
end
end
end
Write
Preview
Markdown
is supported
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