diff --git a/app/urls.py b/app/urls.py index f1f861c..3b303c9 100644 --- a/app/urls.py +++ b/app/urls.py @@ -25,6 +25,7 @@ from core.views import Billing, Cancel, Home, Order, Portal, Signup from core.views.callbacks import Callback from core.views.manage.threshold.irc import ( ThresholdIRCAliases, + ThresholdIRCAliasesEdit, ThresholdIRCNetworkActions, ThresholdIRCNetworkActionsRelay, ThresholdIRCNetworkChannels, @@ -35,7 +36,6 @@ from core.views.manage.threshold.irc import ( ThresholdIRCNetworkRelayStatus, ThresholdIRCNetworks, ThresholdIRCStats, - ThresholdIRCAliasesEdit, ) # Management stuff diff --git a/core/lib/manage/threshold.py b/core/lib/manage/threshold.py index 0e987ab..f4d2efa 100644 --- a/core/lib/manage/threshold.py +++ b/core/lib/manage/threshold.py @@ -104,3 +104,10 @@ def del_relay(net, num): payload = {} deleted = threshold_request(url, payload, method="DELETE") return deleted + + +def update_aliases(aliases): + url = "aliases" + payload = aliases + deleted = threshold_request(url, payload, method="POST") + return deleted diff --git a/core/lib/threshold.py b/core/lib/threshold.py index 0a6fe17..a885ddb 100644 --- a/core/lib/threshold.py +++ b/core/lib/threshold.py @@ -51,13 +51,14 @@ def sort_data(data): data[item] = OrderedDict({k: v for k, v in sorted_item}) -def threshold_request(url, data, method="POST"): +def threshold_request(url, data, method="POST", esc=False): headers = { "ApiKey": settings.THRESHOLD_API_KEY, "Token": settings.THRESHOLD_API_TOKEN, } - for key in data: - data[key] = escape(data[key]) + if esc: + for key in data: + data[key] = escape(data[key]) if method == "POST": method = requests.post @@ -96,7 +97,7 @@ def threshold_request(url, data, method="POST"): def get_chans(net, query): url = "chans" payload = {"net": net, "query": query} - channels = threshold_request(url, payload) + channels = threshold_request(url, payload, esc=True) if not channels: return [] return channels["chans"] @@ -105,7 +106,7 @@ def get_chans(net, query): def get_users(net, query): url = "users" payload = {"net": net, "query": query} - users = threshold_request(url, payload) + users = threshold_request(url, payload, esc=True) if not users: return [] return users["users"] @@ -114,7 +115,7 @@ def get_users(net, query): def annotate_online(net, query): url = "online" payload = {"net": net, "query": query} - online_info = threshold_request(url, payload) + online_info = threshold_request(url, payload, esc=True) if not online_info: return {} return online_info @@ -123,7 +124,7 @@ def annotate_online(net, query): def annotate_num_users(net, query): url = "num_users" payload = {"net": net, "query": query} - user_num_map = threshold_request(url, payload) + user_num_map = threshold_request(url, payload, esc=True) if not user_num_map: return {} return user_num_map @@ -132,7 +133,7 @@ def annotate_num_users(net, query): def annotate_num_chans(net, query): url = "num_chans" payload = {"net": net, "query": query} - chan_num_map = threshold_request(url, payload) + chan_num_map = threshold_request(url, payload, esc=True) if not chan_num_map: return {} return chan_num_map diff --git a/core/templates/manage/threshold/irc/overview/modals/edit-aliases.html b/core/templates/manage/threshold/irc/overview/modals/edit-aliases.html index 8d94cff..a86dbd4 100644 --- a/core/templates/manage/threshold/irc/overview/modals/edit-aliases.html +++ b/core/templates/manage/threshold/irc/overview/modals/edit-aliases.html @@ -1,6 +1,6 @@ {% load index %} {% load static %} -{% load joinsep %} +{% load nsep %}
@@ -9,55 +9,55 @@

Edit aliases

-
-
- - - - - - - - - {% for alias in aliases %} - - - - - - - {% endfor %} - - -
numnickrealnameemails
- {{ alias.num }} - -
- -
- 		-
- -
- 		-
- -
-
- + hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}' + hx-post="{% url 'threshold_irc_aliases_edit' %}" + hx-target="#aliases" + hx-swap="outerHTML"> +
+
+ + + + + + + + + {% for alias in aliases %} + + + + + + + {% endfor %} + + +
numnickrealnameemails
+ {{ alias.num }} + +
+ +
+ 		+
+ +
+ 		+
+ +
+
+ +
-
- - + + - +
diff --git a/core/templatetags/nsep.py b/core/templatetags/nsep.py new file mode 100644 index 0000000..515e807 --- /dev/null +++ b/core/templatetags/nsep.py @@ -0,0 +1,7 @@ +from django import template + +register = template.Library() + +@register.filter +def nsep(lst): + return "\n".join(lst) \ No newline at end of file diff --git a/core/views/manage/threshold/irc.py b/core/views/manage/threshold/irc.py index bc960da..9909305 100644 --- a/core/views/manage/threshold/irc.py +++ b/core/views/manage/threshold/irc.py @@ -214,6 +214,7 @@ class ThresholdIRCAliases(SuperUserRequiredMixin, APIView): } return render(request, self.template_name, context) + class ThresholdIRCAliasesEdit(SuperUserRequiredMixin, APIView): template_name = "manage/threshold/irc/overview/modals/edit-aliases.html" parser_classes = [FormParser] @@ -236,7 +237,7 @@ class ThresholdIRCAliasesEdit(SuperUserRequiredMixin, APIView): message_class = "success" new_aliases = {} for item in request.data: - if not "|" in item: + if "|" not in item: continue spl = item.split("|") if len(spl) != 2: @@ -247,7 +248,6 @@ class ThresholdIRCAliasesEdit(SuperUserRequiredMixin, APIView): value = request.data[item] if field == "emails": value = request.data[item].split("\n") - print("EMAILS", ) for email in value: # Check field isn't just empty if len(email) != 0: @@ -256,18 +256,16 @@ class ThresholdIRCAliasesEdit(SuperUserRequiredMixin, APIView): message = f"Invalid email: {email}" message_class = "danger" break - # Need to exit here and not run the update - # Or just let threshold do the validation + if num not in new_aliases: new_aliases[num] = {field: value} else: new_aliases[num][field] = value - print("NEW", new_aliases) - #if not message_class = "danger": - # updated = threshold.update_aliases(new_aliases) - # if not updated: - # message = updated["reason"] - # message_class = "danger" + if not message_class == "danger": + updated = threshold.update_aliases(new_aliases) + if not updated: + message = updated["reason"] + message_class = "danger" template_name = "manage/threshold/irc/overview/aliases.html" aliases = threshold.get_aliases() context = { @@ -277,6 +275,7 @@ class ThresholdIRCAliasesEdit(SuperUserRequiredMixin, APIView): } return render(request, template_name, context) + class ThresholdIRCNetworkActions(SuperUserRequiredMixin, View): template_name = "manage/threshold/irc/network/actions.html"