From 74c029de2bb6bcf52954da3bf316fdc2f68836e3 Mon Sep 17 00:00:00 2001 From: Kelly Date: Mon, 6 Jul 2026 17:18:19 -0700 Subject: [PATCH] updateDEalert thanks dude https://github.com/SpudGunMan/meshing-around/issues/325 Co-Authored-By: wh6gxz nurse dude --- README.md | 2 +- mesh_bot.py | 6 ++---- modules/globalalert.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 894b3f7..9df9594 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Mesh Bot is a feature-rich Python bot designed to enhance your [Meshtastic](http - **FEMA iPAWS/EAS Alerts**: Receive Emergency Alerts from FEMA via API on internet-connected nodes. - **NOAA EAS Alerts**: Get Emergency Alerts from NOAA via API. - **USGS Volcano Alerts**: Receive volcano alerts from USGS via API. -- **NINA Alerts (Germany)**: Receive emergency alerts from the xrepository.de feed for Germany. +- **Bund-Warnmeldung (Deutschland)**: Receive emergency alerts from warnung.bund.de feed for Germany. - **Offline EAS Alerts**: Report EAS alerts over the mesh using external tools, even without internet. ### File Monitor Alerts diff --git a/mesh_bot.py b/mesh_bot.py index 034b13a..07be2e4 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -1377,7 +1377,7 @@ def handle_wxc(message_from_id, deviceID, cmd, days=None, vox=False): def handle_emergency_alerts(message, message_from_id, deviceID): location = get_node_location(message_from_id, deviceID) if my_settings.enableDEalerts: - # nina Alerts + # bund/nina Alerts return get_nina_alerts() if message.lower().startswith("ealert"): # Detailed alert FEMA @@ -1783,14 +1783,12 @@ def handle_boot(mesh=True): logger.debug("System: File Monitor Bible Verse Enabled for bible.txt") if my_settings.usAlerts: logger.debug(f"System: Emergency Alert Broadcast Enabled on channel {my_settings.emergency_responder_alert_channel} for interface {my_settings.emergency_responder_alert_interface}") - if my_settings.enableDEalerts: - logger.debug(f"System: NINA Alerts Enabled with counties {my_settings.myRegionalKeysDE}") if my_settings.volcanoAlertBroadcastEnabled: logger.debug(f"System: Volcano Alert Broadcast Enabled on channels {my_settings.emergency_responder_alert_channel} ignoreUSGSWords {my_settings.ignoreUSGSWords}") if my_settings.ipawsAlertEnabled: logger.debug(f"System: iPAWS Alerts Enabled with FIPS codes {my_settings.myStateFIPSList} ignorelist {my_settings.ignoreFEMAwords}") if my_settings.enableDEalerts: - logger.debug(f"System: NINA Alerts Enabled with counties {my_settings.myRegionalKeysDE}") + logger.debug(f"System: DE-Bund Alerts Enabled with counties {my_settings.myRegionalKeysDE}") if my_settings.wxAlertBroadcastEnabled: logger.debug(f"System: Weather Alert Broadcast Enabled on channels {my_settings.emergency_responder_alert_channel} ignoreEASwords {my_settings.ignoreEASwords}") if my_settings.emergency_responder_enabled: diff --git a/modules/globalalert.py b/modules/globalalert.py index 5906a19..a4ec319 100644 --- a/modules/globalalert.py +++ b/modules/globalalert.py @@ -35,7 +35,7 @@ def get_nina_alerts(): # get api.bund.dev alerts alerts = [] for regionalKey in myRegionalKeysDE: - url = ("https://nina.api.proxy.bund.dev/api31/dashboard/" + regionalKey + ".json") + url = ("https://warnung.bund.de/api31/dashboard/071380000000.json" + regionalKey + ".json") response = requests.get(url, timeout=urlTimeoutSeconds) data = response.json() @@ -44,7 +44,7 @@ def get_nina_alerts(): alerts.append(f"🚨 {title}") return "\n".join(alerts) if alerts else NO_ALERTS except Exception as e: - logger.warning("Error getting NINA DE alerts: " + str(e)) + logger.warning("Error getting DE-Bund alerts: " + str(e)) return NO_ALERTS def get_wxUKgov():