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

Add last_seen to get_user response

Browse source
This commit is contained in:
JonnyWong16 2021-03-25 19:07:46 -07:00
parent d46d0900cb
commit b6f4c2e945
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

45
plexpy/users.py
View file

@ -375,7 +375,8 @@ class Users(object):
'keep_history': 1, 'keep_history': 1,
'allow_guest': 0, 'allow_guest': 0,
'deleted_user': 0, 'deleted_user': 0,
'shared_libraries': () 'shared_libraries': (),
'last_seen': None
} }
if user_id is None and not user and not email: if user_id is None and not user and not email:
@ -409,36 +410,29 @@ class Users(object):
try: try:
if str(user_id).isdigit(): if str(user_id).isdigit():
query = 'SELECT id AS row_id, user_id, username, friendly_name, ' \ where = 'users.user_id = ?'
'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ args = [user_id]
'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
'do_notify, keep_history, deleted_user, ' \
'allow_guest, shared_libraries ' \
'FROM users ' \
'WHERE user_id = ? '
result = monitor_db.select(query, args=[user_id])
elif user: elif user:
query = 'SELECT id AS row_id, user_id, username, friendly_name, ' \ where = 'users.username = ?'
'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ args = [user]
'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
'do_notify, keep_history, deleted_user, ' \
'allow_guest, shared_libraries ' \
'FROM users ' \
'WHERE username = ? COLLATE NOCASE '
result = monitor_db.select(query, args=[user])
elif email: elif email:
query = 'SELECT id AS row_id, user_id, username, friendly_name, ' \ where = 'users.email = ?'
args = [email]
else:
raise Exception('Missing user_id, username, or email')
query = 'SELECT users.id AS row_id, users.user_id, username, friendly_name, ' \
'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ 'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \ 'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
'do_notify, keep_history, deleted_user, ' \ 'do_notify, keep_history, deleted_user, ' \
'allow_guest, shared_libraries ' \ 'allow_guest, shared_libraries, ' \
'MAX(session_history.started) AS last_seen ' \
'FROM users ' \ 'FROM users ' \
'WHERE email = ? COLLATE NOCASE ' 'JOIN session_history ON users.user_id == session_history.user_id ' \
result = monitor_db.select(query, args=[email]) 'WHERE %s COLLATE NOCASE' % where
else: result = monitor_db.select(query, args=args)
result = []
except Exception as e: except Exception as e:
logger.warn("Tautulli Users :: Unable to execute database query for get_details: %s." % e) logger.warn("Tautulli Users :: Unable to execute database query for get_user_details: %s." % e)
result = [] result = []
user_details = {} user_details = {}
@ -475,7 +469,8 @@ class Users(object):
'keep_history': item['keep_history'], 'keep_history': item['keep_history'],
'deleted_user': item['deleted_user'], 'deleted_user': item['deleted_user'],
'allow_guest': item['allow_guest'], 'allow_guest': item['allow_guest'],
'shared_libraries': shared_libraries 'shared_libraries': shared_libraries,
'last_seen': item['last_seen']
} }
return user_details return user_details

1
plexpy/webserve.py
View file

@ -1610,6 +1610,7 @@ class WebInterface(object):
"is_home_user": 1, "is_home_user": 1,
"is_restricted": 0, "is_restricted": 0,
"keep_history": 1, "keep_history": 1,
"last_seen": 1462591869,
"row_id": 1, "row_id": 1,
"shared_libraries": ["10", "1", "4", "5", "15", "20", "2"], "shared_libraries": ["10", "1", "4", "5", "15", "20", "2"],
"user_id": 133788, "user_id": 133788,