Clear user friendly name if equal to username

This commit is contained in:
JonnyWong16 2022-06-09 12:43:52 -07:00
parent 98433a7c54
commit 285fa3a0f5
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 12 additions and 0 deletions

View file

@ -1920,6 +1920,14 @@ def dbcheck():
'ALTER TABLE users ADD COLUMN title TEXT' 'ALTER TABLE users ADD COLUMN title TEXT'
) )
try:
result = c_db.execute('SELECT * FROM users WHERE friendly_name = username').fetchall()
if result:
logger.debug("Altering database. Resetting user friendly names equal to username.")
c_db.execute('UPDATE users SET friendly_name = NULL WHERE friendly_name = username')
except sqlite3.OperationalError:
pass
# Upgrade notify_log table from earlier versions # Upgrade notify_log table from earlier versions
try: try:
c_db.execute('SELECT poster_url FROM notify_log') c_db.execute('SELECT poster_url FROM notify_log')

View file

@ -361,6 +361,10 @@ class Users(object):
if str(user_id).isdigit(): if str(user_id).isdigit():
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
user = monitor_db.select_single('SELECT username FROM users WHERE user_id = ?', [user_id])
if user.get('username') == friendly_name:
friendly_name = None
key_dict = {'user_id': user_id} key_dict = {'user_id': user_id}
value_dict = {'friendly_name': friendly_name, value_dict = {'friendly_name': friendly_name,
'custom_avatar_url': custom_thumb, 'custom_avatar_url': custom_thumb,