From 901c484f89cc4e6e91a389063b065c9f4c04ca89 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:15:02 -0700 Subject: [PATCH] Include deleted usernames in log filter --- plexpy/logger.py | 2 +- plexpy/users.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plexpy/logger.py b/plexpy/logger.py index 9f44df95..7227ab10 100644 --- a/plexpy/logger.py +++ b/plexpy/logger.py @@ -76,7 +76,7 @@ def filter_usernames(new_users=None): global _FILTER_USERNAMES if new_users is None: - new_users = [user['username'] for user in users.Users().get_users()] + new_users = [user['username'] for user in users.Users().get_users(include_deleted=True)] for username in new_users: if username.lower() not in ('local', 'guest') and len(username) > 3 and username not in _FILTER_USERNAMES: diff --git a/plexpy/users.py b/plexpy/users.py index 0e201791..974d30cd 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -679,15 +679,17 @@ class Users(object): return recently_watched - def get_users(self): + def get_users(self, include_deleted=False): monitor_db = database.MonitorDatabase() + where = '' if include_deleted else 'WHERE deleted_user = 0' + try: query = "SELECT id AS row_id, user_id, username, friendly_name, thumb, custom_avatar_url, email, " \ "is_active, is_admin, is_home_user, is_allow_sync, is_restricted, " \ "do_notify, keep_history, allow_guest, shared_libraries, " \ "filter_all, filter_movies, filter_tv, filter_music, filter_photos " \ - "FROM users WHERE deleted_user = 0" + "FROM users %s" % where result = monitor_db.select(query=query) except Exception as e: logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e)