Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
This commit is contained in:
parent
a2eacfc525
commit
ba6049aa81
|
@ -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
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue