hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch

Browse source
This commit is contained in:
lain 2020-11-19 17:32:57 +01:00
commit 5e04f4156c
7 changed files with 63 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/activity/search.ex
View file

@ -29,7 +29,10 @@ defmodule Pleroma.Activity.Search do
|> maybe_restrict_local(user)
|> maybe_restrict_author(author)
|> maybe_restrict_blocked(user)
|> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset)
|> Pagination.fetch_paginated(
%{"offset" => offset, "limit" => limit, "skip_order" => index_type == :rum},
:offset
)
|> maybe_fetch(user, search_query)
end