hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(reports): allow reports to hold multiple events

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2023-06-05 18:32:29 +02:00
parent 538139eefa
commit f2ac3e2e5d
21 changed files with 185 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/federation/activity_pub/types/reports.ex
View File

@@ -2,7 +2,6 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Reports do
@moduledoc false
alias Mobilizon.{Actors, Discussions, Events, Reports}
alias Mobilizon.Actors.Actor
alias Mobilizon.Events.Event
alias Mobilizon.Federation.ActivityStream
alias Mobilizon.Federation.ActivityStream.Convertible
alias Mobilizon.Reports.Report
@@ -26,15 +25,16 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Reports do
%Actor{} = reported_actor = Actors.get_actor!(args.reported_id)
content = HTML.strip_tags(args.content)
event_id = Map.get(args, :event_id)
event =
if is_nil(event_id) do
nil
else
{:ok, %Event{} = event} = Events.get_event(event_id)
event
end
events =
args
|> Map.get(:events_ids, [])
|> Enum.map(fn event_id ->
case Events.get_event(event_id) do
{:ok, event} -> event
{:error, :event_not_found} -> nil
end
end)
|> Enum.filter(& &1)
comments =
Discussions.list_comments_by_actor_and_ids(
@@ -46,7 +46,7 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Reports do
reporter: reporter_actor,
reported: reported_actor,
content: content,
event: event,
events: events,
comments: comments
})
end

43
lib/federation/activity_stream/converter/flag.ex
View File

@@ -9,11 +9,11 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
"""
alias Mobilizon.Actors.Actor
alias Mobilizon.Discussions
alias Mobilizon.Events
alias Mobilizon.Discussions.Comment
alias Mobilizon.Events.Event
alias Mobilizon.Reports.Report
alias Mobilizon.Federation.ActivityPub
alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
alias Mobilizon.Federation.ActivityPub.Relay
alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
@@ -38,7 +38,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
"uri" => params["uri"],
"content" => params["content"],
"reported_id" => params["reported"].id,
"event_id" => (!is_nil(params["event"]) && params["event"].id) || nil,
"events" => params["events"],
"comments" => params["comments"]
}
end
@@ -50,9 +50,10 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
@impl Converter
@spec model_to_as(Report.t()) :: map
def model_to_as(%Report{} = report) do
object = [report.reported.url] ++ Enum.map(report.comments, fn comment -> comment.url end)
object = if report.event, do: object ++ [report.event.url], else: object
object =
[report.reported.url] ++
Enum.map(report.comments, fn comment -> comment.url end) ++
Enum.map(report.events, & &1.url)
%{
"type" => "Flag",
@@ -68,14 +69,13 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
with {:ok, %Actor{} = reporter} <-
ActivityPubActor.get_or_fetch_actor_by_url(object["actor"]),
%Actor{} = reported <- find_reported(objects),
event <- find_event(objects),
comments <- find_comments(objects, reported, event) do
%{events: events, comments: comments} <- find_events_and_comments(objects) do
%{
"reporter" => reporter,
"uri" => object["id"],
"content" => object["content"],
"reported" => reported,
"event" => event,
"events" => events,
"comments" => comments
}
end
@@ -94,26 +94,19 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
end)
end
# Remove the reported actor and the event from the object list.
@spec find_comments(list(String.t()), Actor.t() | nil, Event.t() | nil) :: list(Comment.t())
defp find_comments(objects, reported, event) do
defp find_events_and_comments(objects) do
objects
|> Enum.filter(fn url ->
!((!is_nil(reported) && url == reported.url) || (!is_nil(event) && event.url == url))
end)
|> Enum.map(&Discussions.get_comment_from_url/1)
|> Enum.filter(& &1)
end
|> Enum.map(&ActivityPub.fetch_object_from_url/1)
|> Enum.reduce(%{comments: [], events: []}, fn res, acc ->
case res do
{:ok, %Event{} = event} ->
Map.put(acc, :events, [event | acc.events])
@spec find_event(list(String.t())) :: Event.t() | nil
defp find_event(objects) do
Enum.reduce_while(objects, nil, fn url, _ ->
case Events.get_event_by_url(url) do
%Event{} = event ->
{:halt, event}
{:ok, %Comment{} = comment} ->
Map.put(acc, :comments, [comment | acc.comments])
_ ->
{:cont, nil}
acc
end
end)
end

2
lib/graphql/resolvers/report.ex
View File

@@ -67,7 +67,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
{:ok, _, %Report{} = report} ->
{:ok, report}
_error ->
error ->
{:error, dgettext("errors", "Error while saving report")}
end
end

10
lib/graphql/schema/report.ex
View File

@@ -19,7 +19,7 @@ defmodule Mobilizon.GraphQL.Schema.ReportType do
field(:uri, :string, description: "The URI of the report", meta: [private: true])
field(:reported, :actor, description: "The actor that is being reported")
field(:reporter, :actor, description: "The actor that created the report")
field(:event, :event, description: "The event that is being reported")
field(:events, list_of(:event), description: "The event that is being reported")
field(:comments, list_of(:comment), description: "The comments that are reported")
field(:notes, list_of(:report_note),
@@ -100,11 +100,15 @@ defmodule Mobilizon.GraphQL.Schema.ReportType do
field :create_report, type: :report do
arg(:content, :string, description: "The message sent with the report")
arg(:reported_id, non_null(:id), description: "The actor's ID that is being reported")
arg(:event_id, :id, default_value: nil, description: "The event ID that is being reported")
arg(:events_ids, list_of(:id),
default_value: [],
description: "The list of event IDs that are being reported"
)
arg(:comments_ids, list_of(:id),
default_value: [],
description: "The comment ID that is being reported"
description: "The comment IDs that are being reported"
)
arg(:forward, :boolean,

15
lib/mobilizon/reports/report.ex
View File

@@ -22,13 +22,13 @@ defmodule Mobilizon.Reports.Report do
reported: Actor.t(),
reporter: Actor.t(),
manager: Actor.t(),
event: Event.t(),
events: [Event.t()],
comments: [Comment.t()],
notes: [Note.t()]
}
@required_attrs [:url, :reported_id, :reporter_id]
@optional_attrs [:content, :status, :manager_id, :event_id, :local]
@optional_attrs [:content, :status, :manager_id, :local]
@attrs @required_attrs ++ @optional_attrs
@timestamps_opts [type: :utc_datetime]
@@ -46,8 +46,8 @@ defmodule Mobilizon.Reports.Report do
belongs_to(:reporter, Actor)
# The actor who last acted on this report
belongs_to(:manager, Actor)
# The eventual Event inside the report
belongs_to(:event, Event)
# The eventual Events inside the report
many_to_many(:events, Event, join_through: "reports_events", on_replace: :delete)
# The eventual Comments inside the report
many_to_many(:comments, Comment, join_through: "reports_comments", on_replace: :delete)
# The notes associated to the report
@@ -62,6 +62,7 @@ defmodule Mobilizon.Reports.Report do
report
|> cast(attrs, @attrs)
|> maybe_generate_url()
|> maybe_put_events(attrs)
|> maybe_put_comments(attrs)
|> validate_required(@required_attrs)
end
@@ -72,6 +73,12 @@ defmodule Mobilizon.Reports.Report do
defp maybe_put_comments(%Ecto.Changeset{} = changeset, _), do: changeset
defp maybe_put_events(%Ecto.Changeset{} = changeset, %{events: events}) do
put_assoc(changeset, :events, events)
end
defp maybe_put_events(%Ecto.Changeset{} = changeset, _), do: changeset
@spec maybe_generate_url(Ecto.Changeset.t()) :: Ecto.Changeset.t()
defp maybe_generate_url(%Ecto.Changeset{} = changeset) do
with res when res in [:error, {:data, nil}] <- fetch_field(changeset, :url),

6
lib/mobilizon/reports/reports.ex
View File

@@ -21,7 +21,7 @@ defmodule Mobilizon.Reports do
def get_report(id) do
Report
|> Repo.get(id)
|> Repo.preload([:reported, :reporter, :manager, :event, :comments, :notes])
|> Repo.preload([:reported, :reporter, :manager, :events, :comments, :notes])
end
@doc """
@@ -33,7 +33,7 @@ defmodule Mobilizon.Reports do
%Report{}
|> Report.changeset(attrs)
|> Repo.insert() do
{:ok, Repo.preload(report, [:event, :reported, :reporter, :comments])}
{:ok, Repo.preload(report, [:events, :reported, :reporter, :comments])}
end
end
@@ -102,7 +102,7 @@ defmodule Mobilizon.Reports do
@spec list_reports_query(atom()) :: Ecto.Query.t()
defp list_reports_query(status) do
Report
|> preload([:reported, :reporter, :manager, :event, :comments, :notes])
|> preload([:reported, :reporter, :manager, :events, :comments, :notes])
|> where([r], r.status == ^status)
end

2
lib/service/anti_spam/akismet.ex
View File

@@ -139,7 +139,7 @@ defmodule Mobilizon.Service.AntiSpam.Akismet do
end
end
defp report_to_akismet_comment(%Report{event: %Event{id: event_id}}) do
defp report_to_akismet_comment(%Report{events: [%Event{id: event_id} | _]}) do
with %Event{description: body, organizer_actor: %Actor{} = actor} <-
Events.get_event_with_preload!(event_id),
{email, preferred_username, ip} <- actor_details(actor) do

25
lib/web/templates/email/report.html.heex
View File

@@ -104,7 +104,7 @@
</td>
</tr>
<% end %>
<%= if Map.has_key?(@report, :event) and @report.event do %>
<%= if Map.has_key?(@report, :events) and length(@report.events) > 0 do %>
<tr>
<td
bgcolor="#ffffff"
@@ -112,16 +112,19 @@
style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
>
<p style="margin: 0;">
<h3><%= gettext("Event") %></h3>
<a
href={"#{"#{Mobilizon.Web.Endpoint.url()}/events/#{@report.event.uuid}"}"}
target="_blank"
>
<%= gettext("%{title} by %{creator}",
title: @report.event.title,
creator: Mobilizon.Actors.Actor.preferred_username_and_domain(@report.reported)
) %>
</a>
<h3><%= gettext("Flagged events") %></h3>
<%= for event <- @report.events do %>
<a
href={"#{"#{Mobilizon.Web.Endpoint.url()}/events/#{event.uuid}"}"}
target="_blank"
>
<%= gettext("%{title} by %{creator}",
title: event.title,
creator:
Mobilizon.Actors.Actor.preferred_username_and_domain(@report.reported)
) %>
</a>
<% end %>
</p>
<table
cellspacing="0"

8
lib/web/templates/email/report.text.eex
View File

@@ -7,9 +7,11 @@
<%= gettext "Profile %{profile} was reported", profile: Mobilizon.Actors.Actor.display_name_and_username(@report.reported) %>
<% end %>
<% end %>
<%= if Map.has_key?(@report, :event) and @report.event do %>
<%= gettext "Event" %>
<%= @report.event.title %>
<%= if Map.has_key?(@report, :event) && length(@report.events) > 0 do %>
<%= gettext "Events" %>
<%= for event <- @report.events do %>
<%= event.title %>
<% end %>
<% end %>
<%= if Map.has_key?(@report, :comments) && length(@report.comments) > 0 do %>
<%= gettext "Comments" %>