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

Add global search

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2022-08-26 16:08:58 +02:00
parent bfc936f57c
commit 48935e2168
216 changed files with 3646 additions and 2806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/graphql/api/search.ex
View File

@@ -7,10 +7,10 @@ defmodule Mobilizon.GraphQL.API.Search do
alias Mobilizon.Actors.Actor
alias Mobilizon.Events
alias Mobilizon.Events.Event
alias Mobilizon.Storage.Page
alias Mobilizon.Federation.ActivityPub
alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
alias Mobilizon.Service.GlobalSearch
alias Mobilizon.Storage.Page
import Mobilizon.GraphQL.Resolvers.Event.Utils
require Logger
@@ -40,23 +40,29 @@ defmodule Mobilizon.GraphQL.API.Search do
{:ok, process_from_username(term)}
true ->
page =
Actors.search_actors(
term,
[
actor_type: result_type,
radius: Map.get(args, :radius),
location: Map.get(args, :location),
minimum_visibility: Map.get(args, :minimum_visibility, :public),
current_actor_id: Map.get(args, :current_actor_id),
exclude_my_groups: Map.get(args, :exclude_my_groups, false),
exclude_stale_actors: true
],
page,
limit
)
if is_global_search(args) do
service = GlobalSearch.service()
{:ok, page}
{:ok, service.search_groups(Keyword.new(args, fn {k, v} -> {k, v} end))}
else
page =
Actors.search_actors(
term,
[
actor_type: result_type,
radius: Map.get(args, :radius),
location: Map.get(args, :location),
minimum_visibility: Map.get(args, :minimum_visibility, :public),
current_actor_id: Map.get(args, :current_actor_id),
exclude_my_groups: Map.get(args, :exclude_my_groups, false),
exclude_stale_actors: true
],
page,
limit
)
{:ok, page}
end
end
end
@@ -82,7 +88,13 @@ defmodule Mobilizon.GraphQL.API.Search do
{:ok, %{total: 0, elements: []}}
end
else
{:ok, Events.build_events_for_search(Map.put(args, :term, term), page, limit)}
if is_global_search(args) do
service = GlobalSearch.service()
{:ok, service.search_events(Keyword.new(args, fn {k, v} -> {k, v} end))}
else
{:ok, Events.build_events_for_search(Map.put(args, :term, term), page, limit)}
end
end
end
@@ -136,4 +148,18 @@ defmodule Mobilizon.GraphQL.API.Search do
@spec is_handle(String.t()) :: boolean
defp is_handle(search), do: String.match?(search, ~r/@/)
defp is_global_search(%{search_target: :global}) do
global_search_enabled?()
end
defp is_global_search(_), do: global_search_enabled?() && global_search_default?()
defp global_search_enabled? do
Application.get_env(:mobilizon, :search) |> get_in([:global]) |> get_in([:is_enabled])
end
defp global_search_default? do
Application.get_env(:mobilizon, :search) |> get_in([:global]) |> get_in([:is_default_search])
end
end

3
lib/graphql/resolvers/address.ex
View File

@@ -45,7 +45,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Address do
_context
) do
addresses =
Geospatial.service().geocode(longitude, latitude, lang: locale, zoom: zoom)
longitude
|> Geospatial.service().geocode(latitude, lang: locale, zoom: zoom)
|> Enum.map(fn address ->
picture_info =
Pictures.service().search(address.locality || address.region || address.country)

12
lib/graphql/resolvers/config.ex
View File

@@ -172,7 +172,17 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
get_in(Application.get_env(:web_push_encryption, :vapid_details), [:public_key])
},
export_formats: Config.instance_export_formats(),
analytics: FrontEndAnalytics.config()
analytics: FrontEndAnalytics.config(),
search: %{
global: %{
is_enabled:
Application.get_env(:mobilizon, :search) |> get_in([:global]) |> get_in([:is_enabled]),
is_default:
Application.get_env(:mobilizon, :search)
|> get_in([:global])
|> get_in([:is_default_search])
}
}
}
end
end

4
lib/graphql/resolvers/followers.ex
View File

@@ -67,4 +67,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Followers do
end
def update_follower(_, _, _), do: {:error, :unauthenticated}
def count_followers_for_group(%Actor{type: :Group} = group, _args, _resolution) do
{:ok, Actors.count_followers_for_actor(group)}
end
end

4
lib/graphql/resolvers/member.ex
View File

@@ -254,6 +254,10 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
"You must be logged-in to remove a member"
)}
def count_members_for_group(%Actor{type: :Group} = group, _args, _resolution) do
{:ok, Actors.count_members_for_group(group)}
end
# Rejected members can be invited again
@spec check_member_not_existant_or_rejected(String.t() | integer, String.t() | integer()) ::
boolean()

4
lib/graphql/schema/actor.ex
View File

@@ -32,8 +32,8 @@ defmodule Mobilizon.GraphQL.Schema.ActorInterface do
field(:banner, :media, description: "The actor's banner media")
# These one should have a privacy setting
field(:followersCount, :integer, description: "Number of followers for this actor")
field(:followingCount, :integer, description: "Number of actors following this actor")
field(:followers_count, :integer, description: "Number of followers for this actor")
field(:following_count, :integer, description: "Number of actors following this actor")
field(:media_size, :integer, description: "The total size of the media from this actor")

4
lib/graphql/schema/actors/application.ex
View File

@@ -31,8 +31,8 @@ defmodule Mobilizon.GraphQL.Schema.Actors.ApplicationType do
field(:banner, :media, description: "The actor's banner media")
# These one should have a privacy setting
field(:followersCount, :integer, description: "Number of followers for this actor")
field(:followingCount, :integer, description: "Number of actors following this actor")
field(:followers_count, :integer, description: "Number of followers for this actor")
field(:following_count, :integer, description: "Number of actors following this actor")
field(:media_size, :integer,
resolve: &Media.actor_size/3,

15
lib/graphql/schema/actors/group.ex
View File

@@ -29,7 +29,7 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
Represents a group of actors
"""
object :group do
interfaces([:actor, :interactable, :activity_object, :action_log_object])
interfaces([:actor, :interactable, :activity_object, :action_log_object, :group_search_result])
field(:id, :id, description: "Internal ID for this group")
field(:url, :string, description: "The ActivityPub actor's URL")
@@ -59,8 +59,17 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
)
# These one should have a privacy setting
field(:followersCount, :integer, description: "Number of followers for this actor")
field(:followingCount, :integer, description: "Number of actors following this actor")
field(:followers_count, :integer,
description: "Number of followers for this actor",
resolve: &Followers.count_followers_for_group/3
)
field(:following_count, :integer, description: "Number of follows for this actor")
field(:members_count, :integer,
description: "Number of members for this actor",
resolve: &Member.count_members_for_group/3
)
field(:media_size, :integer,
resolve: &Media.actor_size/3,

13
lib/graphql/schema/actors/person.ex
View File

@@ -43,9 +43,16 @@ defmodule Mobilizon.GraphQL.Schema.Actors.PersonType do
field(:avatar, :media, description: "The actor's avatar media")
field(:banner, :media, description: "The actor's banner media")
# These one should have a privacy setting
field(:followersCount, :integer, description: "Number of followers for this actor")
field(:followingCount, :integer, description: "Number of actors following this actor")
# Persons have zero followers/followings
field(:followers_count, :integer,
description: "Number of followers for this actor",
resolve: fn _, _, _ -> {:ok, 0} end
)
field(:following_count, :integer,
description: "Number of actors following this actor",
resolve: fn _, _, _ -> {:ok, 0} end
)
field(:media_size, :integer,
resolve: &Media.actor_size/3,

11
lib/graphql/schema/config.ex
View File

@@ -79,6 +79,8 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
field(:analytics, list_of(:analytics),
description: "Configuration for diverse analytics services"
)
field(:search, :search_settings, description: "The instance's search settings")
end
@desc """
@@ -354,6 +356,15 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
field(:type, :analytics_configuration_type, description: "The analytics configuration type")
end
object :search_settings do
field(:global, :global_search_settings, description: "The instance's global search settings")
end
object :global_search_settings do
field(:is_enabled, :boolean, description: "Whether global search is enabled")
field(:is_default, :boolean, description: "Whether global search is the default")
end
@desc """
Export formats configuration
"""

2
lib/graphql/schema/event.ex
View File

@@ -17,7 +17,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
@desc "An event"
object :event do
interfaces([:action_log_object, :interactable, :activity_object])
interfaces([:action_log_object, :interactable, :activity_object, :event_search_result])
field(:id, :id, description: "Internal ID for this event")
field(:uuid, :uuid, description: "The Event UUID")
field(:url, :string, description: "The ActivityPub Event URL")

121
lib/graphql/schema/search.ex
View File

@@ -7,6 +7,97 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
alias Mobilizon.Actors.Actor
alias Mobilizon.Events.Event
alias Mobilizon.GraphQL.Resolvers.Search
alias Mobilizon.Service.GlobalSearch.{EventResult, GroupResult}
interface :event_search_result do
field(:id, :id, description: "Internal ID for this event")
field(:uuid, :uuid, description: "The Event UUID")
field(:url, :string, description: "The ActivityPub Event URL")
field(:title, :string, description: "The event's title")
field(:begins_on, :datetime, description: "Datetime for when the event begins")
field(:ends_on, :datetime, description: "Datetime for when the event ends")
field(:status, :event_status, description: "Status of the event")
field(:picture, :media, description: "The event's picture")
field(:physical_address, :address, description: "The event's physical address")
field(:attributed_to, :actor, description: "Who the event is attributed to (often a group)")
field(:organizer_actor, :actor, description: "The event's organizer (as a person)")
field(:tags, list_of(:tag), description: "The event's tags")
field(:category, :event_category, description: "The event's category")
field(:options, :event_options, description: "The event options")
resolve_type(fn
%Event{}, _ ->
:event
%EventResult{}, _ ->
:event_result
_, _ ->
nil
end)
end
@desc "Search event result"
object :event_result do
interfaces([:event_search_result])
field(:id, :id, description: "Internal ID for this event")
field(:uuid, :uuid, description: "The Event UUID")
field(:url, :string, description: "The ActivityPub Event URL")
field(:title, :string, description: "The event's title")
field(:begins_on, :datetime, description: "Datetime for when the event begins")
field(:ends_on, :datetime, description: "Datetime for when the event ends")
field(:status, :event_status, description: "Status of the event")
field(:picture, :media, description: "The event's picture")
field(:physical_address, :address, description: "The event's physical address")
field(:attributed_to, :actor, description: "Who the event is attributed to (often a group)")
field(:organizer_actor, :actor, description: "The event's organizer (as a person)")
field(:tags, list_of(:tag), description: "The event's tags")
field(:category, :event_category, description: "The event's category")
field(:options, :event_options, description: "The event options")
end
interface :group_search_result do
field(:id, :id, description: "Internal ID for this group")
field(:url, :string, description: "The ActivityPub actor's URL")
field(:type, :actor_type, description: "The type of Actor (Person, Group,…)")
field(:name, :string, description: "The actor's displayed name")
field(:domain, :string, description: "The actor's domain if (null if it's this instance)")
field(:summary, :string, description: "The actor's summary")
field(:preferred_username, :string, description: "The actor's preferred username")
field(:avatar, :media, description: "The actor's avatar media")
field(:banner, :media, description: "The actor's banner media")
field(:followers_count, :integer, description: "Number of followers for this actor")
field(:members_count, :integer, description: "Number of followers for this actor")
field(:physical_address, :address, description: "The type of the event's address")
resolve_type(fn
%Actor{type: :Group}, _ ->
:group
%GroupResult{}, _ ->
:group_result
_, _ ->
nil
end)
end
@desc "Search group result"
object :group_result do
interfaces([:group_search_result])
field(:id, :id, description: "Internal ID for this group")
field(:url, :string, description: "The ActivityPub actor's URL")
field(:type, :actor_type, description: "The type of Actor (Person, Group,…)")
field(:name, :string, description: "The actor's displayed name")
field(:domain, :string, description: "The actor's domain if (null if it's this instance)")
field(:summary, :string, description: "The actor's summary")
field(:preferred_username, :string, description: "The actor's preferred username")
field(:avatar, :media, description: "The actor's avatar media")
field(:banner, :media, description: "The actor's banner media")
field(:followers_count, :integer, description: "Number of followers for this actor")
field(:members_count, :integer, description: "Number of followers for this actor")
field(:physical_address, :address, description: "The type of the event's address")
end
@desc "Search persons result"
object :persons do
@@ -17,13 +108,13 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
@desc "Search groups result"
object :groups do
field(:total, non_null(:integer), description: "Total elements")
field(:elements, non_null(list_of(:group)), description: "Group elements")
field(:elements, non_null(list_of(:group_search_result)), description: "Group elements")
end
@desc "Search events result"
object :events do
field(:total, non_null(:integer), description: "Total elements")
field(:elements, non_null(list_of(:event)), description: "Event elements")
field(:elements, non_null(list_of(:event_search_result)), description: "Event elements")
end
@desc """
@@ -53,6 +144,14 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
value(:online, description: "The event will only happen online. It has no physical address")
end
enum :search_target do
value(:internal,
description: "Search on content from this instance and from the followed instances"
)
value(:global, description: "Search using the global fediverse search")
end
object :search_queries do
@desc "Search persons"
field :search_persons, :persons do
@@ -81,6 +180,15 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
description: "Radius around the location to search in"
)
arg(:language_one_of, list_of(:string),
description: "The list of languages this event can be in"
)
arg(:search_target, :search_target,
default_value: :internal,
description: "The target of the search (internal or global)"
)
arg(:page, :integer, default_value: 1, description: "Result page")
arg(:limit, :integer, default_value: 10, description: "Results limit per page")
@@ -103,6 +211,15 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
description: "The list of statuses this event can have"
)
arg(:language_one_of, list_of(:string),
description: "The list of languages this event can be in"
)
arg(:search_target, :search_target,
default_value: :internal,
description: "The target of the search (internal or global)"
)
arg(:radius, :float,
default_value: 50,
description: "Radius around the location to search in"