From d1c55feb567b61be054493b0f50a57859e710b1e Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Mon, 1 Mar 2021 16:52:10 -0800 Subject: [PATCH] fix mailbox parsing --- bridge_gps_data.py | 2 +- gps_data.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge_gps_data.py b/bridge_gps_data.py index a2dc1e5..1f7ee92 100644 --- a/bridge_gps_data.py +++ b/bridge_gps_data.py @@ -304,7 +304,7 @@ def process_sms(_rf_src, sms): os.remove('/tmp/gps_data_user_sos.txt') logger.info('Removing SOS') elif '@' and 'M-' in sms: - message = re.sub('@.* |M-','',sms) + message = re.sub('^@|.* M-|','',sms) recipient = re.sub('@| M-.*','',sms) mailbox_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), message, str(recipient).upper()) elif '@REM MAIL' == sms: diff --git a/gps_data.py b/gps_data.py index 2cbdd9d..81e0883 100644 --- a/gps_data.py +++ b/gps_data.py @@ -300,7 +300,7 @@ def process_sms(_rf_src, sms): os.remove('/tmp/gps_data_user_sos.txt') logger.info('Removing SOS or Notice') elif '@' and 'M-' in sms: - message = re.sub('@.* |M-','',sms) + message = re.sub('^@|.* M-|','',sms) recipient = re.sub('@| M-.*','',sms) mailbox_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), message, str(recipient).upper()) elif '@REM MAIL' == sms: