Fix bug causing exceptions when logging user ID

Author: x10102

blueprints/articles.py

@@ -32,7 +32,7 @@ def notify_rolemaster(uid, point_amount):
 def delete_article(aid: int):
     article = Article.get_or_none(Article.id == aid) or abort(HTTPStatus.NOT_FOUND)
     article.delete_instance()
-    info(f"Article {article.name} deleted by {current_user.nickname} (ID: {current_user.uid})")
+    info(f"Article {article.name} deleted by {current_user.nickname} (ID: {current_user.get_id()})")
     flash(f'Článek {article.name} smazán')
     return "OK"
 

blueprints/autobackup.py

@@ -200,7 +200,7 @@ def backup_index():
 @login_required
 def backup_delete(backup_id: int):
     # TODO: 2FA
-    info(f"Backup ID {backup_id} deleted by user {current_user.nickname} (ID: {current_user.id})")
+    info(f"Backup ID {backup_id} deleted by user {current_user.nickname} (ID: {current_user.get_id()})")
     Backup.delete_by_id(backup_id)
     # TODO: Delete the actual archive
     # (Maybe schedule a task to purge deleted backups after some time to allow time for restore?)

blueprints/debug.py

@@ -13,7 +13,7 @@
 @DebugTools.before_request
 def log_debug_access():
     if not current_app.config['DEBUG'] and not current_user.is_anonymous:
-        warning(f'Debug endpoint {request.full_path} accessed by {current_user.nickname} (ID: {current_user.id})')
+        warning(f'Debug endpoint {request.full_path} accessed by {current_user.nickname} (ID: {current_user.get_id()})')
 
 @DebugTools.route('/debug/nickupdate')
 @login_required

blueprints/rsspage.py

@@ -24,7 +24,7 @@ def ignore_update():
     if not title:
         warning(f'Removing non-existent RSS Update with UUID {uuid}')
     else:
-        info(f'RSS Update {uuid} ({title}) ignored by {current_user.nickname} (ID: {current_user.uid})')
+        info(f'RSS Update {uuid} ({title}) ignored by {current_user.nickname} (ID: {current_user.get_id()})')
     return redirect(url_for('RssPageController.rss_changes'))
 
 @RssPageController.route('/changes/forceupdate')

blueprints/users.py

@@ -87,7 +87,7 @@ def delete_user(uid: int):
     user = User.get_or_none(User.id == uid) or abort(HTTPStatus.NOT_FOUND)
     name = user.nickname
     user.delete_instance()
-    info(f"User {name} deleted by {current_user.nickname} (ID: {current_user.uid})")
+    info(f"User {name} deleted by {current_user.nickname} (ID: {current_user.get_id()})")
     flash(f'Uživatel {name} smazán')
 
     return redirect(url_for('index'))