fix: bugfixes

This is a bugfix commit

Author: andrewthetechie

aprs_backend/aprs.py

@@ -268,13 +268,20 @@ def send_message(self, msg: Message) -> None:
             msg_text = msg_text.strip("\n").strip("\r").strip("\t")
         if self._language_filter:
             msg_text = profanity.censor(msg_text)
+        msgNo = None
+        last_send_attempt = 0
+        if "packet" in msg.extras:
+            msgNo = getattr(msg.extras["packet"], "msgNo", None)
+            last_send_attempt = getattr(msg.extras["packet"], "last_send_attempt", 0)
+        if msgNo is None:
+            msgNo = self._message_counter.get_value_sync()
         msg_packet = MessagePacket(
             from_call=self.from_call,
             to_call=msg.to.callsign,
             addresse=msg.to.callsign,
             message_text=msg_text,
-            msgNo=msg.extras["packet"].msgNo,
-            last_send_attempt=msg.extras["packet"].last_send_attempt
+            msgNo=msgNo,
+            last_send_attempt=last_send_attempt
         )
         msg_packet._build_raw()
         try:

aprs_backend/person.py

@@ -38,3 +38,14 @@ def email(self) -> None:
     @property
     def callsign(self) -> str:
         return self._callsign
+
+    def __eq__(self, other: any) -> bool:
+        if isinstance(other, APRSPerson):
+            return self._callsign.lower() == other._callsign.lower()
+        return False
+
+    def __hash__(self):
+        return hash(self._callsign)
+
+    def __str__(self):
+        return self._callsign

aprs_backend/utils/counter.py

@@ -1,9 +1,11 @@
 import asyncio
+from threading import RLock
 
 
 class MessageCounter:
     def __init__(self, initial_value: int = 1, max_message_count: int = 999):
         self._lock = asyncio.Lock()
+        self._sync_lock = RLock()
         self._value = initial_value
         self._max = max_message_count
 
@@ -19,3 +21,13 @@ async def get_value(self, increment: bool = True) -> int:
         async with self._lock:
             this_val = self._value
         return this_val
+
+    def get_value_sync(self, increment: bool = True) -> int:
+        if increment:
+            with self._sync_lock:
+                self._value += 1
+            if self._value > self._max:
+                self._value = 1
+        with self._sync_lock:
+            this_val = self._value
+        return this_val