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

add retrieving of last social status post via SMS, username or DMR ID

This commit is contained in:
KF7EEL 2021-10-13 15:48:05 -07:00
parent 6ca2f1d9d1
commit 69ef2e5a71
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data_gateway.py
View File

@ -577,6 +577,10 @@ def process_sms(_rf_src, sms, call_type, system_name):
s = ' '
post = s.join(parse_sms[1:])
send_ss(CONFIG, str(get_alias(int_id(_rf_src), subscriber_ids)), post, int_id(_rf_src))
if '@RSS' in parse_sms[0]:
print(parse_sms)
send_sms_cmd(CONFIG, int_id(_rf_src), sms)
## s = ' '
elif parse_sms[0] == 'ID':
logger.info(str(get_alias(int_id(_rf_src), subscriber_ids)) + ' - ' + str(int_id(_rf_src)))
if call_type == 'unit':

32
web/app.py
View File

@ -2795,8 +2795,7 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
<meta http-equiv="refresh" content="1; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
elif request.args.get('send_sms'):
sms_que_add(current_user.username, '', 0, int(request.form.get('dmr_id')), 'motorola', 'unit', request.form.get('gateway'), '', request.form.get('message'))
print(request.form.get('gateway'))
sms_que_add(current_user.username, '', 0, int(request.form.get('dmr_id')), 'motorola', 'unit', request.form.get('gateway'), '', current_user.username + ' - ' + request.form.get('message'))
content = '''<h3 style="text-align: center;">Message in que.</h3>
<p style="text-align: center;">Redirecting in 1 seconds.</p>
<meta http-equiv="refresh" content="1; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
@ -6830,18 +6829,33 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
sms_que_purge(hblink_req['get_sms_que'])
elif 'sms_cmd' in hblink_req:
if hblink_req['sms_cmd']:
split_cmd = str(hblink_req['cmd']).split(' ')
print(split_cmd)
if hblink_req['cmd'][:1] == '?':
tst = ServerList.query.filter(ServerList.other_options.ilike('%DATA_GATEWAY%')).first()
print(tst)
oo_str = tst.other_options
print(oo_str.split(';'))
## tst = ServerList.query.filter(ServerList.other_options.ilike('%DATA_GATEWAY%')).first()
## print(tst)
## oo_str = tst.other_options
## print(oo_str.split(';'))
try:
split_cmd = str(hblink_req['cmd']).split(' ')
tp = TinyPage.query.filter_by(query_term=str(split_cmd[0])[1:]).first()
## sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', tp.content)
sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', tp.content)
except:
sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', 'Query not found or other error.')
if hblink_req['cmd'][:4] == '@RSS':
try:
try:
retr = int(split_cmd[1])
except:
retr = split_cmd[1]
if type(retr) == int:
ss = Social.query.filter_by(dmr_id=int(split_cmd[1])).order_by(Social.time.desc()).first()
elif type(retr) == str:
ss = Social.query.filter_by(callsign=str(split_cmd[1]).upper()).order_by(Social.time.desc()).first()
sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', 'Last - ' + ss.message)
except:
sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', 'Not found or other error')

4
web/templates/mail.html
View File

@ -70,8 +70,8 @@
<div class="row">
<div class="col-lg-12">
<p style="text-align: right;"><button data-bs-toggle="collapse" data-bs-target="#compose" class="btn btn-primary">Compose</button></p>
{% if call_or_get(current_user.has_roles('Admin')) %}
<p style="text-align: right;"><button data-bs-toggle="collapse" data-bs-target="#compose_sms" class="btn btn-primary">Send SMS</button></p>
{% if call_or_get(current_user.has_roles('Admin')) %}
<p style="text-align: left;"><button data-bs-toggle="collapse" data-bs-target="#compose_sms" class="btn btn-primary">Send SMS</button></p>
{% endif %}
<table data-toggle="table" data-pagination="true" data-search="true" >