github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 00:06:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Accept disabled OneSignal id

Browse source
This commit is contained in:
JonnyWong16 2021-03-20 12:38:01 -07:00
parent f31f1f1a17
commit 5f2e3f58e7
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
4 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/interfaces/default/mobile_devices_table.html
View file

@ -13,10 +13,10 @@ DOCUMENTATION :: END
% for device in sorted(devices_list, key=lambda k: k['device_name']): % for device in sorted(devices_list, key=lambda k: k['device_name']):
<li class="mobile-device pointer" data-id="${device['id']}" data-name="${device['device_name']}"> <li class="mobile-device pointer" data-id="${device['id']}" data-name="${device['device_name']}">
<span> <span>
% if device['official'] == 1: % if device['official'] == -1:
<span class="toggle-left"><i class="fa fa-lg fa-fw fa-mobile"></i></span>
% elif device['official'] == -1:
<span class="toggle-left official-tooltip" data-toggle="tooltip" data-placement="top" title="OneSignal Validation Failed"><i class="fa fa-lg fa-fw fa-exclamation-triangle"></i></span> <span class="toggle-left official-tooltip" data-toggle="tooltip" data-placement="top" title="OneSignal Validation Failed"><i class="fa fa-lg fa-fw fa-exclamation-triangle"></i></span>
% elif device['official'] > 0:
<span class="toggle-left"><i class="fa fa-lg fa-fw fa-mobile"></i></span>
% else: % else:
<span class="toggle-left official-tooltip" data-toggle="tooltip" data-placement="top" title="Unofficial or Unknown App"><i class="fa fa-lg fa-fw fa-exclamation-triangle"></i></span> <span class="toggle-left official-tooltip" data-toggle="tooltip" data-placement="top" title="Unofficial or Unknown App"><i class="fa fa-lg fa-fw fa-exclamation-triangle"></i></span>
% endif % endif

5
plexpy/__init__.py
View file

@ -2367,6 +2367,11 @@ def dbcheck():
def upgrade(): def upgrade():
if CONFIG.UPGRADE_FLAG == 0:
mobile_app.revalidate_onesignal_ids()
CONFIG.UPGRADE_FLAG = 1
CONFIG.write()
return return

1
plexpy/config.py
View file

@ -185,6 +185,7 @@ _CONFIG_DEFINITIONS = {
'TV_WATCHED_PERCENT': (int, 'Monitoring', 85), 'TV_WATCHED_PERCENT': (int, 'Monitoring', 85),
'UPDATE_DB_INTERVAL': (int, 'General', 24), 'UPDATE_DB_INTERVAL': (int, 'General', 24),
'UPDATE_SHOW_CHANGELOG': (int, 'General', 1), 'UPDATE_SHOW_CHANGELOG': (int, 'General', 1),
'UPGRADE_FLAG': (int, 'Advanced', 0),
'VERBOSE_LOGS': (int, 'Advanced', 1), 'VERBOSE_LOGS': (int, 'Advanced', 1),
'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1),
'WEBSOCKET_MONITOR_PING_PONG': (int, 'Advanced', 0), 'WEBSOCKET_MONITOR_PING_PONG': (int, 'Advanced', 0),

11
plexpy/mobile_app.py
View file

@ -33,6 +33,7 @@ else:
_ONESIGNAL_APP_ID = '3b4b666a-d557-4b92-acdf-e2c8c4b95357' _ONESIGNAL_APP_ID = '3b4b666a-d557-4b92-acdf-e2c8c4b95357'
_ONESIGNAL_DISABLED = 'onesignal-disabled'
TEMP_DEVICE_TOKENS = {} TEMP_DEVICE_TOKENS = {}
@ -126,6 +127,9 @@ def get_mobile_device_config(mobile_device_id=None):
result = db.select_single('SELECT * FROM mobile_devices WHERE id = ?', result = db.select_single('SELECT * FROM mobile_devices WHERE id = ?',
args=[mobile_device_id]) args=[mobile_device_id])
if result['onesignal_id'] == _ONESIGNAL_DISABLED:
result['onesignal_id'] = ''
return result return result
@ -192,6 +196,8 @@ def set_last_seen(device_token=None):
def validate_onesignal_id(onesignal_id): def validate_onesignal_id(onesignal_id):
if onesignal_id is None: if onesignal_id is None:
return 0 return 0
elif onesignal_id == _ONESIGNAL_DISABLED:
return 2
headers = {'Content-Type': 'application/json'} headers = {'Content-Type': 'application/json'}
payload = {'app_id': _ONESIGNAL_APP_ID} payload = {'app_id': _ONESIGNAL_APP_ID}
@ -207,6 +213,11 @@ def validate_onesignal_id(onesignal_id):
return -1 return -1
def revalidate_onesignal_ids():
for device in get_mobile_devices():
set_official(device['device_id'], device['onesignal_id'])
def blacklist_logger(): def blacklist_logger():
devices = get_mobile_devices() devices = get_mobile_devices()
for d in devices: for d in devices: