projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow moderators to get the admin scope again
[akkoma]
/
lib
/
pleroma
/
search
/
elasticsearch.ex
diff --git
a/lib/pleroma/search/elasticsearch.ex
b/lib/pleroma/search/elasticsearch.ex
index 16b01101acced74ffb55d96f652aaa5b5e2fe6f3..20e03e1f0d7c40b6a7e1c44c54fd05cccb7c038f 100644
(file)
--- a/
lib/pleroma/search/elasticsearch.ex
+++ b/
lib/pleroma/search/elasticsearch.ex
@@
-13,25
+13,21
@@
defmodule Pleroma.Search.Elasticsearch do
def es_query(:activity, query, offset, limit) do
must = Parsers.Activity.parse(query)
def es_query(:activity, query, offset, limit) do
must = Parsers.Activity.parse(query)
- if must == [] do
- :skip
- else
- %{
- size: limit,
- from: offset,
- terminate_after: 50,
- timeout: "5s",
- sort: [
- "_score",
- %{"_timestamp" => %{order: "desc", format: "basic_date_time"}}
- ],
- query: %{
- bool: %{
- must: must
- }
+ %{
+ size: limit,
+ from: offset,
+ terminate_after: 50,
+ timeout: "5s",
+ sort: [
+ "_score",
+ %{"_timestamp" => %{order: "desc", format: "basic_date_time"}}
+ ],
+ query: %{
+ bool: %{
+ must: must
}
}
}
}
- end
+ }
end
defp maybe_fetch(:activity, search_query) do
end
defp maybe_fetch(:activity, search_query) do