ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only add message to mailbox if user exists, comment out stuff

This commit is contained in:
KF7EEL 2022-02-23 09:11:10 -08:00
parent 563d3ec1fd
commit 1bd7495b7d
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bridge.py
View File

@ -1116,15 +1116,15 @@ class routerHBP(HBSYSTEM):
# just make a new one from the HBP header. This is good enough, and it saves lots of time # just make a new one from the HBP header. This is good enough, and it saves lots of time
else: else:
self.STATUS[_slot]['RX_LC'] = LC_OPT + _dst_id + _rf_src self.STATUS[_slot]['RX_LC'] = LC_OPT + _dst_id + _rf_src
# Download rules ## # Download rules
if _rf_src not in user_rules: ## if _rf_src not in user_rules:
user_rules[_rf_src] = self.name ## user_rules[_rf_src] = self.name
if _rf_src in user_rules: ## if _rf_src in user_rules:
## print('in') #### print('in')
if user_rules[_rf_src] != self.name: ## if user_rules[_rf_src] != self.name:
user_rules[_rf_src] = self.name ## user_rules[_rf_src] = self.name
## print('updated') #### print('updated')
## print(user_rules) #### print(user_rules)
for _bridge in BRIDGES: for _bridge in BRIDGES:
## print(BRIDGES) ## print(BRIDGES)
## print(_bridge) ## print(_bridge)

1
data_gateway.py
View File

@ -1419,7 +1419,6 @@ def data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _fr
## if int_id(_dst_id) == data_id: ## if int_id(_dst_id) == data_id:
if int_id(_dst_id) in data_id: if int_id(_dst_id) in data_id:
process_sms(_rf_src, msg_found, _call_type, UNIT_MAP[_rf_src][0]) process_sms(_rf_src, msg_found, _call_type, UNIT_MAP[_rf_src][0])
## if int_id(_dst_id) != data_id: ## if int_id(_dst_id) != data_id:
if int_id(_dst_id) not in data_id: if int_id(_dst_id) not in data_id:

29
web/app.py
View File

@ -3600,9 +3600,12 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
server = _server, server = _server,
system_name = _system_name system_name = _system_name
) )
# Only add to mailbox if user exists
try:
usr_nm = User.query.filter(User.dmr_ids.ilike('%' + str(_rcv_id) + '%')).first()
add_sms_mail = MailBox( add_sms_mail = MailBox(
snd_callsign = _snd_call, snd_callsign = _snd_call,
rcv_callsign = _rcv_call, rcv_callsign = str(usr_nm.username).upper(),
message = _msg, message = _msg,
time = datetime.datetime.utcnow(), time = datetime.datetime.utcnow(),
snd_id = _snd_id, snd_id = _snd_id,
@ -3610,8 +3613,10 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
server = _server, server = _server,
system_name = _system_name system_name = _system_name
) )
db.session.add(add_sms)
db.session.add(add_sms_mail) db.session.add(add_sms_mail)
except:
pass
db.session.add(add_sms)
db.session.commit() db.session.commit()
def mailbox_add(_snd_call, _rcv_call, _msg, _snd_id, _rcv_id, _server, _system_name): def mailbox_add(_snd_call, _rcv_call, _msg, _snd_id, _rcv_id, _server, _system_name):
@ -5130,20 +5135,20 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
@roles_required('Admin') @roles_required('Admin')
def test_peer_db(): def test_peer_db():
if request.args.get('save_mode'): if request.args.get('save_mode'):
if request.form.get('enabled') == 'true': peer_enabled = False
use_acl = False
unit_enabled = False
peer_loose = True
if request.form.get('enabled') == 'True':
peer_enabled = True peer_enabled = True
## if request.form.get('loose') == 'true': ## if request.form.get('loose') == 'true':
## peer_loose = True ## peer_loose = True
if request.form.get('use_acl') == 'true': if request.form.get('use_acl') == 'True':
use_acl = True use_acl = True
if request.form.get('enable_unit') == 'True': if request.form.get('enable_unit') == 'True':
unit_enabled = True unit_enabled = True
## else: ## else:
## peer_loose = False ## peer_loose = False
peer_enabled = False
use_acl = False
unit_enabled = False
peer_loose = True
## print(request.form.get('enable_unit')) ## print(request.form.get('enable_unit'))
## print(enable_unit) ## print(enable_unit)
if request.form.get('name_text') == '': if request.form.get('name_text') == '':
@ -5202,8 +5207,8 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
<tr> <tr>
<td style="width: 175.567px;"><strong>&nbsp;Active:</strong></td> <td style="width: 175.567px;"><strong>&nbsp;Active:</strong></td>
<td style="width: 399.433px;">&nbsp;<select name="enabled"> <td style="width: 399.433px;">&nbsp;<select name="enabled">
<option value="true">True</option> <option value="True">True</option>
<option value="false">False</option> <option value="False">False</option>
</select></td> </select></td>
</tr> </tr>
<tr> <tr>
@ -5414,8 +5419,8 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
<td style="width: 175.567px;"><strong>&nbsp;Active:</strong></td> <td style="width: 175.567px;"><strong>&nbsp;Active:</strong></td>
<td style="width: 399.433px;">&nbsp;<select name="enabled"> <td style="width: 399.433px;">&nbsp;<select name="enabled">
<option value="''' + str(p.enabled) + '''" selected>Current: ''' + str(p.enabled) + '''</option> <option value="''' + str(p.enabled) + '''" selected>Current: ''' + str(p.enabled) + '''</option>
<option value="true">True</option> <option value="True">True</option>
<option value="false">False</option> <option value="False">False</option>
</select></td> </select></td>
</tr> </tr>
<tr> <tr>