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

Fix send message logic and tweak context queries for private messages

Browse Source
This commit is contained in:
Mark Veidemanis
2022-08-15 19:16:04 +01:00
parent 4be21cb488
commit a38cfa4ef8
6 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/lib/context.py
View File

@@ -30,7 +30,25 @@ def construct_query(index, net, channel, src, num, size, type=None, nicks=None):
if {"match": {"channel": channel}} in extra_must:
extra_must.remove({"match": {"channel": channel}})
extra_should2 = []
extra_must.append({"match": {"type": "znc"}})
# Type is one of msg or notice
#extra_should.append({"match": {"mtype": "msg"}})
#extra_should.append({"match": {"mtype": "notice"}})
extra_should.append({"match": {"type": "znc"}})
extra_should.append({"match": {"type": "self"}})
extra_should2.append({"match": {"type": "znc"}})
#extra_should2.append({"match": {"channel": channel}})
elif type == "auth":
if {"match": {"channel": channel}} in extra_must:
extra_must.remove({"match": {"channel": channel}})
extra_should2 = []
extra_should2.append({"match": {"nick": channel}})
#extra_should2.append({"match": {"mtype": "msg"}})
#extra_should2.append({"match": {"mtype": "notice"}})
extra_should.append({"match": {"type": "query"}})
extra_should2.append({"match": {"type": "self"}})
extra_should.append({"match": {"nick": channel}})
else:
for ctype in types:
extra_should.append({"match": {"mtype": ctype}})