ShaYmez/hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix mailbox parsing

Browse Source
This commit is contained in:
KF7EEL 2021-03-01 16:50:55 -08:00
parent dccf561e3d
commit d0e90531c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge_gps_data.py
View File

@ -309,7 +309,7 @@ def process_sms(_rf_src, sms):
os.remove('/tmp/gps_data_user_sos.txt') os.remove('/tmp/gps_data_user_sos.txt')
logger.info('Removing SOS') logger.info('Removing SOS')
elif '@' and 'M-' in sms: elif '@' and 'M-' in sms:
message = re.sub('@.* |M-','',sms) message = re.sub('^@|.* M-|','',sms)
recipient = 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()) 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: elif '@REM MAIL' == sms:

2
gps_data.py
View File

@ -300,7 +300,7 @@ def process_sms(_rf_src, sms):
os.remove('/tmp/gps_data_user_sos.txt') os.remove('/tmp/gps_data_user_sos.txt')
logger.info('Removing SOS or Notice') logger.info('Removing SOS or Notice')
elif '@' and 'M-' in sms: elif '@' and 'M-' in sms:
message = re.sub('@.* |M-','',sms) message = re.sub('^@|.* M-|','',sms)
recipient = 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()) 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: elif '@REM MAIL' == sms: