Implement adding the next relay

This commit is contained in:
Mark Veidemanis 2022-07-29 22:41:53 +01:00
parent 7b97c96be3
commit 29fa14bc98
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
4 changed files with 27 additions and 23 deletions

View File

@ -90,7 +90,10 @@ def get_aliases():
def add_relay(net, num): def add_relay(net, num):
url = f"irc/network/{net}/{num}" if num:
url = f"irc/network/{net}/{num}"
else:
url = f"irc/network/{net}"
payload = {} payload = {}
created = threshold_request(url, payload, method="PUT") created = threshold_request(url, payload, method="PUT")
return created return created

View File

@ -58,16 +58,17 @@ def annotate_results(results_parsed):
# Annotate the number channels the user is on # Annotate the number channels the user is on
num_chans = annotate_num_chans(net, nicks) num_chans = annotate_num_chans(net, nicks)
for item in results_parsed: for item in results_parsed:
if item["net"] == net: if "net" in item:
if "nick" in item: if item["net"] == net:
if item["nick"] in online_info: if "nick" in item:
item["online"] = online_info[item["nick"]] if item["nick"] in online_info:
if "channel" in item: item["online"] = online_info[item["nick"]]
if item["channel"] in num_users: if "channel" in item:
item["num_users"] = num_users[item["channel"]] if item["channel"] in num_users:
if "nick" in item: item["num_users"] = num_users[item["channel"]]
if item["nick"] in num_chans: if "nick" in item:
item["num_chans"] = num_chans[item["nick"]] if item["nick"] in num_chans:
item["num_chans"] = num_chans[item["nick"]]
def filter_blacklisted(user, response): def filter_blacklisted(user, response):

View File

@ -7,8 +7,9 @@
<div class="buttons"> <div class="buttons">
<button <button
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}' hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
hx-put="{% url 'threshold_irc_network_actions_add_relay' net %}"
hx-trigger="click" hx-trigger="click"
hx-target="#channels" hx-target="#actions"
hx-swap="outerHTML" hx-swap="outerHTML"
class="button is-success"> class="button is-success">
<span class="icon-text"> <span class="icon-text">

View File

@ -235,8 +235,7 @@ class ThresholdIRCNetworkActionsRelay(SuperUserRequiredMixin, APIView):
Create a relay Create a relay
""" """
if "num" not in request.data: if "num" not in request.data:
message = "No num specified" num = 0
message_class = "danger"
else: else:
num = request.data["num"] num = request.data["num"]
if not num.isdigit(): if not num.isdigit():
@ -244,15 +243,15 @@ class ThresholdIRCNetworkActionsRelay(SuperUserRequiredMixin, APIView):
message_class = "danger" message_class = "danger"
else: else:
num = int(num) num = int(num)
created = threshold.add_relay(net, num) created = threshold.add_relay(net, num)
if created["success"]: if created["success"]:
id = created["id"] id = created["id"]
alias = created["alias"] alias = created["alias"]
message = f"Created new relay {id} with alias {alias}" message = f"Created new relay {id} with alias {alias}"
message_class = "success" message_class = "success"
else: else:
message = created["reason"] message = created["reason"]
message_class = "danger" message_class = "danger"
context = { context = {
"net": net, "net": net,