Big updates

drb-c2-core/app/internal/mqtt_handler.py

@@ -154,12 +154,23 @@ class MQTTHandler:
             else datetime.now(timezone.utc)
         )
 
+        # Prefer the name from OP25 metadata; fall back to the system config
+        tgid_name = payload.get("tgid_name") or ""
+        if not tgid_name and system_id and payload.get("tgid"):
+            system_doc = await fstore.doc_get("systems", system_id)
+            if system_doc:
+                tgid_int = int(payload["tgid"])
+                for tg in system_doc.get("config", {}).get("talkgroups", []):
+                    if int(tg.get("id", -1)) == tgid_int:
+                        tgid_name = tg.get("name", "")
+                        break
+
         doc = {
             "call_id": call_id,
             "node_id": node_id,
             "system_id": system_id,
             "talkgroup_id": payload.get("tgid"),
-            "talkgroup_name": payload.get("tgid_name") or "",
+            "talkgroup_name": tgid_name,
             "freq": payload.get("freq"),
             "srcaddr": payload.get("srcaddr"),
             "started_at": started_at,