- {{ $t('No results for "{queryText}"') }}
- {{
- $t("You can try another search term or drag and drop the marker on the map", {
- queryText,
- })
- }}
-
-
-
-
+ {{ $t('No results for "{queryText}"') }}
+ {{
+ $t("You can try another search term or drag and drop the marker on the map", {
+ queryText,
+ })
+ }}
+
+
+ {{ $t("Visible everywhere on the web") }}
+ {{
+ $t(
+ "The group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on it's page."
+ )
+ }}
+
+
+
+ {{ $t("Only accessible through link") }}
+ {{
+ $t("You'll need to transmit the group URL so people may access the group's profile.")
+ }}
+
+
+ {{ group.url }}
+
+
+
+
+
+
+
+
{{ $t("Update group") }}
@@ -50,8 +102,10 @@ import { Component, Vue } from "vue-property-decorator";
import RouteName from "../../router/name";
import { FETCH_GROUP, UPDATE_GROUP } from "../../graphql/actor";
import { IGroup, usernameWithDomain } from "../../types/actor";
+import { Address, IAddress } from "../../types/address.model";
import { IMember, Group } from "../../types/actor/group.model";
import { Paginate } from "../../types/paginate";
+import FullAddressAutoComplete from "@/components/Event/FullAddressAutoComplete.vue";
@Component({
apollo: {
@@ -67,6 +121,9 @@ import { Paginate } from "../../types/paginate";
},
},
},
+ components: {
+ FullAddressAutoComplete,
+ },
})
export default class GroupSettings extends Vue {
group: IGroup = new Group();
@@ -79,13 +136,41 @@ export default class GroupSettings extends Vue {
usernameWithDomain = usernameWithDomain;
+ GroupVisibility = {
+ PUBLIC: "PUBLIC",
+ UNLISTED: "UNLISTED",
+ };
+
+ showCopiedTooltip = false;
+
async updateGroup() {
+ const variables = { ...this.group };
+ // eslint-disable-next-line
+ // @ts-ignore
+ delete variables.__typename;
+ // eslint-disable-next-line
+ // @ts-ignore
+ delete variables.physicalAddress.__typename;
await this.$apollo.mutate<{ updateGroup: IGroup }>({
mutation: UPDATE_GROUP,
- variables: {
- ...this.group,
- },
+ variables,
});
}
+
+ async copyURL() {
+ await window.navigator.clipboard.writeText(this.group.url);
+ this.showCopiedTooltip = true;
+ setTimeout(() => {
+ this.showCopiedTooltip = false;
+ }, 2000);
+ }
+
+ get canShowCopyButton(): boolean {
+ return window.isSecureContext;
+ }
+
+ get currentAddress(): IAddress {
+ return new Address(this.group.physicalAddress);
+ }
}
diff --git a/js/src/views/Group/MyGroups.vue b/js/src/views/Group/MyGroups.vue
index 973112887..a74df2eb9 100644
--- a/js/src/views/Group/MyGroups.vue
+++ b/js/src/views/Group/MyGroups.vue
@@ -12,7 +12,7 @@
/>
-
+
{{ $t("No groups found") }}
@@ -23,7 +23,7 @@
-
diff --git a/js/yarn.lock b/js/yarn.lock
index ce0a49a75..d67b50900 100644
--- a/js/yarn.lock
+++ b/js/yarn.lock
@@ -4406,6 +4406,11 @@ date-fns@^1.27.2:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+date-fns@^2.15.0:
+ version "2.15.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f"
+ integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==
+
de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
diff --git a/lib/federation/activity_pub/transmogrifier.ex b/lib/federation/activity_pub/transmogrifier.ex
index 05ad94043..8a92bf7f5 100644
--- a/lib/federation/activity_pub/transmogrifier.ex
+++ b/lib/federation/activity_pub/transmogrifier.ex
@@ -239,8 +239,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
def handle_incoming(
%{
"type" => activity_type,
- "object" => %{"type" => object_type, "id" => object_url} = object,
- "to" => to
+ "object" => %{"type" => object_type, "id" => object_url} = object
} = data
)
when activity_type in ["Create", "Add"] and
diff --git a/lib/graphql/api/search.ex b/lib/graphql/api/search.ex
index 343d179bf..dfc579006 100644
--- a/lib/graphql/api/search.ex
+++ b/lib/graphql/api/search.ex
@@ -15,20 +15,17 @@ defmodule Mobilizon.GraphQL.API.Search do
@doc """
Searches actors.
"""
- @spec search_actors(String.t(), integer | nil, integer | nil, ActorType.t()) ::
+ @spec search_actors(map(), integer | nil, integer | nil, ActorType.t()) ::
{:ok, Page.t()} | {:error, String.t()}
- def search_actors(search, page \\ 1, limit \\ 10, result_type) do
- search = String.trim(search)
+ def search_actors(%{term: term} = args, page \\ 1, limit \\ 10, result_type) do
+ term = String.trim(term)
cond do
- search == "" ->
- {:error, "Search can't be empty"}
-
# Some URLs could be domain.tld/@username, so keep this condition above
# the `is_handle` function
- is_url(search) ->
+ is_url(term) ->
# skip, if it's not an actor
- case process_from_url(search) do
+ case process_from_url(term) do
%Page{total: _total, elements: _elements} = page ->
{:ok, page}
@@ -36,11 +33,17 @@ defmodule Mobilizon.GraphQL.API.Search do
{:ok, %{total: 0, elements: []}}
end
- is_handle(search) ->
- {:ok, process_from_username(search)}
+ is_handle(term) ->
+ {:ok, process_from_username(term)}
true ->
- page = Actors.build_actors_by_username_or_name_page(search, [result_type], page, limit)
+ page =
+ Actors.build_actors_by_username_or_name_page(
+ Map.put(args, :term, term),
+ [result_type],
+ page,
+ limit
+ )
{:ok, page}
end
@@ -51,25 +54,20 @@ defmodule Mobilizon.GraphQL.API.Search do
"""
@spec search_events(String.t(), integer | nil, integer | nil) ::
{:ok, Page.t()} | {:error, String.t()}
- def search_events(search, page \\ 1, limit \\ 10) do
- search = String.trim(search)
+ def search_events(%{term: term} = args, page \\ 1, limit \\ 10) do
+ term = String.trim(term)
- cond do
- search == "" ->
- {:error, "Search can't be empty"}
+ if is_url(term) do
+ # skip, if it's w not an actor
+ case process_from_url(term) do
+ %Page{total: _total, elements: _elements} = page ->
+ {:ok, page}
- is_url(search) ->
- # skip, if it's w not an actor
- case process_from_url(search) do
- %Page{total: _total, elements: _elements} = page ->
- {:ok, page}
-
- _ ->
- {:ok, %{total: 0, elements: []}}
- end
-
- true ->
- {:ok, Events.build_events_for_search(search, page, limit)}
+ _ ->
+ {:ok, %{total: 0, elements: []}}
+ end
+ else
+ {:ok, Events.build_events_for_search(Map.put(args, :term, term), page, limit)}
end
end
diff --git a/lib/graphql/resolvers/search.ex b/lib/graphql/resolvers/search.ex
index 9c33e94ee..ad49e9290 100644
--- a/lib/graphql/resolvers/search.ex
+++ b/lib/graphql/resolvers/search.ex
@@ -8,21 +8,21 @@ defmodule Mobilizon.GraphQL.Resolvers.Search do
@doc """
Search persons
"""
- def search_persons(_parent, %{search: search, page: page, limit: limit}, _resolution) do
- Search.search_actors(search, page, limit, :Person)
+ def search_persons(_parent, %{page: page, limit: limit} = args, _resolution) do
+ Search.search_actors(args, page, limit, :Person)
end
@doc """
Search groups
"""
- def search_groups(_parent, %{search: search, page: page, limit: limit}, _resolution) do
- Search.search_actors(search, page, limit, :Group)
+ def search_groups(_parent, %{page: page, limit: limit} = args, _resolution) do
+ Search.search_actors(args, page, limit, :Group)
end
@doc """
Search events
"""
- def search_events(_parent, %{search: search, page: page, limit: limit}, _resolution) do
- Search.search_events(search, page, limit)
+ def search_events(_parent, %{page: page, limit: limit} = args, _resolution) do
+ Search.search_events(args, page, limit)
end
end
diff --git a/lib/graphql/schema/actors/group.ex b/lib/graphql/schema/actors/group.ex
index 18f24af4d..d9685d40c 100644
--- a/lib/graphql/schema/actors/group.ex
+++ b/lib/graphql/schema/actors/group.ex
@@ -5,6 +5,9 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
use Absinthe.Schema.Notation
+ import Absinthe.Resolution.Helpers, only: [dataloader: 1]
+
+ alias Mobilizon.Addresses
alias Mobilizon.GraphQL.Resolvers.{Discussion, Group, Member, Post, Resource, Todos}
alias Mobilizon.GraphQL.Schema
@@ -29,11 +32,20 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
description: "Whether the actors manually approves followers"
)
+ field(:visibility, :group_visibility,
+ description: "Whether the group can be found and/or promoted"
+ )
+
field(:suspended, :boolean, description: "If the actor is suspended")
field(:avatar, :picture, description: "The actor's avatar picture")
field(:banner, :picture, description: "The actor's banner picture")
+ field(:physical_address, :address,
+ resolve: dataloader(Addresses),
+ description: "The type of the event's address"
+ )
+
# These one should have a privacy setting
field(:following, list_of(:follower), description: "List of followings")
field(:followers, list_of(:follower), description: "List of followers")
@@ -155,6 +167,8 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
"The banner for the group, either as an object or directly the ID of an existing Picture"
)
+ arg(:physical_address, :address_input)
+
resolve(&Group.create_group/3)
end
@@ -165,6 +179,8 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
arg(:name, :string, description: "The displayed name for the group")
arg(:summary, :string, description: "The summary for the group", default_value: "")
+ arg(:visibility, :group_visibility, description: "The visibility for the group")
+
arg(:avatar, :picture_input,
description:
"The avatar for the group, either as an object or directly the ID of an existing Picture"
@@ -175,6 +191,8 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
"The banner for the group, either as an object or directly the ID of an existing Picture"
)
+ arg(:physical_address, :address_input)
+
resolve(&Group.update_group/3)
end
diff --git a/lib/graphql/schema/search.ex b/lib/graphql/schema/search.ex
index fbba6a911..2493690fc 100644
--- a/lib/graphql/schema/search.ex
+++ b/lib/graphql/schema/search.ex
@@ -27,7 +27,7 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
object :search_queries do
@desc "Search persons"
field :search_persons, :persons do
- arg(:search, non_null(:string))
+ arg(:term, :string, default_value: "")
arg(:page, :integer, default_value: 1)
arg(:limit, :integer, default_value: 10)
@@ -36,7 +36,9 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
@desc "Search groups"
field :search_groups, :groups do
- arg(:search, non_null(:string))
+ arg(:term, :string, default_value: "")
+ arg(:location, :string, description: "A geohash for coordinates")
+ arg(:radius, :float, default_value: 50)
arg(:page, :integer, default_value: 1)
arg(:limit, :integer, default_value: 10)
@@ -45,9 +47,14 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
@desc "Search events"
field :search_events, :events do
- arg(:search, non_null(:string))
+ arg(:term, :string, default_value: "")
+ arg(:tags, :string, description: "A comma-separated string listing the tags")
+ arg(:location, :string, description: "A geohash for coordinates")
+ arg(:radius, :float, default_value: 50)
arg(:page, :integer, default_value: 1)
arg(:limit, :integer, default_value: 10)
+ arg(:begins_on, :datetime)
+ arg(:ends_on, :datetime)
resolve(&Search.search_events/3)
end
diff --git a/lib/mobilizon/actors/actor.ex b/lib/mobilizon/actors/actor.ex
index 57f866095..2ed66532c 100644
--- a/lib/mobilizon/actors/actor.ex
+++ b/lib/mobilizon/actors/actor.ex
@@ -7,8 +7,9 @@ defmodule Mobilizon.Actors.Actor do
import Ecto.Changeset
- alias Mobilizon.{Actors, Config, Crypto, Mention, Share}
+ alias Mobilizon.{Actors, Addresses, Config, Crypto, Mention, Share}
alias Mobilizon.Actors.{ActorOpenness, ActorType, ActorVisibility, Follower, Member}
+ alias Mobilizon.Addresses.Address
alias Mobilizon.Discussions.Comment
alias Mobilizon.Events.{Event, FeedToken}
alias Mobilizon.Media.File
@@ -55,7 +56,8 @@ defmodule Mobilizon.Actors.Actor do
shares: [Share.t()],
owner_shares: [Share.t()],
memberships: [t],
- last_refreshed_at: DateTime.t()
+ last_refreshed_at: DateTime.t(),
+ physical_address: Address.t()
}
@required_attrs [:preferred_username, :keys, :suspended, :url]
@@ -76,12 +78,13 @@ defmodule Mobilizon.Actors.Actor do
:manually_approves_followers,
:last_refreshed_at,
:user_id,
+ :physical_address_id,
:visibility
]
@attrs @required_attrs ++ @optional_attrs
@update_required_attrs @required_attrs -- [:url]
- @update_optional_attrs [:name, :summary, :manually_approves_followers, :user_id]
+ @update_optional_attrs [:name, :summary, :manually_approves_followers, :user_id, :visibility]
@update_attrs @update_required_attrs ++ @update_optional_attrs
@registration_required_attrs [:preferred_username, :keys, :suspended, :url, :type]
@@ -156,6 +159,7 @@ defmodule Mobilizon.Actors.Actor do
embeds_one(:avatar, File, on_replace: :update)
embeds_one(:banner, File, on_replace: :update)
belongs_to(:user, User)
+ belongs_to(:physical_address, Address, on_replace: :nilify)
has_many(:followers, Follower, foreign_key: :target_actor_id)
has_many(:followings, Follower, foreign_key: :actor_id)
has_many(:organized_events, Event, foreign_key: :organizer_actor_id)
@@ -228,7 +232,7 @@ defmodule Mobilizon.Actors.Actor do
actor
|> cast(attrs, @attrs)
|> build_urls()
- |> common_changeset()
+ |> common_changeset(attrs)
|> unique_username_validator()
|> validate_required(@required_attrs)
end
@@ -238,7 +242,7 @@ defmodule Mobilizon.Actors.Actor do
def update_changeset(%__MODULE__{} = actor, attrs) do
actor
|> cast(attrs, @update_attrs)
- |> common_changeset()
+ |> common_changeset(attrs)
|> validate_required(@update_required_attrs)
end
@@ -263,7 +267,7 @@ defmodule Mobilizon.Actors.Actor do
actor
|> cast(attrs, @registration_attrs)
|> build_urls()
- |> common_changeset()
+ |> common_changeset(attrs)
|> unique_username_validator()
|> validate_required(@registration_required_attrs)
end
@@ -277,7 +281,7 @@ defmodule Mobilizon.Actors.Actor do
%__MODULE__{}
|> cast(attrs, @remote_actor_creation_attrs)
|> validate_required(@remote_actor_creation_required_attrs)
- |> common_changeset()
+ |> common_changeset(attrs)
|> unique_username_validator()
|> validate_length(:summary, max: 5000)
|> validate_length(:preferred_username, max: 100)
@@ -287,11 +291,12 @@ defmodule Mobilizon.Actors.Actor do
changeset
end
- @spec common_changeset(Ecto.Changeset.t()) :: Ecto.Changeset.t()
- defp common_changeset(%Ecto.Changeset{} = changeset) do
+ @spec common_changeset(Ecto.Changeset.t(), map()) :: Ecto.Changeset.t()
+ defp common_changeset(%Ecto.Changeset{} = changeset, attrs) do
changeset
|> cast_embed(:avatar)
|> cast_embed(:banner)
+ |> put_address(attrs)
|> unique_constraint(:url, name: :actors_url_index)
|> unique_constraint(:preferred_username, name: :actors_preferred_username_domain_type_index)
|> validate_format(:preferred_username, ~r/[a-z0-9_]+/)
@@ -306,7 +311,7 @@ defmodule Mobilizon.Actors.Actor do
actor
|> cast(params, @group_creation_attrs)
|> build_urls(:Group)
- |> common_changeset()
+ |> common_changeset(params)
|> put_change(:domain, nil)
|> put_change(:keys, Crypto.generate_rsa_2048_private_key())
|> put_change(:type, :Group)
@@ -412,4 +417,36 @@ defmodule Mobilizon.Actors.Actor do
|> Ecto.Changeset.cast(data, @attrs)
|> build_urls()
end
+
+ # In case the provided addresses is an existing one
+ @spec put_address(Ecto.Changeset.t(), map) :: Ecto.Changeset.t()
+ defp put_address(%Ecto.Changeset{} = changeset, %{
+ physical_address: %{id: id} = _physical_address
+ })
+ when not is_nil(id) do
+ case Addresses.get_address(id) do
+ %Address{} = address ->
+ put_assoc(changeset, :physical_address, address)
+
+ _ ->
+ cast_assoc(changeset, :physical_address)
+ end
+ end
+
+ # In case it's a new address but the origin_id is an existing one
+ defp put_address(%Ecto.Changeset{} = changeset, %{physical_address: %{origin_id: origin_id}})
+ when not is_nil(origin_id) do
+ case Addresses.get_address_by_origin_id(origin_id) do
+ %Address{} = address ->
+ put_assoc(changeset, :physical_address, address)
+
+ _ ->
+ cast_assoc(changeset, :physical_address)
+ end
+ end
+
+ # In case it's a new address without any origin_id (manual)
+ defp put_address(%Ecto.Changeset{} = changeset, _attrs) do
+ cast_assoc(changeset, :physical_address)
+ end
end
diff --git a/lib/mobilizon/actors/actors.ex b/lib/mobilizon/actors/actors.ex
index de3e5ab42..5af4dabb0 100644
--- a/lib/mobilizon/actors/actors.ex
+++ b/lib/mobilizon/actors/actors.ex
@@ -5,10 +5,13 @@ defmodule Mobilizon.Actors do
import Ecto.Query
import EctoEnum
+ import Geo.PostGIS, only: [st_dwithin_in_meters: 3]
+ import Mobilizon.Service.Guards
alias Ecto.Multi
alias Mobilizon.Actors.{Actor, Bot, Follower, Member}
+ alias Mobilizon.Addresses.Address
alias Mobilizon.{Crypto, Events}
alias Mobilizon.Media.File
alias Mobilizon.Service.Workers
@@ -235,6 +238,7 @@ defmodule Mobilizon.Actors do
@spec update_actor(Actor.t(), map) :: {:ok, Actor.t()} | {:error, Ecto.Changeset.t()}
def update_actor(%Actor{} = actor, attrs) do
actor
+ |> Repo.preload([:physical_address])
|> Actor.update_changeset(attrs)
|> delete_files_if_media_changed()
|> Repo.update()
@@ -422,14 +426,20 @@ defmodule Mobilizon.Actors do
Builds a page struct for actors by their name or displayed name.
"""
@spec build_actors_by_username_or_name_page(
- String.t(),
+ map(),
[ActorType.t()],
integer | nil,
integer | nil
) :: Page.t()
- def build_actors_by_username_or_name_page(username, types, page \\ nil, limit \\ nil) do
- username
- |> actor_by_username_or_name_query()
+ def build_actors_by_username_or_name_page(
+ %{term: term} = args,
+ types,
+ page \\ nil,
+ limit \\ nil
+ ) do
+ Actor
+ |> actor_by_username_or_name_query(term)
+ |> actors_for_location(args)
|> filter_by_types(types)
|> Page.build_page(page, limit)
end
@@ -1129,29 +1139,54 @@ defmodule Mobilizon.Actors do
)
end
- @spec actor_by_username_or_name_query(String.t()) :: Ecto.Query.t()
- defp actor_by_username_or_name_query(username) do
- from(
- a in Actor,
- where:
- fragment(
- "f_unaccent(?) %> f_unaccent(?) or f_unaccent(coalesce(?, '')) %> f_unaccent(?)",
- a.preferred_username,
- ^username,
- a.name,
- ^username
- ),
- order_by:
- fragment(
- "word_similarity(?, ?) + word_similarity(coalesce(?, ''), ?) desc",
- a.preferred_username,
- ^username,
- a.name,
- ^username
- )
+ @spec actor_by_username_or_name_query(Ecto.Query.t(), String.t()) :: Ecto.Query.t()
+ defp actor_by_username_or_name_query(query, ""), do: query
+
+ defp actor_by_username_or_name_query(query, username) do
+ query
+ |> where(
+ [a],
+ fragment(
+ "f_unaccent(?) %> f_unaccent(?) or f_unaccent(coalesce(?, '')) %> f_unaccent(?)",
+ a.preferred_username,
+ ^username,
+ a.name,
+ ^username
+ )
+ )
+ |> order_by(
+ [a],
+ fragment(
+ "word_similarity(?, ?) + word_similarity(coalesce(?, ''), ?) desc",
+ a.preferred_username,
+ ^username,
+ a.name,
+ ^username
+ )
)
end
+ @spec actors_for_location(Ecto.Query.t(), map()) :: Ecto.Query.t()
+ defp actors_for_location(query, %{radius: radius}) when is_nil(radius),
+ do: query
+
+ defp actors_for_location(query, %{location: location, radius: radius})
+ when is_valid_string?(location) and not is_nil(radius) do
+ with {lon, lat} <- Geohax.decode(location),
+ point <- Geo.WKT.decode!("SRID=4326;POINT(#{lon} #{lat})") do
+ query
+ |> join(:inner, [q], a in Address, on: a.id == q.physical_address_id, as: :address)
+ |> where(
+ [q],
+ st_dwithin_in_meters(^point, as(:address).geom, ^(radius * 1000))
+ )
+ else
+ _ -> query
+ end
+ end
+
+ defp actors_for_location(query, _args), do: query
+
@spec person_query :: Ecto.Query.t()
defp person_query do
from(a in Actor, where: a.type == ^:Person)
diff --git a/lib/mobilizon/addresses/addresses.ex b/lib/mobilizon/addresses/addresses.ex
index 07bdca708..68137e000 100644
--- a/lib/mobilizon/addresses/addresses.ex
+++ b/lib/mobilizon/addresses/addresses.ex
@@ -29,6 +29,9 @@ defmodule Mobilizon.Addresses do
@spec get_address_by_url(String.t()) :: Address.t() | nil
def get_address_by_url(url), do: Repo.get_by(Address, url: url)
+ @spec get_address_by_origin_id(String.t()) :: Address.t() | nil
+ def get_address_by_origin_id(origin_id), do: Repo.get_by(Address, origin_id: origin_id)
+
@doc """
Creates an address.
"""
diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex
index a0e62344b..af877fb3f 100644
--- a/lib/mobilizon/events/events.ex
+++ b/lib/mobilizon/events/events.ex
@@ -8,6 +8,7 @@ defmodule Mobilizon.Events do
import Ecto.Query
import EctoEnum
+ import Mobilizon.Service.Guards
import Mobilizon.Storage.Ecto
alias Ecto.{Changeset, Multi}
@@ -457,15 +458,17 @@ defmodule Mobilizon.Events do
@doc """
Builds a page struct for events by their name.
"""
- @spec build_events_for_search(String.t(), integer | nil, integer | nil) :: Page.t()
- def build_events_for_search(name, page \\ nil, limit \\ nil)
- def build_events_for_search("", _page, _limit), do: %Page{total: 0, elements: []}
-
- def build_events_for_search(name, page, limit) do
- name
+ @spec build_events_for_search(map(), integer | nil, integer | nil) :: Page.t()
+ def build_events_for_search(%{term: term} = args, page \\ nil, limit \\ nil) do
+ term
|> normalize_search_string()
|> events_for_search_query()
+ |> events_for_begins_on(args)
+ |> events_for_ends_on(args)
+ |> events_for_tags(args)
+ |> events_for_location(args)
|> filter_local_or_from_followed_instances_events()
+ |> order_by([q], asc: q.id)
|> Page.build_page(page, limit)
end
@@ -1279,10 +1282,13 @@ defmodule Mobilizon.Events do
defp events_for_search_query(search_string) do
Event
|> where([e], e.visibility == ^:public)
+ |> distinct([e], e.id)
|> do_event_for_search_query(search_string)
end
@spec do_event_for_search_query(Ecto.Query.t(), String.t()) :: Ecto.Query.t()
+ defp do_event_for_search_query(query, ""), do: query
+
defp do_event_for_search_query(query, search_string) do
from(event in query,
join: id_and_rank in matching_event_ids_and_ranks(search_string),
@@ -1291,6 +1297,60 @@ defmodule Mobilizon.Events do
)
end
+ @spec events_for_begins_on(Ecto.Query.t(), map()) :: Ecto.Query.t()
+ defp events_for_begins_on(query, args) do
+ begins_on = Map.get(args, :begins_on, DateTime.utc_now())
+
+ query
+ |> where([q], q.begins_on >= ^begins_on)
+ end
+
+ @spec events_for_ends_on(Ecto.Query.t(), map()) :: Ecto.Query.t()
+ defp events_for_ends_on(query, args) do
+ ends_on = Map.get(args, :ends_on)
+
+ if is_nil(ends_on),
+ do: query,
+ else:
+ where(
+ query,
+ [q],
+ (is_nil(q.ends_on) and q.begins_on <= ^ends_on) or
+ q.ends_on <= ^ends_on
+ )
+ end
+
+ @spec events_for_tags(Ecto.Query.t(), map()) :: Ecto.Query.t()
+ defp events_for_tags(query, %{tags: tags}) when is_valid_string?(tags) do
+ query
+ |> join(:inner, [q], te in "events_tags", on: q.id == te.event_id)
+ |> join(:inner, [q, ..., te], t in Tag, on: te.tag_id == t.id)
+ |> where([q, ..., t], t.title in ^String.split(tags, ",", trim: true))
+ end
+
+ defp events_for_tags(query, _args), do: query
+
+ @spec events_for_location(Ecto.Query.t(), map()) :: Ecto.Query.t()
+ defp events_for_location(query, %{radius: radius}) when is_nil(radius),
+ do: query
+
+ defp events_for_location(query, %{location: location, radius: radius})
+ when is_valid_string?(location) and not is_nil(radius) do
+ with {lon, lat} <- Geohax.decode(location),
+ point <- Geo.WKT.decode!("SRID=4326;POINT(#{lon} #{lat})") do
+ query
+ |> join(:inner, [q], a in Address, on: a.id == q.physical_address_id, as: :address)
+ |> where(
+ [q],
+ st_dwithin_in_meters(^point, as(:address).geom, ^(radius * 1000))
+ )
+ else
+ _ -> query
+ end
+ end
+
+ defp events_for_location(query, _args), do: query
+
@spec normalize_search_string(String.t()) :: String.t()
defp normalize_search_string(search_string) do
search_string
@@ -1523,6 +1583,7 @@ defmodule Mobilizon.Events do
defp filter_future_events(query, false), do: query
+ @spec filter_local_or_from_followed_instances_events(Ecto.Query.t()) :: Ecto.Query.t()
defp filter_local_or_from_followed_instances_events(query) do
from(q in query,
left_join: s in Share,
diff --git a/lib/service/guards.ex b/lib/service/guards.ex
new file mode 100644
index 000000000..e48e65076
--- /dev/null
+++ b/lib/service/guards.ex
@@ -0,0 +1,9 @@
+defmodule Mobilizon.Service.Guards do
+ @moduledoc """
+ Various guards
+ """
+
+ defguard is_valid_string?(value) when is_binary(value) and value != ""
+
+ defguard is_valid_list?(value) when is_list(value) and length(value) > 0
+end
diff --git a/lib/service/http/activity_pub.ex b/lib/service/http/activity_pub.ex
index 0d0f6483f..b48ca9cdf 100644
--- a/lib/service/http/activity_pub.ex
+++ b/lib/service/http/activity_pub.ex
@@ -20,7 +20,7 @@ defmodule Mobilizon.Service.HTTP.ActivityPub do
[{"User-Agent", @user_agent}, {"Accept", "application/activity+json"}] ++ headers},
Tesla.Middleware.FollowRedirects,
{Tesla.Middleware.Timeout, timeout: 10_000},
- {Tesla.Middleware.JSON, decode_content_types: "application/activity+json"}
+ {Tesla.Middleware.JSON, decode_content_types: ["application/activity+json"]}
]
adapter = {@adapter, opts}
diff --git a/priv/repo/migrations/20200805124620_add_address_to_actors.exs b/priv/repo/migrations/20200805124620_add_address_to_actors.exs
new file mode 100644
index 000000000..03c9496ea
--- /dev/null
+++ b/priv/repo/migrations/20200805124620_add_address_to_actors.exs
@@ -0,0 +1,9 @@
+defmodule Mobilizon.Storage.Repo.Migrations.AddAddressToActors do
+ use Ecto.Migration
+
+ def change do
+ alter table(:actors) do
+ add(:physical_address_id, references(:addresses, on_delete: :nothing))
+ end
+ end
+end
diff --git a/test/graphql/api/search_test.exs b/test/graphql/api/search_test.exs
index 849591489..c9f095071 100644
--- a/test/graphql/api/search_test.exs
+++ b/test/graphql/api/search_test.exs
@@ -17,7 +17,7 @@ defmodule Mobilizon.GraphQL.API.SearchTest do
with_mock ActivityPub,
find_or_make_actor_from_nickname: fn "toto@domain.tld" -> {:ok, %Actor{id: 42}} end do
assert {:ok, %Page{total: 1, elements: [%Actor{id: 42}]}} ==
- Search.search_actors("toto@domain.tld", 1, 10, :Person)
+ Search.search_actors(%{term: "toto@domain.tld"}, 1, 10, :Person)
assert_called(ActivityPub.find_or_make_actor_from_nickname("toto@domain.tld"))
end
@@ -27,7 +27,7 @@ defmodule Mobilizon.GraphQL.API.SearchTest do
with_mock ActivityPub,
fetch_object_from_url: fn "https://social.tcit.fr/users/tcit" -> {:ok, %Actor{id: 42}} end do
assert {:ok, %Page{total: 1, elements: [%Actor{id: 42}]}} ==
- Search.search_actors("https://social.tcit.fr/users/tcit", 1, 10, :Person)
+ Search.search_actors(%{term: "https://social.tcit.fr/users/tcit"}, 1, 10, :Person)
assert_called(ActivityPub.fetch_object_from_url("https://social.tcit.fr/users/tcit"))
end
@@ -35,25 +35,27 @@ defmodule Mobilizon.GraphQL.API.SearchTest do
test "search actors" do
with_mock Actors,
- build_actors_by_username_or_name_page: fn "toto", _type, 1, 10 ->
+ build_actors_by_username_or_name_page: fn %{term: "toto"}, _type, 1, 10 ->
%Page{total: 1, elements: [%Actor{id: 42}]}
end do
assert {:ok, %{total: 1, elements: [%Actor{id: 42}]}} =
- Search.search_actors("toto", 1, 10, :Person)
+ Search.search_actors(%{term: "toto"}, 1, 10, :Person)
- assert_called(Actors.build_actors_by_username_or_name_page("toto", [:Person], 1, 10))
+ assert_called(
+ Actors.build_actors_by_username_or_name_page(%{term: "toto"}, [:Person], 1, 10)
+ )
end
end
test "search events" do
with_mock Events,
- build_events_for_search: fn "toto", 1, 10 ->
+ build_events_for_search: fn %{term: "toto"}, 1, 10 ->
%Page{total: 1, elements: [%Event{title: "super toto event"}]}
end do
assert {:ok, %{total: 1, elements: [%Event{title: "super toto event"}]}} =
- Search.search_events("toto", 1, 10)
+ Search.search_events(%{term: "toto"}, 1, 10)
- assert_called(Events.build_events_for_search("toto", 1, 10))
+ assert_called(Events.build_events_for_search(%{term: "toto"}, 1, 10))
end
end
end
diff --git a/test/graphql/resolvers/search_test.exs b/test/graphql/resolvers/search_test.exs
index dd34d5128..8f820e8e6 100644
--- a/test/graphql/resolvers/search_test.exs
+++ b/test/graphql/resolvers/search_test.exs
@@ -13,249 +13,370 @@ defmodule Mobilizon.GraphQL.Resolvers.SearchTest do
{:ok, conn: conn, user: user}
end
- test "search_events/3 finds events with basic search", %{
- conn: conn,
- user: user
- } do
- insert(:actor, user: user, preferred_username: "test_person")
- insert(:actor, type: :Group, preferred_username: "test_group")
- event = insert(:event, title: "test_event")
- Workers.BuildSearch.insert_search_event(event)
-
- query = """
- {
- search_events(search: "test") {
- total,
- elements {
- title,
- uuid,
- __typename
- }
- },
- }
- """
-
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
-
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_events"]["total"] == 1
- assert json_response(res, 200)["data"]["search_events"]["elements"] |> length == 1
-
- assert hd(json_response(res, 200)["data"]["search_events"]["elements"])["uuid"] ==
- to_string(event.uuid)
- end
-
- test "search_persons/3 finds persons with basic search", %{
- conn: conn,
- user: user
- } do
- actor = insert(:actor, user: user, preferred_username: "test_person")
- insert(:actor, type: :Group, preferred_username: "test_group")
- event = insert(:event, title: "test_event")
- Workers.BuildSearch.insert_search_event(event)
-
- query = """
- {
- search_persons(search: "test") {
- total,
- elements {
- preferredUsername,
- __typename
- }
- },
- }
- """
-
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
-
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_persons"]["total"] == 1
- assert json_response(res, 200)["data"]["search_persons"]["elements"] |> length == 1
-
- assert hd(json_response(res, 200)["data"]["search_persons"]["elements"])["preferredUsername"] ==
- actor.preferred_username
- end
-
- test "search_groups/3 finds persons with basic search", %{
- conn: conn,
- user: user
- } do
- insert(:actor, user: user, preferred_username: "test_person")
- group = insert(:actor, type: :Group, preferred_username: "test_group")
- event = insert(:event, title: "test_event")
- Workers.BuildSearch.insert_search_event(event)
-
- query = """
- {
- search_groups(search: "test") {
- total,
- elements {
- preferredUsername,
- __typename
- }
- },
- }
- """
-
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
-
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_groups"]["total"] == 1
- assert json_response(res, 200)["data"]["search_groups"]["elements"] |> length == 1
-
- assert hd(json_response(res, 200)["data"]["search_groups"]["elements"])["preferredUsername"] ==
- group.preferred_username
- end
-
- test "search_events/3 finds events and actors with word search", %{
- conn: conn,
- user: user
- } do
- insert(:actor, user: user, preferred_username: "person", name: "I like pineapples")
- event1 = insert(:event, title: "Pineapple fashion week")
- event2 = insert(:event, title: "I love pineAPPLE")
- event3 = insert(:event, title: "Hello")
- Workers.BuildSearch.insert_search_event(event1)
- Workers.BuildSearch.insert_search_event(event2)
- Workers.BuildSearch.insert_search_event(event3)
-
- query = """
- {
- search_events(search: "pineapple") {
- total,
- elements {
- title,
- uuid,
- __typename
- }
+ describe "search events/3" do
+ @search_events_query """
+ query SearchEvents($location: String, $radius: Float, $tags: String, $term: String, $beginsOn: DateTime, $endsOn: DateTime) {
+ searchEvents(location: $location, radius: $radius, tags: $tags, term: $term, beginsOn: $beginsOn, endsOn: $endsOn) {
+ total,
+ elements {
+ id
+ title,
+ uuid,
+ __typename
}
+ }
}
"""
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
+ test "finds events with basic search", %{
+ conn: conn,
+ user: user
+ } do
+ insert(:actor, user: user, preferred_username: "test_person")
+ insert(:actor, type: :Group, preferred_username: "test_group")
+ event = insert(:event, title: "test_event")
+ Workers.BuildSearch.insert_search_event(event)
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_events"]["total"] == 2
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{term: "test"}
+ )
- assert json_response(res, 200)["data"]["search_events"]["elements"]
- |> length == 2
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 1
+ assert res["data"]["searchEvents"]["elements"] |> length == 1
- assert json_response(res, 200)["data"]["search_events"]["elements"]
- |> Enum.map(& &1["title"]) == [
- "Pineapple fashion week",
- "I love pineAPPLE"
- ]
+ assert hd(res["data"]["searchEvents"]["elements"])["uuid"] ==
+ to_string(event.uuid)
+ end
+
+ test "finds events and actors with word search", %{
+ conn: conn,
+ user: user
+ } do
+ insert(:actor, user: user, preferred_username: "person", name: "I like pineapples")
+ event1 = insert(:event, title: "Pineapple fashion week")
+ event2 = insert(:event, title: "I love pineAPPLE")
+ event3 = insert(:event, title: "Hello")
+ Workers.BuildSearch.insert_search_event(event1)
+ Workers.BuildSearch.insert_search_event(event2)
+ Workers.BuildSearch.insert_search_event(event3)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{term: "pineapple"}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 2
+
+ assert res["data"]["searchEvents"]["elements"]
+ |> length == 2
+
+ assert res["data"]["searchEvents"]["elements"]
+ |> Enum.map(& &1["title"]) == [
+ "Pineapple fashion week",
+ "I love pineAPPLE"
+ ]
+ end
+
+ test "finds events with accented search", %{
+ conn: conn,
+ user: user
+ } do
+ insert(:actor, user: user, preferred_username: "person", name: "Torréfaction du Kafé")
+ insert(:actor, type: :Group, preferred_username: "group", name: "Kafé group")
+ event = insert(:event, title: "Tour du monde des Kafés")
+ Workers.BuildSearch.insert_search_event(event)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{term: "Kafés"}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 1
+
+ assert hd(res["data"]["searchEvents"]["elements"])["uuid"] ==
+ event.uuid
+ end
+
+ test "finds events by tag", %{conn: conn} do
+ tag = insert(:tag, title: "Café")
+ tag2 = insert(:tag, title: "Thé")
+ event = insert(:event, title: "Tour du monde", tags: [tag, tag2])
+ insert(:event, title: "Autre événement")
+ Workers.BuildSearch.insert_search_event(event)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{tags: "Café,Sirop"}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 1
+
+ assert hd(res["data"]["searchEvents"]["elements"])["uuid"] ==
+ event.uuid
+ end
+
+ test "finds events by location", %{conn: conn} do
+ {lon, lat} = {45.75, 4.85}
+ point = %Geo.Point{coordinates: {lon, lat}, srid: 4326}
+ geohash = Geohax.encode(lon, lat, 6)
+ address = insert(:address, geom: point)
+ event = insert(:event, title: "Tour du monde", physical_address: address)
+ Workers.BuildSearch.insert_search_event(event)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{location: geohash}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 1
+
+ assert hd(res["data"]["searchEvents"]["elements"])["uuid"] ==
+ event.uuid
+ end
+
+ test "finds events by begins_on and ends_on", %{conn: conn} do
+ now = DateTime.utc_now()
+
+ # TODO
+ event =
+ insert(:event,
+ title: "Tour du monde",
+ begins_on: DateTime.add(now, 3600 * 24 * 3),
+ ends_on: DateTime.add(now, 3600 * 24 * 10)
+ )
+
+ insert(:event,
+ title: "Autre événement",
+ begins_on: DateTime.add(now, 3600 * 24 * 30),
+ ends_on: nil
+ )
+
+ Workers.BuildSearch.insert_search_event(event)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{
+ beginsOn: now |> DateTime.add(86_400) |> DateTime.to_iso8601(),
+ endsOn: now |> DateTime.add(1_728_000) |> DateTime.to_iso8601()
+ }
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 1
+
+ assert hd(res["data"]["searchEvents"]["elements"])["uuid"] ==
+ event.uuid
+ end
+
+ test "finds events with multiple criteria", %{conn: conn} do
+ {lon, lat} = {45.75, 4.85}
+ point = %Geo.Point{coordinates: {lon, lat}, srid: 4326}
+ geohash = Geohax.encode(lon, lat, 6)
+ address = insert(:address, geom: point)
+ tag = insert(:tag, title: "Café")
+ tag2 = insert(:tag, title: "Thé")
+ event = insert(:event, title: "Tour du monde", physical_address: address, tags: [tag, tag2])
+ insert(:event, title: "Autre événement avec même tags", tags: [tag, tag2])
+ insert(:event, title: "Même endroit", physical_address: address)
+ insert(:event, title: "Même monde")
+ Workers.BuildSearch.insert_search_event(event)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_events_query,
+ variables: %{location: geohash, radius: 10, tags: "Thé", term: "Monde"}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchEvents"]["total"] == 1
+
+ assert hd(res["data"]["searchEvents"]["elements"])["uuid"] ==
+ event.uuid
+ end
end
- test "search_persons/3 finds persons with word search", %{
- conn: conn,
- user: user
- } do
- actor = insert(:actor, user: user, preferred_username: "person", name: "I like pineapples")
- insert(:actor, preferred_username: "group", type: :Group, name: "pineapple group")
- event1 = insert(:event, title: "Pineapple fashion week")
- event2 = insert(:event, title: "I love pineAPPLE")
- event3 = insert(:event, title: "Hello")
- Workers.BuildSearch.insert_search_event(event1)
- Workers.BuildSearch.insert_search_event(event2)
- Workers.BuildSearch.insert_search_event(event3)
-
- query = """
- {
- search_persons(search: "pineapple") {
- total,
- elements {
- preferredUsername,
- __typename
+ describe "search_persons/3" do
+ @search_persons_query """
+ query SearchPersons($term: String!, $page: Int, $limit: Int) {
+ searchPersons(term: $term, page: $page, limit: $limit) {
+ total
+ elements {
+ id
+ avatar {
+ url
}
+ domain
+ preferredUsername
+ name
+ __typename
}
+ }
}
"""
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
+ test "finds persons with basic search", %{
+ conn: conn,
+ user: user
+ } do
+ actor = insert(:actor, user: user, preferred_username: "test_person")
+ insert(:actor, type: :Group, preferred_username: "test_group")
+ event = insert(:event, title: "test_event")
+ Workers.BuildSearch.insert_search_event(event)
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_persons"]["total"] == 1
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_persons_query,
+ variables: %{term: "test"}
+ )
- assert json_response(res, 200)["data"]["search_persons"]["elements"]
- |> length == 1
+ assert res["errors"] == nil
+ assert res["data"]["searchPersons"]["total"] == 1
+ assert res["data"]["searchPersons"]["elements"] |> length == 1
- assert hd(json_response(res, 200)["data"]["search_persons"]["elements"])["preferredUsername"] ==
- actor.preferred_username
+ assert hd(res["data"]["searchPersons"]["elements"])["preferredUsername"] ==
+ actor.preferred_username
+ end
+
+ test "finds persons with word search", %{
+ conn: conn,
+ user: user
+ } do
+ actor = insert(:actor, user: user, preferred_username: "person", name: "I like pineapples")
+ insert(:actor, preferred_username: "group", type: :Group, name: "pineapple group")
+ event1 = insert(:event, title: "Pineapple fashion week")
+ event2 = insert(:event, title: "I love pineAPPLE")
+ event3 = insert(:event, title: "Hello")
+ Workers.BuildSearch.insert_search_event(event1)
+ Workers.BuildSearch.insert_search_event(event2)
+ Workers.BuildSearch.insert_search_event(event3)
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_persons_query,
+ variables: %{term: "pineapple"}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchPersons"]["total"] == 1
+
+ assert res["data"]["searchPersons"]["elements"]
+ |> length == 1
+
+ assert hd(res["data"]["searchPersons"]["elements"])["preferredUsername"] ==
+ actor.preferred_username
+ end
end
- test "search_events/3 finds events with accented search", %{
- conn: conn,
- user: user
- } do
- insert(:actor, user: user, preferred_username: "person", name: "Torréfaction du Kafé")
- insert(:actor, type: :Group, preferred_username: "group", name: "Kafé group")
- event = insert(:event, title: "Tour du monde des Kafés")
- Workers.BuildSearch.insert_search_event(event)
-
- # Elaborate query
- query = """
- {
- search_events(search: "Kafé") {
- total,
- elements {
- title,
- uuid,
- __typename
- }
+ describe "search_groups/3" do
+ @search_groups_query """
+ query SearchGroups($term: String, $location: String, $radius: Float) {
+ searchGroups(term: $term, location: $location, radius: $radius) {
+ total
+ elements {
+ avatar {
+ url
}
+ domain
+ preferredUsername
+ name
+ __typename
+ }
+ }
}
"""
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
+ test "finds persons with basic search", %{
+ conn: conn,
+ user: user
+ } do
+ insert(:actor, user: user, preferred_username: "test_person")
+ group = insert(:actor, type: :Group, preferred_username: "test_group")
+ event = insert(:event, title: "test_event")
+ Workers.BuildSearch.insert_search_event(event)
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_events"]["total"] == 1
- assert hd(json_response(res, 200)["data"]["search_events"]["elements"])["uuid"] == event.uuid
- end
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_groups_query,
+ variables: %{term: "test"}
+ )
- test "search_groups/3 finds groups with accented search", %{
- conn: conn,
- user: user
- } do
- insert(:actor, user: user, preferred_username: "person", name: "Torréfaction du Kafé")
- group = insert(:actor, type: :Group, preferred_username: "group", name: "Kafé group")
- event = insert(:event, title: "Tour du monde des Kafés")
- Workers.BuildSearch.insert_search_event(event)
+ assert res["errors"] == nil
+ assert res["data"]["searchGroups"]["total"] == 1
+ assert res["data"]["searchGroups"]["elements"] |> length == 1
- # Elaborate query
- query = """
- {
- search_groups(search: "Kafé") {
- total,
- elements {
- preferredUsername,
- __typename
- }
- }
- }
- """
+ assert hd(res["data"]["searchGroups"]["elements"])["preferredUsername"] ==
+ group.preferred_username
+ end
- res =
- conn
- |> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
+ test "finds groups with accented search", %{
+ conn: conn,
+ user: user
+ } do
+ insert(:actor, user: user, preferred_username: "person", name: "Torréfaction du Kafé")
+ group = insert(:actor, type: :Group, preferred_username: "group", name: "Kafé group")
+ event = insert(:event, title: "Tour du monde des Kafés")
+ Workers.BuildSearch.insert_search_event(event)
- assert json_response(res, 200)["errors"] == nil
- assert json_response(res, 200)["data"]["search_groups"]["total"] == 1
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_groups_query,
+ variables: %{term: "Kafé"}
+ )
- assert hd(json_response(res, 200)["data"]["search_groups"]["elements"])["preferredUsername"] ==
- group.preferred_username
+ assert res["errors"] == nil
+ assert res["data"]["searchGroups"]["total"] == 1
+
+ assert hd(res["data"]["searchGroups"]["elements"])["preferredUsername"] ==
+ group.preferred_username
+ end
+
+ test "finds groups with location", %{conn: conn} do
+ {lon, lat} = {45.75, 4.85}
+ point = %Geo.Point{coordinates: {lon, lat}, srid: 4326}
+ geohash = Geohax.encode(lon, lat, 6)
+ geohash_2 = Geohax.encode(25, -19, 6)
+ address = insert(:address, geom: point)
+
+ group =
+ insert(:actor,
+ type: :Group,
+ preferred_username: "want_coffee",
+ name: "Want coffee ?",
+ physical_address: address
+ )
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_groups_query,
+ variables: %{location: geohash}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchGroups"]["total"] == 1
+
+ assert hd(res["data"]["searchGroups"]["elements"])["preferredUsername"] ==
+ group.preferred_username
+
+ res =
+ AbsintheHelpers.graphql_query(conn,
+ query: @search_groups_query,
+ variables: %{location: geohash_2}
+ )
+
+ assert res["errors"] == nil
+ assert res["data"]["searchGroups"]["total"] == 0
+ end
end
end
diff --git a/test/mobilizon/actors/actors_test.exs b/test/mobilizon/actors/actors_test.exs
index fd6ed2f7b..b1765701c 100644
--- a/test/mobilizon/actors/actors_test.exs
+++ b/test/mobilizon/actors/actors_test.exs
@@ -188,7 +188,7 @@ defmodule Mobilizon.ActorsTest do
with {:ok, %Actor{id: actor2_id}} <-
ActivityPub.get_or_fetch_actor_by_url(@remote_account_url) do
%Page{total: 2, elements: actors} =
- Actors.build_actors_by_username_or_name_page("tcit", [:Person])
+ Actors.build_actors_by_username_or_name_page(%{term: "tcit"}, [:Person])
actors_ids = actors |> Enum.map(& &1.id)
@@ -199,7 +199,7 @@ defmodule Mobilizon.ActorsTest do
test "test build_actors_by_username_or_name_page/4 returns actors with similar names" do
%{total: 0, elements: actors} =
- Actors.build_actors_by_username_or_name_page("ohno", [:Person])
+ Actors.build_actors_by_username_or_name_page(%{term: "ohno"}, [:Person])
assert actors == []
end
diff --git a/test/mobilizon/events/events_test.exs b/test/mobilizon/events/events_test.exs
index 71f748049..99c808c10 100644
--- a/test/mobilizon/events/events_test.exs
+++ b/test/mobilizon/events/events_test.exs
@@ -60,16 +60,18 @@ defmodule Mobilizon.EventsTest do
test "build_events_for_search/1 returns events for a given name", %{
event: %Event{title: title} = event
} do
- assert title == hd(Events.build_events_for_search(event.title).elements).title
+ assert title == hd(Events.build_events_for_search(%{term: event.title}).elements).title
%Event{} = event2 = insert(:event, title: "Special event")
Workers.BuildSearch.insert_search_event(event2)
assert event2.title ==
- Events.build_events_for_search("Special").elements |> hd() |> Map.get(:title)
+ Events.build_events_for_search(%{term: "Special"}).elements
+ |> hd()
+ |> Map.get(:title)
assert event2.title ==
- Events.build_events_for_search(" Spécïal ").elements
+ Events.build_events_for_search(%{term: " Spécïal "}).elements
|> hd()
|> Map.get(:title)
@@ -79,9 +81,9 @@ defmodule Mobilizon.EventsTest do
Workers.BuildSearch.insert_search_event(event3)
assert event3.title ==
- Events.build_events_for_search("hola").elements |> hd() |> Map.get(:title)
+ Events.build_events_for_search(%{term: "hola"}).elements |> hd() |> Map.get(:title)
- assert %Page{elements: [], total: 0} == Events.build_events_for_search("")
+ assert %Page{elements: _elements, total: 3} = Events.build_events_for_search(%{term: ""})
end
test "find_close_events/3 returns events in the area" do
+