mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Show only visible announcements in MastodonAPI

Browse source
This commit is contained in:
Tusooa Zhu 2022-03-08 19:17:49 -05:00
parent cf8334dbc1
commit d569694ae9
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex
View file

@ -46,7 +46,7 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementController do
end
defp all_visible do
Announcement.list_all()
Announcement.list_all_visible()
end
@doc "POST /api/v1/announcements/:id/dismiss"

24
test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
View file

@ -23,6 +23,30 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
refute Map.has_key?(Enum.at(response, 0), "read")
end
test "it does not list announcements starting after current time" do
time = NaiveDateTime.utc_now() |> NaiveDateTime.add(999999, :second)
insert(:announcement, starts_at: time)
response =
build_conn()
|> get("/api/v1/announcements")
|> json_response_and_validate_schema(:ok)
assert [] = response
end
test "it does not list announcements ending before current time" do
time = NaiveDateTime.utc_now() |> NaiveDateTime.add(-999999, :second)
insert(:announcement, ends_at: time)
response =
build_conn()
|> get("/api/v1/announcements")
|> json_response_and_validate_schema(:ok)
assert [] = response
end
test "when authenticated, also expose read property" do
%{id: id} = insert(:announcement)