When annotating results, don't send empty queries to Threshold

core/db/elastic.py

@@ -108,7 +108,7 @@ class ElasticsearchBackend(StorageBackend):
                 extra_should.append({"match": {"nick": channel}})
             else:
                 for ctype in types:
-                    extra_should.append({"equals": {"mtype": ctype}})
+                    extra_should.append({"match": {"mtype": ctype}})
         else:
             for ctype in types:
                 extra_should.append({"match": {"type": ctype}})

core/db/processing.py

@@ -39,23 +39,32 @@ def annotate_results(results):
                 ]
             )
         )
-        online_info = annotate_online(net, nicks)
+        online_info = None
+        num_users = None
+        num_chans = None
+        if nicks:
+            online_info = annotate_online(net, nicks)
         # Annotate the number of users in the channel
-        num_users = annotate_num_users(net, channels)
+        if channels:
+            num_users = annotate_num_users(net, channels)
         # Annotate the number channels the user is on
-        num_chans = annotate_num_chans(net, nicks)
+        if nicks:
+            num_chans = annotate_num_chans(net, nicks)
         for item in results:
             if "net" in item:
                 if item["net"] == net:
                     if "nick" in item:
-                        if item["nick"] in online_info:
-                            item["online"] = online_info[item["nick"]]
+                        if online_info:
+                            if item["nick"] in online_info:
+                                item["online"] = online_info[item["nick"]]
                     if "channel" in item:
-                        if item["channel"] in num_users:
-                            item["num_users"] = num_users[item["channel"]]
+                        if num_users:
+                            if item["channel"] in num_users:
+                                item["num_users"] = num_users[item["channel"]]
                     if "nick" in item:
-                        if item["nick"] in num_chans:
-                            item["num_chans"] = num_chans[item["nick"]]
+                        if num_chans:
+                            if item["nick"] in num_chans:
+                                item["num_chans"] = num_chans[item["nick"]]
 
 
 def parse_results(results, meta=None):

core/lib/context.py

@@ -4,7 +4,7 @@ def construct_query(index, net, channel, src, num, size, type=None, nicks=None):
     extra_should = []
     extra_should2 = []
     if num:
-        extra_must.append({"equals": {"num": num}})
+        extra_must.append({"match_phrase": {"num": num}})
     if net:
         extra_must.append({"match_phrase": {"net": net}})
     if channel:
@@ -52,7 +52,7 @@ def construct_query(index, net, channel, src, num, size, type=None, nicks=None):
             extra_should.append({"match": {"nick": channel}})
         else:
             for ctype in types:
-                extra_should.append({"equals": {"mtype": ctype}})
+                extra_should.append({"match": {"mtype": ctype}})
     else:
         for ctype in types:
             extra_should.append({"match": {"type": ctype}})