Add visibility to comments

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

lib/mobilizon/events/comment.ex

@@ -2,11 +2,10 @@ import EctoEnum
 
 defenum(Mobilizon.Events.CommentVisibilityEnum, :comment_visibility_type, [
   :public,
-  :local,
-  :group,
   :unlisted,
+  :private,
   :moderated,
-  :private
+  :invite
 ])
 
 defmodule Mobilizon.Events.Comment do
@@ -25,7 +24,7 @@ defmodule Mobilizon.Events.Comment do
     field(:text, :string)
     field(:url, :string)
     field(:local, :boolean, default: true)
-    field(:visibility, :integer)
+    field(:visibility, Mobilizon.Events.CommentVisibilityEnum, default: :public)
     field(:uuid, Ecto.UUID)
     belongs_to(:actor, Actor, foreign_key: :actor_id)
     belongs_to(:attributed_to, Actor, foreign_key: :attributed_to_id)

lib/mobilizon/events/events.ex

@@ -19,11 +19,11 @@ defmodule Mobilizon.Events do
     queryable
   end
 
-  def get_events_for_actor(%Actor{id: actor_id} = _actor, page \\ nil, limit \\ nil) do
+  def get_public_events_for_actor(%Actor{id: actor_id} = _actor, page \\ nil, limit \\ nil) do
     query =
       from(
         e in Event,
-        where: e.organizer_actor_id == ^actor_id,
+        where: e.organizer_actor_id == ^actor_id and e.visibility in [^:public, ^:unlisted],
         order_by: [desc: :id],
         preload: [
           :organizer_actor,
@@ -50,7 +50,7 @@ defmodule Mobilizon.Events do
       from(
         e in Event,
         select: count(e.id),
-        where: e.local == ^true and e.visibility == ^:public
+        where: e.local == ^true and e.visibility in [^:public, ^:unlisted]
       )
     )
   end
@@ -60,7 +60,7 @@ defmodule Mobilizon.Events do
       from(
         c in Comment,
         select: count(c.id),
-        where: c.local == ^true
+        where: c.local == ^true and c.visibility in [^:public, ^:unlisted]
       )
     )
   end
@@ -870,7 +870,7 @@ defmodule Mobilizon.Events do
   alias Mobilizon.Events.Comment
 
   @doc """
-  Returns the list of comments.
+  Returns the list of public comments.
 
   ## Examples
 
@@ -879,14 +879,14 @@ defmodule Mobilizon.Events do
 
   """
   def list_comments do
-    Repo.all(Comment)
+    Repo.all(from(c in Comment, where: c.visibility == ^:public))
   end
 
-  def get_comments_for_actor(%Actor{id: actor_id}, page \\ nil, limit \\ nil) do
+  def get_public_comments_for_actor(%Actor{id: actor_id}, page \\ nil, limit \\ nil) do
     query =
       from(
         c in Comment,
-        where: c.actor_id == ^actor_id,
+        where: c.actor_id == ^actor_id and c.visibility in [^:public, ^:unlisted],
         order_by: [desc: :id],
         preload: [
           :actor,

lib/mobilizon_web/controllers/activity_pub_controller.ex

@@ -47,7 +47,7 @@ defmodule MobilizonWeb.ActivityPubController do
 
   def event(conn, %{"uuid" => uuid}) do
     with %Event{} = event <- Events.get_event_full_by_uuid(uuid),
-         true <- event.public do
+         true <- event.visibility in [:public, :unlisted] do
       conn
       |> put_resp_header("content-type", "application/activity+json")
       |> json(ObjectView.render("event.json", %{event: event |> Utils.make_event_data()}))

lib/service/activity_pub/activity_pub.ex

@@ -474,8 +474,8 @@ defmodule Mobilizon.Service.ActivityPub do
   def fetch_public_activities_for_actor(%Actor{} = actor, page, limit) do
     case actor.type do
       :Person ->
-        {:ok, events, total_events} = Events.get_events_for_actor(actor, page, limit)
-        {:ok, comments, total_comments} = Events.get_comments_for_actor(actor, page, limit)
+        {:ok, events, total_events} = Events.get_public_events_for_actor(actor, page, limit)
+        {:ok, comments, total_comments} = Events.get_public_comments_for_actor(actor, page, limit)
 
         event_activities = Enum.map(events, &event_to_activity/1)