nil
end
+ last_group_created =
+ case Actors.list_actors(:Group) do
+ %Page{elements: [group | _]} -> group
+ _ -> nil
+ end
+
{:ok,
%{
number_of_users: Statistics.get_cached_value(:local_users),
number_of_events: Statistics.get_cached_value(:local_events),
+ number_of_groups: Statistics.get_cached_value(:local_groups),
number_of_comments: Statistics.get_cached_value(:local_comments),
+ number_of_confirmed_participations_to_local_events:
+ Statistics.get_cached_value(:confirmed_participations_to_local_events),
number_of_reports: Mobilizon.Reports.count_opened_reports(),
- last_public_event_published: last_public_event_published
+ number_of_followers: Statistics.get_cached_value(:instance_followers),
+ number_of_followings: Statistics.get_cached_value(:instance_followings),
+ last_public_event_published: last_public_event_published,
+ last_group_created: last_group_created
}}
end
diff --git a/lib/graphql/schema/admin.ex b/lib/graphql/schema/admin.ex
index a5b58cd03..4126f7214 100644
--- a/lib/graphql/schema/admin.ex
+++ b/lib/graphql/schema/admin.ex
@@ -70,11 +70,19 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
end
object :dashboard do
- field(:last_public_event_published, :event, description: "Last public event publish")
+ field(:last_public_event_published, :event, description: "Last public event published")
+ field(:last_group_created, :group, description: "Last public group created")
field(:number_of_users, :integer, description: "The number of local users")
field(:number_of_events, :integer, description: "The number of local events")
field(:number_of_comments, :integer, description: "The number of local comments")
+ field(:number_of_groups, :integer, description: "The number of local groups")
field(:number_of_reports, :integer, description: "The number of current opened reports")
+ field(:number_of_followers, :integer, description: "The number of instance followers")
+ field(:number_of_followings, :integer, description: "The number of instance followings")
+
+ field(:number_of_confirmed_participations_to_local_events, :integer,
+ description: "The number of total confirmed participations to local events"
+ )
end
object :admin_settings do
diff --git a/lib/mix/tasks/mobilizon/instance.ex b/lib/mix/tasks/mobilizon/instance.ex
index fb11eca03..a833edcdf 100644
--- a/lib/mix/tasks/mobilizon/instance.ex
+++ b/lib/mix/tasks/mobilizon/instance.ex
@@ -160,9 +160,7 @@ defmodule Mix.Tasks.Mobilizon.Instance do
database_password: dbpass
)
- Mix.shell().info(
- "Writing config to #{config_path}. You should rename it to .env.production, .env.dev or .env.test"
- )
+ Mix.shell().info("Writing config to #{config_path}.")
File.write(config_path, result_config)
Mix.shell().info("Writing #{psql_path}.")
diff --git a/lib/mobilizon/discussions/discussions.ex b/lib/mobilizon/discussions/discussions.ex
index 630788b46..132fb647b 100644
--- a/lib/mobilizon/discussions/discussions.ex
+++ b/lib/mobilizon/discussions/discussions.ex
@@ -283,16 +283,24 @@ defmodule Mobilizon.Discussions do
end
@doc """
- Counts local comments.
+ Counts local comments under events
"""
- @spec count_local_comments :: integer
- def count_local_comments, do: Repo.one(count_local_comments_query())
+ @spec count_local_comments_under_events :: integer
+ def count_local_comments_under_events do
+ count_local_comments_query()
+ |> filter_comments_under_events()
+ |> Repo.one()
+ end
@doc """
Counts all comments.
"""
- @spec count_comments :: integer
- def count_comments, do: Repo.one(count_comments_query())
+ @spec count_comments_under_events :: integer
+ def count_comments_under_events do
+ count_comments_query()
+ |> filter_comments_under_events()
+ |> Repo.one()
+ end
def get_discussion(discussion_id) do
Discussion
@@ -423,11 +431,8 @@ defmodule Mobilizon.Discussions do
@spec count_local_comments_query :: Ecto.Query.t()
defp count_local_comments_query do
- from(
- c in Comment,
- select: count(c.id),
- where: c.local == ^true and c.visibility in ^@public_visibility
- )
+ count_comments_query()
+ |> where([c], local: true)
end
@spec count_comments_query :: Ecto.Query.t()
@@ -439,6 +444,10 @@ defmodule Mobilizon.Discussions do
)
end
+ defp filter_comments_under_events(query) do
+ where(query, [c], is_nil(c.discussion_id) and not is_nil(c.event_id))
+ end
+
@spec preload_for_comment(Ecto.Query.t()) :: Ecto.Query.t()
defp preload_for_comment(query), do: preload(query, ^@comment_preloads)
end
diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex
index bb94c67e6..92d40e9b5 100644
--- a/lib/mobilizon/events/events.ex
+++ b/lib/mobilizon/events/events.ex
@@ -798,6 +798,15 @@ defmodule Mobilizon.Events do
@moderator_roles [:moderator, :administrator, :creator]
+ @doc """
+ Returns the number of participations for all local events
+ """
+ @spec count_confirmed_participants_for_local_events :: integer()
+ def count_confirmed_participants_for_local_events do
+ count_confirmed_participants_for_local_events_query()
+ |> Repo.one()
+ end
+
@doc """
Returns the list of participants for an event.
Default behaviour is to not return :not_approved or :not_confirmed participants
@@ -1548,6 +1557,14 @@ defmodule Mobilizon.Events do
from(s in Session, where: s.track_id == ^track_id)
end
+ @spec count_confirmed_participants_for_local_events_query :: Ecto.Query.t()
+ defp count_confirmed_participants_for_local_events_query do
+ Participant
+ |> join(:inner, [p], e in Event, on: p.event_id == e.id)
+ |> where([p, e], e.local and p.role not in [^:not_approved, ^:not_confirmed, ^:rejected])
+ |> select([p], count(p.id))
+ end
+
@spec list_participants_for_event_query(String.t()) :: Ecto.Query.t()
defp list_participants_for_event_query(event_id) do
from(
diff --git a/lib/service/statistics/statistics.ex b/lib/service/statistics/statistics.ex
index 42998b968..99494726d 100644
--- a/lib/service/statistics/statistics.ex
+++ b/lib/service/statistics/statistics.ex
@@ -26,8 +26,12 @@ defmodule Mobilizon.Service.Statistics do
Events.count_local_events()
end
+ defp create_cache(:confirmed_participations_to_local_events) do
+ Events.count_confirmed_participants_for_local_events()
+ end
+
defp create_cache(:local_comments) do
- Discussions.count_local_comments()
+ Discussions.count_local_comments_under_events()
end
defp create_cache(:local_groups) do
@@ -39,7 +43,7 @@ defmodule Mobilizon.Service.Statistics do
end
defp create_cache(:federation_comments) do
- Discussions.count_comments()
+ Discussions.count_comments_under_events()
end
defp create_cache(:federation_groups) do