From 507f43df1632631b6a034cd1cf8e2d6aba02f1a8 Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Sat, 3 Aug 2024 12:55:11 -0400
Subject: [PATCH] Updated MQTT message states.

---
 owrx/__main__.py | 8 ++++----
 owrx/client.py   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/owrx/__main__.py b/owrx/__main__.py
index 4f95a634..06043041 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -146,12 +146,12 @@ Support and info:       https://groups.io/g/openwebrx
     # Instantiate and refresh marker database
     Markers.start()
 
-    # Report receiver started
+    # Report server started
     ReportingEngine.getSharedInstance().spot({
         "mode"      : "RX",
         "timestamp" : round(datetime.now().timestamp() * 1000),
         "version"   : openwebrx_version,
-        "state"     : "ReceiverStarted"
+        "state"     : "ServerStarted"
     })
 
     try:
@@ -183,12 +183,12 @@ Support and info:       https://groups.io/g/openwebrx
     SdrService.stopAllSources()
     DecoderQueue.stopAll()
 
-    # Report receiver stopped
+    # Report server stopped
     ReportingEngine.getSharedInstance().spot({
         "mode"      : "RX",
         "timestamp" : round(datetime.now().timestamp() * 1000),
         "version"   : openwebrx_version,
-        "state"     : "ReceiverStopped"
+        "state"     : "ServerStopped"
     })
 
     # Done with reporting now
diff --git a/owrx/client.py b/owrx/client.py
index 91ff22b0..2260a122 100644
--- a/owrx/client.py
+++ b/owrx/client.py
@@ -52,13 +52,13 @@ class ClientRegistry(object):
             raise TooManyClientsException()
         self.clients.append(client)
         self.broadcast()
-        self.reportClient(client, { "state":"CONNECTED" })
+        self.reportClient(client, { "state":"Connected" })
 
     def clientCount(self):
         return len(self.clients)
 
     def removeClient(self, client):
-        self.reportClient(client, { "state":"DISCONNECTED" })
+        self.reportClient(client, { "state":"Disconnected" })
         try:
             if client in self.chat:
                 del self.chat[client]
@@ -88,7 +88,7 @@ class ClientRegistry(object):
     def reportChatMessage(self, client, text: str):
         name = self.chat[client]["name"] if client in self.chat else "???"
         self.reportClient(client, {
-            "state"   : "CHAT",
+            "state"   : "ChatMessage",
             "name"    : name,
             "message" : text
         })