From a133612d9fa3dc6026fbcd07f9f452352f36ae0b Mon Sep 17 00:00:00 2001 From: setop Date: Tue, 12 Jan 2021 10:28:20 +0100 Subject: [PATCH] fix search results sorted by id instead of by begins_on --- lib/mobilizon/events/events.ex | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex index 9d6792940..916efc708 100644 --- a/lib/mobilizon/events/events.ex +++ b/lib/mobilizon/events/events.ex @@ -520,7 +520,8 @@ defmodule Mobilizon.Events do |> events_for_tags(args) |> events_for_location(args) |> filter_local_or_from_followed_instances_events() - |> order_by([q], asc: q.id) + |> filter_public_visibility() + |> event_order_begins_on_asc() |> Page.build_page(page, limit) end @@ -1341,8 +1342,6 @@ defmodule Mobilizon.Events do @spec events_for_search_query(String.t()) :: Ecto.Query.t() 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