From d7af67012f64d09bb50259188473c1c94418b3a2 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 00:06:07 -0500
Subject: Implement first pass of announcement admin api

CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
---
 .../controllers/announcement_controller_test.exs   | 94 ++++++++++++++++++++++
 test/support/factory.ex                            |  8 ++
 2 files changed, 102 insertions(+)
 create mode 100644 test/pleroma/web/admin_api/controllers/announcement_controller_test.exs

(limited to 'test')

diff --git a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
new file mode 100644
index 000000000..d667526c3
--- /dev/null
+++ b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
@@ -0,0 +1,94 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
+  use Pleroma.Web.ConnCase
+
+  import Pleroma.Factory
+
+  setup do
+    admin = insert(:user, is_admin: true)
+    token = insert(:oauth_admin_token, user: admin)
+
+    conn =
+      build_conn()
+      |> assign(:user, admin)
+      |> assign(:token, token)
+
+    {:ok, %{admin: admin, token: token, conn: conn}}
+  end
+
+  describe "GET /api/v1/pleroma/admin/announcements" do
+    test "it lists all announcements", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements")
+        |> json_response_and_validate_schema(:ok)
+
+      assert [%{"id" => ^id}] = response
+    end
+  end
+
+  describe "GET /api/v1/pleroma/admin/announcements/:id" do
+    test "it displays one announcement", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements/#{id}")
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"id" => ^id} = response
+    end
+
+    test "it returns not found for non-existent id", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements/#{id}xxx")
+        |> json_response_and_validate_schema(:not_found)
+    end
+  end
+
+  describe "DELETE /api/v1/pleroma/admin/announcements/:id" do
+    test "it deletes specified announcement", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        conn
+        |> delete("/api/v1/pleroma/admin/announcements/#{id}")
+        |> json_response_and_validate_schema(:ok)
+    end
+
+    test "it returns not found for non-existent id", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements/#{id}xxx")
+        |> json_response_and_validate_schema(:not_found)
+
+      assert %{id: ^id} = Pleroma.Announcement.get_by_id(id)
+    end
+  end
+
+  describe "POST /api/v1/pleroma/admin/announcements" do
+    test "it creates an announcement", %{conn: conn} do
+      content = "test post announcement api"
+
+      response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> post("/api/v1/pleroma/admin/announcements", %{
+          "content" => content
+        })
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"content" => ^content} = response
+    end
+  end
+end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 09456debf..85ea49cb2 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -627,4 +627,12 @@ defmodule Pleroma.Factory do
       context: ["home"]
     }
   end
+
+  def announcement_factory do
+    %Pleroma.Announcement{
+      data: %{
+        "content" => "test announcement"
+      }
+    }
+  end
 end
-- 
cgit v1.2.3


From 5169ad8f143d613f3fa179f88e2be6a16445df41 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 12:07:21 -0500
Subject: Implement announcement read relationships

---
 .../announcement_read_relationship_test.exs        | 40 ++++++++++++++++
 .../controllers/announcement_controller_test.exs   | 54 ++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 test/pleroma/announcement_read_relationship_test.exs
 create mode 100644 test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs

(limited to 'test')

diff --git a/test/pleroma/announcement_read_relationship_test.exs b/test/pleroma/announcement_read_relationship_test.exs
new file mode 100644
index 000000000..5fd4ffbef
--- /dev/null
+++ b/test/pleroma/announcement_read_relationship_test.exs
@@ -0,0 +1,40 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.AnnouncementReadRelationshipTest do
+  alias Pleroma.AnnouncementReadRelationship
+
+  use Pleroma.DataCase, async: true
+
+  import Pleroma.Factory
+
+  setup do
+    {:ok, user: insert(:user), announcement: insert(:announcement)}
+  end
+
+  describe "mark_read/2" do
+    test "should insert relationship", %{user: user, announcement: announcement} do
+      {:ok, _} = AnnouncementReadRelationship.mark_read(user, announcement)
+
+      assert AnnouncementReadRelationship.exists?(user, announcement)
+    end
+  end
+
+  describe "mark_unread/2" do
+    test "should delete relationship", %{user: user, announcement: announcement} do
+      {:ok, _} = AnnouncementReadRelationship.mark_read(user, announcement)
+
+      assert :ok = AnnouncementReadRelationship.mark_unread(user, announcement)
+      refute AnnouncementReadRelationship.exists?(user, announcement)
+    end
+
+    test "should not fail if relationship does not exist", %{
+      user: user,
+      announcement: announcement
+    } do
+      assert :ok = AnnouncementReadRelationship.mark_unread(user, announcement)
+      refute AnnouncementReadRelationship.exists?(user, announcement)
+    end
+  end
+end
diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
new file mode 100644
index 000000000..134db5fcc
--- /dev/null
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -0,0 +1,54 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
+  use Pleroma.Web.ConnCase
+
+  import Pleroma.Factory
+
+  alias Pleroma.AnnouncementReadRelationship
+
+  describe "GET /api/v1/announcements" do
+    test "it lists all announcements" do
+      %{id: id} = insert(:announcement)
+
+      response =
+        build_conn()
+        |> get("/api/v1/announcements")
+        |> json_response_and_validate_schema(:ok)
+
+      assert [%{"id" => ^id}] = response
+      refute Map.has_key?(Enum.at(response, 0), "read")
+    end
+
+    test "when authenticated, also expose read property" do
+      %{id: id} = insert(:announcement)
+
+      %{conn: conn} = oauth_access(["read:accounts"])
+
+      response =
+        conn
+        |> get("/api/v1/announcements")
+        |> json_response_and_validate_schema(:ok)
+
+      assert [%{"id" => ^id, "read" => false}] = response
+    end
+
+    test "when authenticated and announcement is read by user" do
+      %{id: id} = announcement = insert(:announcement)
+      user = insert(:user)
+
+      AnnouncementReadRelationship.mark_read(user, announcement)
+
+      %{conn: conn} = oauth_access(["read:accounts"], user: user)
+
+      response =
+        conn
+        |> get("/api/v1/announcements")
+        |> json_response_and_validate_schema(:ok)
+
+      assert [%{"id" => ^id, "read" => true}] = response
+    end
+  end
+end
-- 
cgit v1.2.3


From aa1fff279e98c6d16095538382413d3b870cee2b Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 16:19:35 -0500
Subject: Implement GET /api/v1/announcements/:id

---
 .../controllers/announcement_controller_test.exs   | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
index 134db5fcc..090a2706b 100644
--- a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -51,4 +51,56 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
       assert [%{"id" => ^id, "read" => true}] = response
     end
   end
+
+  describe "GET /api/v1/announcements/:id" do
+    test "it shows one announcement" do
+      %{id: id} = insert(:announcement)
+
+      response =
+        build_conn()
+        |> get("/api/v1/announcements/#{id}")
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"id" => ^id} = response
+      refute Map.has_key?(response, "read")
+    end
+
+    test "it gives 404 for non-existent announcements" do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        build_conn()
+        |> get("/api/v1/announcements/#{id}xxx")
+        |> json_response_and_validate_schema(:not_found)
+    end
+
+    test "when authenticated, also expose read property" do
+      %{id: id} = insert(:announcement)
+
+      %{conn: conn} = oauth_access(["read:accounts"])
+
+      response =
+        conn
+        |> get("/api/v1/announcements/#{id}")
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"id" => ^id, "read" => false} = response
+    end
+
+    test "when authenticated and announcement is read by user" do
+      %{id: id} = announcement = insert(:announcement)
+      user = insert(:user)
+
+      AnnouncementReadRelationship.mark_read(user, announcement)
+
+      %{conn: conn} = oauth_access(["read:accounts"], user: user)
+
+      response =
+        conn
+        |> get("/api/v1/announcements/#{id}")
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"id" => ^id, "read" => true} = response
+    end
+  end
 end
-- 
cgit v1.2.3


From 2b39b36e490fc1222d8f3d737cb26e62af294e03 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 16:59:20 -0500
Subject: Implement POST /api/v1/announcements/:id/dismiss

---
 .../controllers/announcement_controller_test.exs   | 50 +++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
index 090a2706b..aa056be6e 100644
--- a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -2,11 +2,12 @@
 # Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
+defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
   use Pleroma.Web.ConnCase
 
   import Pleroma.Factory
 
+  alias Pleroma.Announcement
   alias Pleroma.AnnouncementReadRelationship
 
   describe "GET /api/v1/announcements" do
@@ -103,4 +104,51 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
       assert %{"id" => ^id, "read" => true} = response
     end
   end
+
+  describe "POST /api/v1/announcements/:id/dismiss" do
+    setup do: oauth_access(["write:accounts"])
+
+    test "it requires auth", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        conn
+        |> assign(:token, nil)
+        |> post("/api/v1/announcements/#{id}/dismiss")
+        |> json_response_and_validate_schema(:forbidden)
+    end
+
+    test "it requires write:accounts oauth scope" do
+      %{id: id} = insert(:announcement)
+
+      %{conn: conn} = oauth_access(["read:accounts"])
+
+      _response =
+        conn
+        |> post("/api/v1/announcements/#{id}/dismiss")
+        |> json_response_and_validate_schema(:forbidden)
+    end
+
+    test "it gives 404 for non-existent announcements", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        conn
+        |> post("/api/v1/announcements/#{id}xxx/dismiss")
+        |> json_response_and_validate_schema(:not_found)
+    end
+
+    test "it marks announcement as read", %{user: user, conn: conn} do
+      %{id: id} = announcement = insert(:announcement)
+
+      refute Announcement.read_by?(announcement, user)
+
+      _response =
+        conn
+        |> post("/api/v1/announcements/#{id}/dismiss")
+        |> json_response_and_validate_schema(:ok)
+
+      assert Announcement.read_by?(announcement, user)
+    end
+  end
 end
-- 
cgit v1.2.3


From fcf3c9057ec1c49a0c9a400985c1dde4a5d7e9db Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 18:21:20 -0500
Subject: Implement visibility filtering for announcements

---
 test/pleroma/announcement_test.exs | 71 ++++++++++++++++++++++++++++++++++++++
 test/support/factory.ex            |  7 ++--
 2 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 test/pleroma/announcement_test.exs

(limited to 'test')

diff --git a/test/pleroma/announcement_test.exs b/test/pleroma/announcement_test.exs
new file mode 100644
index 000000000..aa00f804b
--- /dev/null
+++ b/test/pleroma/announcement_test.exs
@@ -0,0 +1,71 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.AnnouncementTest do
+  alias Pleroma.Announcement
+
+  use Pleroma.DataCase, async: true
+
+  import Pleroma.Factory
+
+  describe "list_all_visible_when/1" do
+    setup do: {:ok, time: NaiveDateTime.utc_now()}
+
+    test "with no start or end time", %{time: time} do
+      _announcement = insert(:announcement)
+
+      assert [_] = Announcement.list_all_visible_when(time)
+    end
+
+    test "with start time before current", %{time: time} do
+      before_now = NaiveDateTime.add(time, -10, :second)
+
+      _announcement = insert(:announcement, %{starts_at: before_now})
+
+      assert [_] = Announcement.list_all_visible_when(time)
+    end
+
+    test "with start time after current", %{time: time} do
+      after_now = NaiveDateTime.add(time, 10, :second)
+
+      _announcement = insert(:announcement, %{starts_at: after_now})
+
+      assert [] = Announcement.list_all_visible_when(time)
+    end
+
+    test "with end time after current", %{time: time} do
+      after_now = NaiveDateTime.add(time, 10, :second)
+
+      _announcement = insert(:announcement, %{ends_at: after_now})
+
+      assert [_] = Announcement.list_all_visible_when(time)
+    end
+
+    test "with end time before current", %{time: time} do
+      before_now = NaiveDateTime.add(time, -10, :second)
+
+      _announcement = insert(:announcement, %{ends_at: before_now})
+
+      assert [] = Announcement.list_all_visible_when(time)
+    end
+
+    test "with both start and end time", %{time: time} do
+      before_now = NaiveDateTime.add(time, -10, :second)
+      after_now = NaiveDateTime.add(time, 10, :second)
+
+      _announcement = insert(:announcement, %{starts_at: before_now, ends_at: after_now})
+
+      assert [_] = Announcement.list_all_visible_when(time)
+    end
+
+    test "with both start and end time, current not in the range", %{time: time} do
+      before_now = NaiveDateTime.add(time, -10, :second)
+      after_now = NaiveDateTime.add(time, 10, :second)
+
+      _announcement = insert(:announcement, %{starts_at: after_now, ends_at: before_now})
+
+      assert [] = Announcement.list_all_visible_when(time)
+    end
+  end
+end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 85ea49cb2..620102bbb 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -628,11 +628,10 @@ defmodule Pleroma.Factory do
     }
   end
 
-  def announcement_factory do
+  def announcement_factory(params \\ %{}, data \\ %{}) do
     %Pleroma.Announcement{
-      data: %{
-        "content" => "test announcement"
-      }
+      data: Map.merge(%{"content" => "test announcement"}, data)
     }
+    |> Map.merge(params)
   end
 end
-- 
cgit v1.2.3


From cf8334dbc153eed7d65febb4ae4fd3c03bb106b2 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 19:12:01 -0500
Subject: Add starts_at, ends_at and all_day parameters

---
 .../controllers/announcement_controller_test.exs       | 18 ++++++++++++++++--
 test/support/factory.ex                                |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
index d667526c3..5c9d50120 100644
--- a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
@@ -80,15 +80,29 @@ defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
     test "it creates an announcement", %{conn: conn} do
       content = "test post announcement api"
 
+      now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+      starts_at = NaiveDateTime.add(now, -10, :second)
+      ends_at = NaiveDateTime.add(now, 10, :second)
+
       response =
         conn
         |> put_req_header("content-type", "application/json")
         |> post("/api/v1/pleroma/admin/announcements", %{
-          "content" => content
+          "content" => content,
+          "starts_at" => NaiveDateTime.to_iso8601(starts_at),
+          "ends_at" => NaiveDateTime.to_iso8601(ends_at),
+          "all_day" => true
         })
         |> json_response_and_validate_schema(:ok)
 
-      assert %{"content" => ^content} = response
+      assert %{"content" => ^content, "all_day" => true} = response
+
+      announcement = Pleroma.Announcement.get_by_id(response["id"])
+
+      assert not is_nil(announcement)
+
+      assert NaiveDateTime.compare(announcement.starts_at, starts_at) == :eq
+      assert NaiveDateTime.compare(announcement.ends_at, ends_at) == :eq
     end
   end
 end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 620102bbb..64b0049ac 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -630,7 +630,7 @@ defmodule Pleroma.Factory do
 
   def announcement_factory(params \\ %{}, data \\ %{}) do
     %Pleroma.Announcement{
-      data: Map.merge(%{"content" => "test announcement"}, data)
+      data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
     |> Map.merge(params)
   end
-- 
cgit v1.2.3


From d569694ae91fa20654e5639989d3eec0ca3c8a54 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 19:17:49 -0500
Subject: Show only visible announcements in MastodonAPI

---
 .../controllers/announcement_controller_test.exs   | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
index aa056be6e..e9ee1141c 100644
--- a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -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)
 
-- 
cgit v1.2.3


From 881179ec725c3b71868fdcba983fdedd295e5125 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 19:22:28 -0500
Subject: Remove GET /api/v1/announcements/:id

---
 .../controllers/announcement_controller_test.exs   | 56 +---------------------
 1 file changed, 2 insertions(+), 54 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
index e9ee1141c..1c748064c 100644
--- a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -24,7 +24,7 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
     end
 
     test "it does not list announcements starting after current time" do
-      time = NaiveDateTime.utc_now() |> NaiveDateTime.add(999999, :second)
+      time = NaiveDateTime.utc_now() |> NaiveDateTime.add(999_999, :second)
       insert(:announcement, starts_at: time)
 
       response =
@@ -36,7 +36,7 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
     end
 
     test "it does not list announcements ending before current time" do
-      time = NaiveDateTime.utc_now() |> NaiveDateTime.add(-999999, :second)
+      time = NaiveDateTime.utc_now() |> NaiveDateTime.add(-999_999, :second)
       insert(:announcement, ends_at: time)
 
       response =
@@ -77,58 +77,6 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
     end
   end
 
-  describe "GET /api/v1/announcements/:id" do
-    test "it shows one announcement" do
-      %{id: id} = insert(:announcement)
-
-      response =
-        build_conn()
-        |> get("/api/v1/announcements/#{id}")
-        |> json_response_and_validate_schema(:ok)
-
-      assert %{"id" => ^id} = response
-      refute Map.has_key?(response, "read")
-    end
-
-    test "it gives 404 for non-existent announcements" do
-      %{id: id} = insert(:announcement)
-
-      _response =
-        build_conn()
-        |> get("/api/v1/announcements/#{id}xxx")
-        |> json_response_and_validate_schema(:not_found)
-    end
-
-    test "when authenticated, also expose read property" do
-      %{id: id} = insert(:announcement)
-
-      %{conn: conn} = oauth_access(["read:accounts"])
-
-      response =
-        conn
-        |> get("/api/v1/announcements/#{id}")
-        |> json_response_and_validate_schema(:ok)
-
-      assert %{"id" => ^id, "read" => false} = response
-    end
-
-    test "when authenticated and announcement is read by user" do
-      %{id: id} = announcement = insert(:announcement)
-      user = insert(:user)
-
-      AnnouncementReadRelationship.mark_read(user, announcement)
-
-      %{conn: conn} = oauth_access(["read:accounts"], user: user)
-
-      response =
-        conn
-        |> get("/api/v1/announcements/#{id}")
-        |> json_response_and_validate_schema(:ok)
-
-      assert %{"id" => ^id, "read" => true} = response
-    end
-  end
-
   describe "POST /api/v1/announcements/:id/dismiss" do
     setup do: oauth_access(["write:accounts"])
 
-- 
cgit v1.2.3


From 11a1996bf5f283099fd9ecbb5c64e051ec46a5df Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 20:55:41 -0500
Subject: Implement update announcement admin api

---
 .../controllers/announcement_controller_test.exs   | 80 +++++++++++++++++++++-
 test/support/factory.ex                            |  6 +-
 2 files changed, 84 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
index 5c9d50120..c6b2163d0 100644
--- a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
@@ -69,11 +69,89 @@ defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
 
       _response =
         conn
-        |> get("/api/v1/pleroma/admin/announcements/#{id}xxx")
+        |> delete("/api/v1/pleroma/admin/announcements/#{id}xxx")
+        |> json_response_and_validate_schema(:not_found)
+
+      assert %{id: ^id} = Pleroma.Announcement.get_by_id(id)
+    end
+  end
+
+  describe "PATCH /api/v1/pleroma/admin/announcements/:id" do
+    test "it returns not found for non-existent id", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      _response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> patch("/api/v1/pleroma/admin/announcements/#{id}xxx", %{})
         |> json_response_and_validate_schema(:not_found)
 
       assert %{id: ^id} = Pleroma.Announcement.get_by_id(id)
     end
+
+    test "it updates a field", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+      starts_at = NaiveDateTime.add(now, -10, :second)
+
+      _response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
+          starts_at: NaiveDateTime.to_iso8601(starts_at)
+        })
+        |> json_response_and_validate_schema(:ok)
+
+      new = Pleroma.Announcement.get_by_id(id)
+
+      assert NaiveDateTime.compare(new.starts_at, starts_at) == :eq
+    end
+
+    test "it updates a data field", %{conn: conn} do
+      %{id: id} = announcement = insert(:announcement, data: %{"all_day" => true})
+
+      assert announcement.data["all_day"] == true
+
+      new_content = "new content"
+
+      response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
+          content: new_content
+        })
+        |> json_response_and_validate_schema(:ok)
+
+      assert response["content"] == new_content
+      assert response["all_day"] == true
+
+      new = Pleroma.Announcement.get_by_id(id)
+
+      assert new.data["content"] == new_content
+      assert new.data["all_day"] == true
+    end
+
+    test "it nullifies a nullable field", %{conn: conn} do
+      now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+      starts_at = NaiveDateTime.add(now, -10, :second)
+
+      %{id: id} = insert(:announcement, starts_at: starts_at)
+
+      response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
+          starts_at: nil
+        })
+        |> json_response_and_validate_schema(:ok)
+
+      assert response["starts_at"] == nil
+
+      new = Pleroma.Announcement.get_by_id(id)
+
+      assert new.starts_at == nil
+    end
   end
 
   describe "POST /api/v1/pleroma/admin/announcements" do
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 64b0049ac..d28a56345 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -628,7 +628,11 @@ defmodule Pleroma.Factory do
     }
   end
 
-  def announcement_factory(params \\ %{}, data \\ %{}) do
+  def announcement_factory(params \\ %{}) do
+    data = Map.get(params, :data, %{})
+
+    {_, params} = Map.pop(params, :data)
+
     %Pleroma.Announcement{
       data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
-- 
cgit v1.2.3


From eb1a29640f2d7c7d3daca0626b2beb623903c9cd Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 21:26:05 -0500
Subject: Add pagination to AdminAPI.AnnouncementController.index

---
 .../controllers/announcement_controller_test.exs   | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
index c6b2163d0..56da1c6aa 100644
--- a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
@@ -30,6 +30,54 @@ defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
 
       assert [%{"id" => ^id}] = response
     end
+
+    test "it paginates announcements", %{conn: conn} do
+      _announcements = Enum.map(0..20, fn _ -> insert(:announcement) end)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements")
+        |> json_response_and_validate_schema(:ok)
+
+      assert length(response) == 20
+    end
+
+    test "it paginates announcements with custom params", %{conn: conn} do
+      announcements = Enum.map(0..20, fn _ -> insert(:announcement) end)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements", limit: 5, offset: 7)
+        |> json_response_and_validate_schema(:ok)
+
+      assert length(response) == 5
+      assert Enum.at(response, 0)["id"] == Enum.at(announcements, 7).id
+    end
+
+    test "it returns empty list with out-of-bounds offset", %{conn: conn} do
+      _announcements = Enum.map(0..20, fn _ -> insert(:announcement) end)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/admin/announcements", offset: 21)
+        |> json_response_and_validate_schema(:ok)
+
+      assert [] = response
+    end
+
+    test "it rejects invalid pagination params", %{conn: conn} do
+      conn
+      |> get("/api/v1/pleroma/admin/announcements", limit: 0)
+      |> json_response_and_validate_schema(400)
+
+      conn
+      |> get("/api/v1/pleroma/admin/announcements", limit: -1)
+      |> json_response_and_validate_schema(400)
+
+      conn
+      |> get("/api/v1/pleroma/admin/announcements", offset: -1)
+      |> json_response_and_validate_schema(400)
+    end
   end
 
   describe "GET /api/v1/pleroma/admin/announcements/:id" do
-- 
cgit v1.2.3


From ebcda5265b9c82be26eae65b5ab39629a525c3fa Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 23:00:51 -0500
Subject: Format announcements into html

---
 test/pleroma/announcement_test.exs | 27 +++++++++++++++++++++++++++
 test/support/factory.ex            |  1 +
 2 files changed, 28 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/announcement_test.exs b/test/pleroma/announcement_test.exs
index aa00f804b..a007c3718 100644
--- a/test/pleroma/announcement_test.exs
+++ b/test/pleroma/announcement_test.exs
@@ -68,4 +68,31 @@ defmodule Pleroma.AnnouncementTest do
       assert [] = Announcement.list_all_visible_when(time)
     end
   end
+
+  describe "announcements formatting" do
+    test "it formats links" do
+      raw = "something on https://pleroma.social ."
+      announcement = insert(:announcement, %{data: %{"content" => raw}})
+
+      assert announcement.rendered["content"] =~ ~r(<a.+?https://pleroma.social)
+      assert announcement.data["content"] == raw
+    end
+
+    test "it formats mentions" do
+      user = insert(:user)
+      raw = "something on @#{user.nickname} ."
+      announcement = insert(:announcement, %{data: %{"content" => raw}})
+
+      assert announcement.rendered["content"] =~ ~r(<a.+?#{user.nickname})
+      assert announcement.data["content"] == raw
+    end
+
+    test "it formats tags" do
+      raw = "something on #mew ."
+      announcement = insert(:announcement, %{data: %{"content" => raw}})
+
+      assert announcement.rendered["content"] =~ ~r(<a.+?#mew)
+      assert announcement.data["content"] == raw
+    end
+  end
 end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index d28a56345..efbf3df2e 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -637,5 +637,6 @@ defmodule Pleroma.Factory do
       data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
     |> Map.merge(params)
+    |> Pleroma.Announcement.add_rendered_properties()
   end
 end
-- 
cgit v1.2.3


From 0c78ab4a88d59358a0a5e24a76cbb4cdb2c2d402 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 18 Mar 2022 09:36:13 -0400
Subject: Use utc_datetime in db schema

---
 .../controllers/announcement_controller_test.exs   | 47 ++++++++++++++++++++++
 .../controllers/announcement_controller_test.exs   | 24 +++++++++++
 2 files changed, 71 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
index 56da1c6aa..5b8148c05 100644
--- a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
@@ -156,6 +156,25 @@ defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
       assert NaiveDateTime.compare(new.starts_at, starts_at) == :eq
     end
 
+    test "it updates with time with utc timezone", %{conn: conn} do
+      %{id: id} = insert(:announcement)
+
+      now = DateTime.now("Etc/UTC") |> elem(1) |> DateTime.truncate(:second)
+      starts_at = DateTime.add(now, -10, :second)
+
+      _response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
+          starts_at: DateTime.to_iso8601(starts_at)
+        })
+        |> json_response_and_validate_schema(:ok)
+
+      new = Pleroma.Announcement.get_by_id(id)
+
+      assert DateTime.compare(new.starts_at, starts_at) == :eq
+    end
+
     test "it updates a data field", %{conn: conn} do
       %{id: id} = announcement = insert(:announcement, data: %{"all_day" => true})
 
@@ -230,5 +249,33 @@ defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
       assert NaiveDateTime.compare(announcement.starts_at, starts_at) == :eq
       assert NaiveDateTime.compare(announcement.ends_at, ends_at) == :eq
     end
+
+    test "creating with time with utc timezones", %{conn: conn} do
+      content = "test post announcement api"
+
+      now = DateTime.now("Etc/UTC") |> elem(1) |> DateTime.truncate(:second)
+      starts_at = DateTime.add(now, -10, :second)
+      ends_at = DateTime.add(now, 10, :second)
+
+      response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> post("/api/v1/pleroma/admin/announcements", %{
+          "content" => content,
+          "starts_at" => DateTime.to_iso8601(starts_at),
+          "ends_at" => DateTime.to_iso8601(ends_at),
+          "all_day" => true
+        })
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"content" => ^content, "all_day" => true} = response
+
+      announcement = Pleroma.Announcement.get_by_id(response["id"])
+
+      assert not is_nil(announcement)
+
+      assert DateTime.compare(announcement.starts_at, starts_at) == :eq
+      assert DateTime.compare(announcement.ends_at, ends_at) == :eq
+    end
   end
 end
diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
index 1c748064c..3957cc3ed 100644
--- a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -23,6 +23,30 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
       refute Map.has_key?(Enum.at(response, 0), "read")
     end
 
+    test "it returns time with utc timezone" do
+      start_time =
+        NaiveDateTime.utc_now()
+        |> NaiveDateTime.add(-999_999, :second)
+        |> NaiveDateTime.truncate(:second)
+
+      end_time =
+        NaiveDateTime.utc_now()
+        |> NaiveDateTime.add(999_999, :second)
+        |> NaiveDateTime.truncate(:second)
+
+      %{id: id} = insert(:announcement, %{starts_at: start_time, ends_at: end_time})
+
+      response =
+        build_conn()
+        |> get("/api/v1/announcements")
+        |> json_response_and_validate_schema(:ok)
+
+      assert [%{"id" => ^id}] = [announcement] = response
+
+      assert String.ends_with?(announcement["starts_at"], "Z")
+      assert String.ends_with?(announcement["ends_at"], "Z")
+    end
+
     test "it does not list announcements starting after current time" do
       time = NaiveDateTime.utc_now() |> NaiveDateTime.add(999_999, :second)
       insert(:announcement, starts_at: time)
-- 
cgit v1.2.3


From 7d1dae3befbecbeeb72768afe4f5a23a59ba4f05 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 2 Apr 2022 02:25:13 -0400
Subject: Restrict mastodon api announcements to logged-in users only

---
 .../controllers/announcement_controller_test.exs   | 43 ++++++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
index 3957cc3ed..60c9978c2 100644
--- a/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs
@@ -11,19 +11,40 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
   alias Pleroma.AnnouncementReadRelationship
 
   describe "GET /api/v1/announcements" do
-    test "it lists all announcements" do
+    setup do
+      %{conn: conn} = oauth_access([])
+      {:ok, conn: conn}
+    end
+
+    test "it does not allow guests", %{conn: conn} do
+      _response =
+        conn
+        |> assign(:token, nil)
+        |> get("/api/v1/announcements")
+        |> json_response_and_validate_schema(:forbidden)
+    end
+
+    test "it allows users with scopes" do
+      %{conn: conn} = oauth_access(["read:accounts"])
+
+      _response =
+        conn
+        |> get("/api/v1/announcements")
+        |> json_response_and_validate_schema(:ok)
+    end
+
+    test "it lists all announcements", %{conn: conn} do
       %{id: id} = insert(:announcement)
 
       response =
-        build_conn()
+        conn
         |> get("/api/v1/announcements")
         |> json_response_and_validate_schema(:ok)
 
       assert [%{"id" => ^id}] = response
-      refute Map.has_key?(Enum.at(response, 0), "read")
     end
 
-    test "it returns time with utc timezone" do
+    test "it returns time with utc timezone", %{conn: conn} do
       start_time =
         NaiveDateTime.utc_now()
         |> NaiveDateTime.add(-999_999, :second)
@@ -37,7 +58,7 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
       %{id: id} = insert(:announcement, %{starts_at: start_time, ends_at: end_time})
 
       response =
-        build_conn()
+        conn
         |> get("/api/v1/announcements")
         |> json_response_and_validate_schema(:ok)
 
@@ -47,35 +68,33 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementControllerTest do
       assert String.ends_with?(announcement["ends_at"], "Z")
     end
 
-    test "it does not list announcements starting after current time" do
+    test "it does not list announcements starting after current time", %{conn: conn} do
       time = NaiveDateTime.utc_now() |> NaiveDateTime.add(999_999, :second)
       insert(:announcement, starts_at: time)
 
       response =
-        build_conn()
+        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
+    test "it does not list announcements ending before current time", %{conn: conn} do
       time = NaiveDateTime.utc_now() |> NaiveDateTime.add(-999_999, :second)
       insert(:announcement, ends_at: time)
 
       response =
-        build_conn()
+        conn
         |> get("/api/v1/announcements")
         |> json_response_and_validate_schema(:ok)
 
       assert [] = response
     end
 
-    test "when authenticated, also expose read property" do
+    test "when authenticated, also expose read property", %{conn: conn} do
       %{id: id} = insert(:announcement)
 
-      %{conn: conn} = oauth_access(["read:accounts"])
-
       response =
         conn
         |> get("/api/v1/announcements")
-- 
cgit v1.2.3