pleroma

commit: c867d232505189d907e72d7501817e8a1f287f1c
parent d7af67012f64d09bb50259188473c1c94418b3a2
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Tue,  8 Mar 2022 09:35:35 -0500

Fill properties of announcements from Mastodon API spec

Diffstat:
M
lib/pleroma/announcement.ex
32
++++++++++++++++++++++++++++++++
M
lib/pleroma/web/admin_api/views/announcement_view.ex
7
+------
M
lib/pleroma/web/api_spec/schemas/announcement.ex
19
++++++++++++++++---

3 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/lib/pleroma/announcement.ex b/lib/pleroma/announcement.ex
@@ -48,4 +48,36 @@ defmodule Pleroma.Announcement do
         :error
     end
   end
+
+  def read_by?(_announcement, _user) do
+    false
+  end
+
+  def render_json(announcement, opts \\ []) do
+    extra_params =
+      case Keyword.fetch(opts, :for) do
+        {:ok, user} ->
+          %{read: read_by?(announcement, user)}
+        _ ->
+          %{}
+      end
+
+    base = %{
+      id: announcement.id,
+      content: announcement.data["content"],
+      starts_at: :null,
+      ends_at: :null,
+      all_day: false,
+      published_at: announcement.inserted_at,
+      updated_at: announcement.updated_at,
+      mentions: [],
+      statuses: [],
+      tags: [],
+      emojis: [],
+      reactions: []
+    }
+
+    base
+    |> Map.merge(extra_params)
+  end
 end
diff --git a/lib/pleroma/web/admin_api/views/announcement_view.ex b/lib/pleroma/web/admin_api/views/announcement_view.ex
@@ -10,11 +10,6 @@ defmodule Pleroma.Web.AdminAPI.AnnouncementView do
   end
 
   def render("show.json", %{announcement: announcement}) do
-    %{
-      id: announcement.id,
-      content: announcement.data["content"],
-      published_at: announcement.inserted_at,
-      updated_at: announcement.updated_at
-    }
+    Pleroma.Announcement.render_json(announcement)
   end
 end
diff --git a/lib/pleroma/web/api_spec/schemas/announcement.ex b/lib/pleroma/web/api_spec/schemas/announcement.ex
@@ -9,14 +9,27 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Announcement do
   require OpenApiSpex
 
   OpenApiSpex.schema(%{
-    title: "Account",
-    description: "Response schema for an account",
+    title: "Announcement",
+    description: "Response schema for an announcement",
     type: :object,
     properties: %{
       id: FlakeID,
       content: %Schema{type: :string},
+      starts_at: %Schema{
+        oneOf: [%Schema{type: :null}, %Schema{type: :string, format: "date-time"}]
+      },
+      ends_at: %Schema{
+        oneOf: [%Schema{type: :null}, %Schema{type: :string, format: "date-time"}]
+      },
+      all_day: %Schema{type: :boolean},
       published_at: %Schema{type: :string, format: "date-time"},
-      updated_at: %Schema{type: :string, format: "date-time"}
+      updated_at: %Schema{type: :string, format: "date-time"},
+      read: %Schema{type: :boolean},
+      mentions: %Schema{type: :array},
+      statuses: %Schema{type: :array},
+      tags: %Schema{type: :array},
+      emojis: %Schema{type: :array},
+      reactions: %Schema{type: :array}
     }
   })
 end