potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'fixes' into 'main'

Browse source 
fix(search): fix global search sorting

Closes #1297

See merge request framasoft/mobilizon!1404
This commit is contained in:
Thomas Citharel 2023-06-01 14:39:35 +00:00
parent a6c77fe39e 39e24c328a
commit b69ffacff5
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/service/global_search/search_mobilizon.ex
View file

@ -52,7 +52,7 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
start: (Keyword.get(options, :page, 1) - 1) * Keyword.get(options, :limit, 16), start: (Keyword.get(options, :page, 1) - 1) * Keyword.get(options, :limit, 16),
latlon: to_lat_lon(options[:location]), latlon: to_lat_lon(options[:location]),
bbox: options[:bbox], bbox: options[:bbox],
sortBy: Map.get(@sort_by_options, options[:sort_by]), sort: Map.get(@sort_by_options, options[:sort_by]),
boostLanguages: options[:boost_languages] boostLanguages: options[:boost_languages]
) )
|> Keyword.take([ |> Keyword.take([
@ -68,8 +68,7 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
:statusOneOf, :statusOneOf,
:bbox, :bbox,
:start, :start,
:count, :count
:sortBy
]) ])
|> Keyword.reject(fn {_key, val} -> is_nil(val) or val == "" end) |> Keyword.reject(fn {_key, val} -> is_nil(val) or val == "" end)
@ -104,7 +103,7 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
start: (options[:page] - 1) * options[:limit], start: (options[:page] - 1) * options[:limit],
latlon: to_lat_lon(options[:location]), latlon: to_lat_lon(options[:location]),
bbox: options[:bbox], bbox: options[:bbox],
sortBy: Map.get(@sort_by_options, options[:sort_by]) sort: Map.get(@sort_by_options, options[:sort_by])
) )
|> Keyword.take([ |> Keyword.take([
:search, :search,
@ -115,8 +114,7 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
:sort, :sort,
:start, :start,
:count, :count,
:bbox, :bbox
:sortBy
]) ])
|> Keyword.reject(fn {_key, val} -> is_nil(val) or val == "" end) |> Keyword.reject(fn {_key, val} -> is_nil(val) or val == "" end)