Introduce group posts

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/web/controllers/activity_pub_controller.ex

@@ -14,6 +14,7 @@ defmodule Mobilizon.Web.ActivityPubController do
 
   alias Mobilizon.Web.ActivityPub.ActorView
   alias Mobilizon.Web.Cache
+  alias Plug.Conn
 
   require Logger
 
@@ -33,96 +34,40 @@ defmodule Mobilizon.Web.ActivityPubController do
     end
   end
 
-  def following(conn, %{"name" => name, "page" => page}) do
-    with {page, ""} <- Integer.parse(page),
-         %Actor{} = actor <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(ActorView.render("following.json", %{actor: actor, page: page}))
-    end
+  def following(conn, args) do
+    actor_collection(conn, "following", args)
   end
 
-  def following(conn, %{"name" => name}) do
-    with %Actor{} = actor <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(ActorView.render("following.json", %{actor: actor}))
-    end
+  def followers(conn, args) do
+    actor_collection(conn, "followers", args)
   end
 
-  def followers(conn, %{"name" => name, "page" => page}) do
-    with {page, ""} <- Integer.parse(page),
-         %Actor{} = actor <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(ActorView.render("followers.json", %{actor: actor, page: page}))
-    end
+  def members(conn, args) do
+    actor_collection(conn, "members", args)
   end
 
-  def followers(conn, %{"name" => name}) do
-    with %Actor{} = actor <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(ActorView.render("followers.json", %{actor: actor}))
-    end
+  def resources(conn, args) do
+    actor_collection(conn, "resources", args)
   end
 
-  def members(conn, %{"name" => name, "page" => page}) do
-    with {page, ""} <- Integer.parse(page),
-         %Actor{} = group <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(
-        ActorView.render("members.json", %{
-          group: group,
-          page: page,
-          actor_applicant: Map.get(conn.assigns, :actor)
-        })
-      )
-    end
+  def posts(conn, args) do
+    actor_collection(conn, "posts", args)
   end
 
-  def members(conn, %{"name" => name}) do
-    with %Actor{} = group <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(
-        ActorView.render("members.json", %{
-          group: group,
-          actor_applicant: Map.get(conn.assigns, :actor)
-        })
-      )
-    end
+  def todos(conn, args) do
+    actor_collection(conn, "todos", args)
   end
 
-  def resources(conn, %{"name" => name}) do
-    with %Actor{} = group <- Actors.get_local_actor_by_name_with_preload(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(
-        ActorView.render("resources.json", %{
-          group: group,
-          actor_applicant: Map.get(conn.assigns, :actor)
-        })
-      )
-    end
+  def events(conn, args) do
+    actor_collection(conn, "events", args)
   end
 
-  def outbox(conn, %{"name" => name, "page" => page}) do
-    with {page, ""} <- Integer.parse(page),
-         %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(ActorView.render("outbox.json", %{actor: actor, page: page}))
-    end
+  def discussions(conn, args) do
+    actor_collection(conn, "discussions", args)
   end
 
-  def outbox(conn, %{"name" => name}) do
-    with %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
-      conn
-      |> put_resp_header("content-type", "application/activity+json")
-      |> json(ActorView.render("outbox.json", %{actor: actor}))
-    end
+  def outbox(conn, args) do
+    actor_collection(conn, "outbox", args)
   end
 
   # TODO: Ensure that this inbox is a recipient of the message
@@ -178,4 +123,34 @@ defmodule Mobilizon.Web.ActivityPubController do
     |> put_status(500)
     |> json("Unknown Error")
   end
+
+  @spec actor_collection(Conn.t(), String.t(), map()) :: Conn.t()
+
+  defp actor_collection(conn, collection, %{"name" => name, "page" => page}) do
+    with {page, ""} <- Integer.parse(page),
+         %Actor{} = actor <- Actors.get_local_actor_by_name_with_preload(name) do
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(
+        ActorView.render("#{collection}.json", %{
+          actor: actor,
+          page: page,
+          actor_applicant: Map.get(conn.assigns, :actor)
+        })
+      )
+    end
+  end
+
+  defp actor_collection(conn, collection, %{"name" => name}) do
+    with %Actor{} = actor <- Actors.get_local_actor_by_name_with_preload(name) do
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(
+        ActorView.render("#{collection}.json", %{
+          actor: actor,
+          actor_applicant: Map.get(conn.assigns, :actor)
+        })
+      )
+    end
+  end
 end

lib/web/controllers/page_controller.ex

@@ -4,7 +4,7 @@ defmodule Mobilizon.Web.PageController do
   """
   use Mobilizon.Web, :controller
 
-  alias Mobilizon.Conversations.Comment
+  alias Mobilizon.Discussions.Comment
   alias Mobilizon.Events.Event
   alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Tombstone
@@ -40,14 +40,36 @@ defmodule Mobilizon.Web.PageController do
     render_or_error(conn, &checks?/3, status, :resource, resource)
   end
 
-  def resources(conn, %{"name" => _name}) do
-    case get_format(conn) do
-      "html" ->
-        render(conn, :index)
+  @spec post(Plug.Conn.t(), map()) :: Plug.Conn.t() | {:error, :not_found}
+  def post(conn, %{"slug" => slug}) do
+    {status, post} = Cache.get_post_by_slug_with_preload(slug)
+    render_or_error(conn, &checks?/3, status, :post, post)
+  end
 
-      "activity-json" ->
-        ActivityPubController.call(conn, :resources)
-    end
+  @spec discussion(Plug.Conn.t(), map()) :: Plug.Conn.t() | {:error, :not_found}
+  def discussion(conn, %{"slug" => slug}) do
+    {status, discussion} = Cache.get_discussion_by_slug_with_preload(slug)
+    render_or_error(conn, &checks?/3, status, :discussion, discussion)
+  end
+
+  def resources(conn, %{"name" => _name}) do
+    handle_collection_route(conn, :resources)
+  end
+
+  def posts(conn, %{"name" => _name}) do
+    handle_collection_route(conn, :posts)
+  end
+
+  def discussions(conn, %{"name" => _name}) do
+    handle_collection_route(conn, :discussions)
+  end
+
+  def events(conn, %{"name" => _name}) do
+    handle_collection_route(conn, :events)
+  end
+
+  def todos(conn, %{"name" => _name}) do
+    handle_collection_route(conn, :todos)
   end
 
   @spec todo_list(Plug.Conn.t(), map) :: {:error, :not_found} | Plug.Conn.t()
@@ -71,6 +93,16 @@ defmodule Mobilizon.Web.PageController do
     end
   end
 
+  defp handle_collection_route(conn, collection) do
+    case get_format(conn) do
+      "html" ->
+        render(conn, :index)
+
+      "activity-json" ->
+        ActivityPubController.call(conn, collection)
+    end
+  end
+
   defp render_or_error(conn, check_fn, status, object_type, object) do
     case check_fn.(conn, status, object) do
       true ->