Mastodon API: Add support for posting polls
This commit is contained in:
parent
642a67dd44
commit
fd920c8973
@ -149,6 +149,7 @@ def post(user, %{"status" => status} = data) do
|
|||||||
data,
|
data,
|
||||||
visibility
|
visibility
|
||||||
),
|
),
|
||||||
|
{poll, mentions, tags} <- make_poll_data(data, mentions, tags),
|
||||||
{to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility),
|
{to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility),
|
||||||
context <- make_context(in_reply_to),
|
context <- make_context(in_reply_to),
|
||||||
cw <- data["spoiler_text"] || "",
|
cw <- data["spoiler_text"] || "",
|
||||||
@ -164,7 +165,8 @@ def post(user, %{"status" => status} = data) do
|
|||||||
in_reply_to,
|
in_reply_to,
|
||||||
tags,
|
tags,
|
||||||
cw,
|
cw,
|
||||||
cc
|
cc,
|
||||||
|
poll
|
||||||
),
|
),
|
||||||
object <-
|
object <-
|
||||||
Map.put(
|
Map.put(
|
||||||
|
@ -102,6 +102,48 @@ def to_for_user_and_mentions(_user, mentions, inReplyTo, "direct") do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def make_poll_data(
|
||||||
|
%{"poll" => %{"options" => options, "expires_in" => expires_in}} = data,
|
||||||
|
mentions,
|
||||||
|
tags
|
||||||
|
)
|
||||||
|
when is_list(options) and is_integer(expires_in) do
|
||||||
|
content_type = get_content_type(data["content_type"])
|
||||||
|
# XXX: There is probably a more performant/cleaner way to do this
|
||||||
|
{poll, {mentions, tags}} =
|
||||||
|
Enum.map_reduce(options, {mentions, tags}, fn option, {mentions, tags} ->
|
||||||
|
# TODO: Custom emoji
|
||||||
|
{option, mentions_merge, tags_merge} = format_input(option, content_type)
|
||||||
|
mentions = mentions ++ mentions_merge
|
||||||
|
tags = tags ++ tags_merge
|
||||||
|
|
||||||
|
{%{
|
||||||
|
"name" => option,
|
||||||
|
"type" => "Note",
|
||||||
|
"replies" => %{"type" => "Collection", "totalItems" => 0}
|
||||||
|
}, {mentions, tags}}
|
||||||
|
end)
|
||||||
|
|
||||||
|
end_time =
|
||||||
|
NaiveDateTime.utc_now()
|
||||||
|
|> NaiveDateTime.add(expires_in)
|
||||||
|
|> NaiveDateTime.to_iso8601()
|
||||||
|
|
||||||
|
poll =
|
||||||
|
if Pleroma.Web.ControllerHelper.truthy_param?(data["poll"]["multiple"]) do
|
||||||
|
%{"type" => "Question", "anyOf" => poll, "closed" => end_time}
|
||||||
|
else
|
||||||
|
%{"type" => "Question", "oneOf" => poll, "closed" => end_time}
|
||||||
|
end
|
||||||
|
|
||||||
|
{poll, mentions, tags}
|
||||||
|
end
|
||||||
|
|
||||||
|
def make_poll_data(data, mentions, tags) do
|
||||||
|
IO.inspect(data, label: "data")
|
||||||
|
{%{}, mentions, tags}
|
||||||
|
end
|
||||||
|
|
||||||
def make_content_html(
|
def make_content_html(
|
||||||
status,
|
status,
|
||||||
attachments,
|
attachments,
|
||||||
@ -223,8 +265,11 @@ def make_note_data(
|
|||||||
in_reply_to,
|
in_reply_to,
|
||||||
tags,
|
tags,
|
||||||
cw \\ nil,
|
cw \\ nil,
|
||||||
cc \\ []
|
cc \\ [],
|
||||||
|
merge \\ %{}
|
||||||
) do
|
) do
|
||||||
|
IO.inspect(merge, label: "merge")
|
||||||
|
|
||||||
object = %{
|
object = %{
|
||||||
"type" => "Note",
|
"type" => "Note",
|
||||||
"to" => to,
|
"to" => to,
|
||||||
@ -237,6 +282,7 @@ def make_note_data(
|
|||||||
"tag" => tags |> Enum.map(fn {_, tag} -> tag end) |> Enum.uniq()
|
"tag" => tags |> Enum.map(fn {_, tag} -> tag end) |> Enum.uniq()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
object =
|
||||||
if in_reply_to do
|
if in_reply_to do
|
||||||
in_reply_to_object = Object.normalize(in_reply_to)
|
in_reply_to_object = Object.normalize(in_reply_to)
|
||||||
|
|
||||||
@ -245,6 +291,8 @@ def make_note_data(
|
|||||||
else
|
else
|
||||||
object
|
object
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Map.merge(object, merge)
|
||||||
end
|
end
|
||||||
|
|
||||||
def format_naive_asctime(date) do
|
def format_naive_asctime(date) do
|
||||||
|
@ -132,6 +132,28 @@ test "posting a status", %{conn: conn} do
|
|||||||
refute id == third_id
|
refute id == third_id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "posting a poll", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
time = NaiveDateTime.utc_now()
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/api/v1/statuses", %{
|
||||||
|
"status" => "Who is the best girl?",
|
||||||
|
"poll" => %{"options" => ["Rei", "Asuka", "Misato"], "expires_in" => 420}
|
||||||
|
})
|
||||||
|
|
||||||
|
response = json_response(conn, 200)
|
||||||
|
|
||||||
|
assert Enum.all?(response["poll"]["options"], fn %{"title" => title} ->
|
||||||
|
title in ["Rei", "Asuka", "Misato"]
|
||||||
|
end)
|
||||||
|
|
||||||
|
assert NaiveDateTime.diff(NaiveDateTime.from_iso8601!(response["poll"]["expires_at"]), time) in 420..430
|
||||||
|
refute response["poll"]["expred"]
|
||||||
|
end
|
||||||
|
|
||||||
test "posting a sensitive status", %{conn: conn} do
|
test "posting a sensitive status", %{conn: conn} do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
|
|
||||||
|
@ -103,6 +103,7 @@ test "a note activity" do
|
|||||||
muted: false,
|
muted: false,
|
||||||
pinned: false,
|
pinned: false,
|
||||||
sensitive: false,
|
sensitive: false,
|
||||||
|
poll: nil,
|
||||||
spoiler_text: HtmlSanitizeEx.basic_html(note.data["object"]["summary"]),
|
spoiler_text: HtmlSanitizeEx.basic_html(note.data["object"]["summary"]),
|
||||||
visibility: "public",
|
visibility: "public",
|
||||||
media_attachments: [],
|
media_attachments: [],
|
||||||
|
Loading…
Reference in New Issue
Block a user