Browse Source

fix not being able to pin polls

floki-fast_html-2-electric-boogalo
rinpatch 4 years ago
parent
commit
50f5a92021
2 changed files with 17 additions and 1 deletions
  1. +2
    -1
      lib/pleroma/web/common_api/common_api.ex
  2. +15
    -0
      test/web/common_api/common_api_test.exs

+ 2
- 1
lib/pleroma/web/common_api/common_api.ex View File

@@ -315,8 +315,9 @@ defmodule Pleroma.Web.CommonAPI do
with %Activity{
actor: ^user_ap_id,
data: %{"type" => "Create"},
object: %Object{data: %{"type" => "Note"}}
object: %Object{data: %{"type" => object_type}}
} = activity <- get_by_id_or_ap_id(id_or_ap_id),
true <- object_type in ["Note", "Article", "Question"],
true <- Visibility.is_public?(activity),
{:ok, _user} <- User.add_pinnned_activity(user, activity) do
{:ok, activity}


+ 15
- 0
test/web/common_api/common_api_test.exs View File

@@ -324,6 +324,21 @@ defmodule Pleroma.Web.CommonAPITest do
assert %User{pinned_activities: [^id]} = user
end

test "pin poll", %{user: user} do
{:ok, activity} =
CommonAPI.post(user, %{
"status" => "How is fediverse today?",
"poll" => %{"options" => ["Absolutely outstanding", "Not good"], "expires_in" => 20}
})

assert {:ok, ^activity} = CommonAPI.pin(activity.id, user)

id = activity.id
user = refresh_record(user)

assert %User{pinned_activities: [^id]} = user
end

test "unlisted statuses can be pinned", %{user: user} do
{:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!", "visibility" => "unlisted"})
assert {:ok, ^activity} = CommonAPI.pin(activity.id, user)


Loading…
Cancel
Save