From 22027cc8af050fd117dc32174604d7aa083a4687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Fri, 20 Oct 2023 23:18:15 +0200
Subject: [PATCH] typo corrections

---
 .../control/templates/control/mesh_node_detail.html      | 2 +-
 src/c3nav/control/templates/control/mesh_nodes.html      | 2 +-
 src/c3nav/mesh/baseformats.py                            | 9 ++++++++-
 src/c3nav/mesh/messages.py                               | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/c3nav/control/templates/control/mesh_node_detail.html b/src/c3nav/control/templates/control/mesh_node_detail.html
index 6b077e73..69d4cbea 100644
--- a/src/c3nav/control/templates/control/mesh_node_detail.html
+++ b/src/c3nav/control/templates/control/mesh_node_detail.html
@@ -12,7 +12,7 @@
                 <strong>Name:</strong> {% if node.name %}{{ node.name }}{% else %}<em>{% trans '(no name)' %}</em>{% endif %}
             </p>
             <p>
-                <strong>Uplink:</strong> <a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a><br>
+                <strong>Uplink:</strong> {% if node.uplink %}<a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a><br>{% endif %}
 
                 <strong>Last signin:</strong>
                 {{ node.last_signin.date }} {{ node.last_signin.time|date:"H:i:s" }}
diff --git a/src/c3nav/control/templates/control/mesh_nodes.html b/src/c3nav/control/templates/control/mesh_nodes.html
index 31b4bda9..fcf3c96f 100644
--- a/src/c3nav/control/templates/control/mesh_nodes.html
+++ b/src/c3nav/control/templates/control/mesh_nodes.html
@@ -66,7 +66,7 @@
                         {{ timesince }} ago
                     {% endblocktrans %}
                 </td>
-                <td><a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a></td>
+                <td>{% if node.uplink %}<a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a>{% endif %}</td>
             </tr>
         {% endfor %}
     </table>
diff --git a/src/c3nav/mesh/baseformats.py b/src/c3nav/mesh/baseformats.py
index 440ce86a..77ddf627 100644
--- a/src/c3nav/mesh/baseformats.py
+++ b/src/c3nav/mesh/baseformats.py
@@ -216,7 +216,7 @@ class VarArrayFormat(BaseVarFormat):
 
     def tojson(self, data):
         return [
-            item.tojson(item) for item in data
+            self.child_type.tojson(item) for item in data
         ]
 
     def get_c_parts(self):
@@ -647,6 +647,13 @@ def normalize_name(name):
             r"\1_\2",
             name
         ).lower()
+
+    name = re.sub(
+        r"(ota)([a-z])",
+        r"\1_\2",
+        name
+    ).lower()
+
     name = name.replace('config', 'cfg')
     name = name.replace('position', 'pos')
     name = name.replace('mesh_', '')
diff --git a/src/c3nav/mesh/messages.py b/src/c3nav/mesh/messages.py
index 4ad5e8f5..5fc51de0 100644
--- a/src/c3nav/mesh/messages.py
+++ b/src/c3nav/mesh/messages.py
@@ -312,8 +312,8 @@ class OTAFragmentMessage(MeshMessage, msg_type=MeshMessageType.OTA_FRAGMENT):
 
 
 @dataclass
-class OTAFRequestMessage(MeshMessage, msg_type=MeshMessageType.OTA_REQUEST_FRAGMENT):
-    """ request fragment after we haven't gottan one for a while """
+class OTARequestFragmentMessage(MeshMessage, msg_type=MeshMessageType.OTA_REQUEST_FRAGMENT):
+    """ request fragment after we haven't gotten one for a while """
     update_id: int = field(metadata={"format": SimpleFormat('I')})
     offset_bytes: int = field(metadata={"format": SimpleFormat('I')})