pitchum/debianize-mobilizon
pitchum/debianize-mobilizon
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Revert "fix search results sorted by id instead of by begins_on"

Browse Source 
This reverts commit a133612d9f.
This commit is contained in:
Thomas Citharel 2021-01-14 11:39:01 +01:00
parent 2bdb8fd1fa
commit eb72248e16
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mobilizon/events/events.ex
View File

@ -520,8 +520,7 @@ defmodule Mobilizon.Events do
|> events_for_tags(args) |> events_for_tags(args)
|> events_for_location(args) |> events_for_location(args)
|> filter_local_or_from_followed_instances_events() |> filter_local_or_from_followed_instances_events()
|> filter_public_visibility() |> order_by([q], asc: q.id)
|> event_order_begins_on_asc()
|> Page.build_page(page, limit) |> Page.build_page(page, limit)
end end
@ -1342,6 +1341,8 @@ defmodule Mobilizon.Events do
@spec events_for_search_query(String.t()) :: Ecto.Query.t() @spec events_for_search_query(String.t()) :: Ecto.Query.t()
defp events_for_search_query(search_string) do defp events_for_search_query(search_string) do
Event Event
|> where([e], e.visibility == ^:public)
|> distinct([e], e.id)
|> do_event_for_search_query(search_string) |> do_event_for_search_query(search_string)
end end