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

29
core/views/ui/drilldown.py
View File

@@ -255,26 +255,18 @@ class DrilldownContextModal(APIView):
# Create the query params from the POST arguments
mandatory = ["net", "channel", "num", "src", "index", "nick", "type"]
invalid = [None, False, "—", "None"]
query_params = {k: v for k, v in request.data.items() if v}
if query_params["index"] == "int":
mandatory.append("mtype")
for key in query_params:
if query_params[key] in invalid:
query_params[key] = None
for key in mandatory:
if key not in query_params:
query_params[key] = None
if query_params["index"] == "int":
if "mtype" not in query_params:
query_params["mtype"] = None
if request.user.is_superuser:
if query_params["type"] in ["query", "notice"]:
nicks = [query_params["channel"], query_params["nick"]]
query_params["sorting"] = "desc"
if (
query_params["index"] == "int"
and query_params["mtype"] == "msg"
and not query_params["type"] == "query"
):
query_params["index"] = "main"
type = None
if "type" in query_params:
@@ -282,6 +274,17 @@ class DrilldownContextModal(APIView):
if type == "znc":
query_params["channel"] = "*status"
if request.user.is_superuser:
if type in ["query", "notice"]:
nicks = [query_params["channel"], query_params["nick"]]
query_params["sorting"] = "desc"
if (
query_params["index"] == "int"
and query_params["mtype"] == "msg"
and not type == "query"
):
query_params["index"] = "main"
# Create the query with the context helper
search_query = construct_query(
query_params["index"],