-
+ {% for chan in chans %}
+
- + + {% endfor %} + +
diff --git a/core/lib/nicktrace.py b/core/lib/nicktrace.py index 96f99eb..173490e 100644 --- a/core/lib/nicktrace.py +++ b/core/lib/nicktrace.py @@ -1,13 +1,68 @@ from core.lib.opensearch import client, run_main_query -def get_nicks(request, net, nick): +def get_nicks(request, net, nick, iter=0): """ Get all related nicknames of the given nickname by tracking nickname changes. """ + print("GET NICKS INIT", net, nick, iter) # Get the initial query - query = {} - results = set() + query = { + "size": 10000, + "query": { + "bool": { + "must": [ + {"match": {"net": net}}, + {"match": {"type": "nick"}}, + { + "bool": { + "should": [ + {"match": {"nick": nick}}, + {"match": {"user": nick}}, + ] + } + }, + ] + } + }, + } + results = run_main_query(client, request.user, query, custom_query=True) + nicks = [] + if "hits" in results.keys(): + if "hits" in results["hits"]: + for item in results["hits"]["hits"]: + element = item["_source"] + element["id"] = item["_id"] + + # Split the timestamp into date and time + ts = element["ts"] + ts_spl = ts.split("T") + date = ts_spl[0] + time = ts_spl[1] + element["date"] = date + element["time"] = time + if element["nick"] not in nicks: + nicks.append(element["nick"]) + if element["user"] not in nicks: + nicks.append(element["user"]) + + # if iter < 2: + # iter += 1 + # collect_nicks = [] + # for x in nicks: + # nicks_2 = get_nicks(request, net, x, iter) + # print("NICKS_2", nicks_2) + # for y in nicks_2: + # if y not in collect_nicks: + # collect_nicks.append(y) + # print("RETURN NICKS", nick, collect_nicks) + # for x in collect_nicks: + # if x not in nicks: + # nicks.append(x) + # else: + # print("ABORTING SEARCH") + return nicks + # results = set() # nicks = query["nicks"] # for nick in nicks: # if nick not in results: diff --git a/core/templates/ui/insights/channels.html b/core/templates/ui/insights/channels.html index eee24a1..c17c3b4 100644 --- a/core/templates/ui/insights/channels.html +++ b/core/templates/ui/insights/channels.html @@ -1,16 +1,19 @@