XF/neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finish implementing webhook delivery

Browse Source
This commit is contained in:
Mark Veidemanis
2023-01-15 23:02:13 +00:00
parent 2dd9efcc6f
commit 75603570ff
7 changed files with 144 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/db/elastic.py
View File

@@ -135,7 +135,7 @@ class ElasticsearchBackend(StorageBackend):
)
return query
def construct_query(self, query, size=None, blank=False):
def construct_query(self, query, size=None, blank=False, **kwargs):
"""
Accept some query parameters and construct an Elasticsearch query.
"""
@@ -252,7 +252,10 @@ class ElasticsearchBackend(StorageBackend):
if field not in ["source", "index", "tags", "query", "sentiment"]:
for value in values:
add_top.append({"match": {field: value}})
search_query = self.parse_query(data, tags, None, False, add_bool)
# Bypass the check for query and tags membership since we can search by msg, etc
search_query = self.parse_query(
data, tags, None, False, add_bool, bypass_check=True
)
self.add_bool(search_query, add_bool)
self.add_top(search_query, add_top)
if "sentiment" in data:
@@ -503,4 +506,6 @@ class ElasticsearchBackend(StorageBackend):
search_query["query"]["bool"]["must_not"] = [item]
else:
for item in add_top:
if "query" not in search_query:
search_query["query"] = {"bool": {"must": []}}
search_query["query"]["bool"]["must"].append(item)