Add visibility to comments

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-01-14 16:21:13 +01:00
parent ab56d3e607
commit 2ece62bfb8
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
7 changed files with 31 additions and 22 deletions

View file

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

View file

@ -19,11 +19,11 @@ defmodule Mobilizon.Events do
queryable queryable
end 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 = query =
from( from(
e in Event, 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], order_by: [desc: :id],
preload: [ preload: [
:organizer_actor, :organizer_actor,
@ -50,7 +50,7 @@ defmodule Mobilizon.Events do
from( from(
e in Event, e in Event,
select: count(e.id), select: count(e.id),
where: e.local == ^true and e.visibility == ^:public where: e.local == ^true and e.visibility in [^:public, ^:unlisted]
) )
) )
end end
@ -60,7 +60,7 @@ defmodule Mobilizon.Events do
from( from(
c in Comment, c in Comment,
select: count(c.id), select: count(c.id),
where: c.local == ^true where: c.local == ^true and c.visibility in [^:public, ^:unlisted]
) )
) )
end end
@ -870,7 +870,7 @@ defmodule Mobilizon.Events do
alias Mobilizon.Events.Comment alias Mobilizon.Events.Comment
@doc """ @doc """
Returns the list of comments. Returns the list of public comments.
## Examples ## Examples
@ -879,14 +879,14 @@ defmodule Mobilizon.Events do
""" """
def list_comments do def list_comments do
Repo.all(Comment) Repo.all(from(c in Comment, where: c.visibility == ^:public))
end 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 = query =
from( from(
c in Comment, 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], order_by: [desc: :id],
preload: [ preload: [
:actor, :actor,

View file

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

View file

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

View file

@ -4,6 +4,7 @@ defmodule Mobilizon.Repo.Migrations.FixEventVisibility do
def up do def up do
Mobilizon.Events.EventVisibilityEnum.create_type Mobilizon.Events.EventVisibilityEnum.create_type
Mobilizon.Events.EventStatusEnum.create_type Mobilizon.Events.EventStatusEnum.create_type
Mobilizon.Events.CommentVisibilityEnum.create_type
alter table(:events) do alter table(:events) do
remove(:public) remove(:public)
remove(:status) remove(:status)
@ -11,6 +12,10 @@ defmodule Mobilizon.Repo.Migrations.FixEventVisibility do
add(:visibility, Mobilizon.Events.EventVisibilityEnum.type()) add(:visibility, Mobilizon.Events.EventVisibilityEnum.type())
add(:status, Mobilizon.Events.EventStatusEnum.type()) add(:status, Mobilizon.Events.EventStatusEnum.type())
end end
alter table(:comments) do
add(:visibility, Mobilizon.Events.CommentVisibilityEnum.type())
end
end end
def down do def down do
@ -21,7 +26,11 @@ defmodule Mobilizon.Repo.Migrations.FixEventVisibility do
add(:public, :boolean, null: false, default: false) add(:public, :boolean, null: false, default: false)
add(:status, :integer, null: false, default: 0) add(:status, :integer, null: false, default: 0)
end end
alter table(:comments) do
remove(:visibility)
end
Mobilizon.Events.EventVisibilityEnum.drop_type Mobilizon.Events.EventVisibilityEnum.drop_type
Mobilizon.Events.EventStatusEnum.drop_type Mobilizon.Events.EventStatusEnum.drop_type
Mobilizon.Events.CommentVisibilityEnum.drop_type
end end
end end

View file

@ -125,15 +125,15 @@ defmodule Mobilizon.EventsTest do
assert %Ecto.Changeset{} = Events.change_event(event) assert %Ecto.Changeset{} = Events.change_event(event)
end end
test "get_events_for_actor/1", %{actor: actor, event: event} do test "get_public_events_for_actor/1", %{actor: actor, event: event} do
assert {:ok, [event_found], 1} = Events.get_events_for_actor(actor) assert {:ok, [event_found], 1} = Events.get_public_events_for_actor(actor)
assert event_found.title == event.title assert event_found.title == event.title
end end
test "get_events_for_actor/3", %{actor: actor, event: event} do test "get_public_events_for_actor/3", %{actor: actor, event: event} do
event1 = insert(:event, organizer_actor: actor) event1 = insert(:event, organizer_actor: actor)
with {:ok, events_found, 2} <- Events.get_events_for_actor(actor, 1, 10) do with {:ok, events_found, 2} <- Events.get_public_events_for_actor(actor, 1, 10) do
event_ids = MapSet.new(events_found |> Enum.map(& &1.id)) event_ids = MapSet.new(events_found |> Enum.map(& &1.id))
assert event_ids == MapSet.new([event.id, event1.id]) assert event_ids == MapSet.new([event.id, event1.id])
else else
@ -142,10 +142,11 @@ defmodule Mobilizon.EventsTest do
end end
end end
test "get_events_for_actor/3 with limited results", %{actor: actor, event: event} do test "get_public_events_for_actor/3 with limited results", %{actor: actor, event: event} do
event1 = insert(:event, organizer_actor: actor) event1 = insert(:event, organizer_actor: actor)
with {:ok, [%Event{id: event_found_id}], 2} <- Events.get_events_for_actor(actor, 1, 1) do with {:ok, [%Event{id: event_found_id}], 2} <-
Events.get_public_events_for_actor(actor, 1, 1) do
assert event_found_id in [event.id, event1.id] assert event_found_id in [event.id, event1.id]
else else
err -> err ->

View file

@ -42,7 +42,7 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
end end
test "it returns 404 for non-public events", %{conn: conn} do test "it returns 404 for non-public events", %{conn: conn} do
event = insert(:event, public: false) event = insert(:event, visibility: :private)
conn = conn =
conn conn