Merge pull request #95 from x10102/master

v1.1.2 - Minor bugfixes

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/auth.py

@@ -36,7 +36,7 @@ def login():
         session['PRE_LOGIN_UID'] = user.id
         return redirect(url_for('UserAuth.pw_change'))
     login_user(user)
-    referrer = session['login_next']
+    referrer = session.get('login_next', None)
 
     del session['login_next']
     return redirect(referrer or url_for('index'))

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
@@ -66,6 +66,7 @@ def raise_error():
     abort(HTTPStatus.INTERNAL_SERVER_ERROR)
 
 @DebugTools.route('/debug/export_pubkey')
+@login_required
 def export_pubkey():
     info(f"Public key exported by user {current_user.nickname}")
     return send_from_directory(os.path.join(os.getcwd(), 'data', 'crypto'), 'scuttle.pub.asc', as_attachment=True)

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'))

constants.py

@@ -1,2 +1,2 @@
-APP_VERSION = "1.1.1"
+APP_VERSION = "1.1.2"
 BRANCH_ID = "CS"

templates/embeds/writer/default.j2

@@ -6,7 +6,7 @@
     <img class="block h-full bg-black border border-white border-solid rounded-l-lg" src="{{ url_for('UserContent.get_avatar', uid=(user.discord or 0), s='full')}}">
     <div class="flex flex-col flex-1 h-full pl-4 text-white bg-black rounded-r-lg">
         <h1 class="m-0 mt-1 text-xl font-bold text-white">{{user.wikidot}}</h1>
-        <p class="m-0 text-sm"><b>{{stats.originals}}</b> Článků</p>
+        <p class="m-0 text-sm"><b>{{stats.original_count}}</b> Článků</p>
         <p class="m-0 text-sm">Nejnovější článek: <b><a href="{{last.link}}" class="text-white transition-opacity hover:opacity-75" target="_top">{{last.name}}</b></a></p>
     </div>
     <div class="absolute top-0 right-0 block p-2 font-semibold text-white rounded-tr-lg rounded-bl-lg bg-gradient-to-r from-teal-200 to-teal-500">Spisovatel</div>

templates/embeds/writer/zozi.j2

@@ -6,7 +6,7 @@
     <img class="block h-full bg-black border border-white border-solid rounded-l-lg" src="{{ url_for('UserContent.get_avatar', uid=(user.discord or 0), s='full')}}">
     <div class="flex flex-col flex-1 h-full pl-4 bg-center text-white bg-pink-900 bg-[url('../../static/catto.png')] rounded-r-lg">
         <h1 class="m-0 mt-1 text-xl font-bold text-white">{{user.wikidot}}</h1>
-        <p class="m-0 text-sm"><b>{{stats.originals}}</b> Článků</p>
+        <p class="m-0 text-sm"><b>{{stats.original_count}}</b> Článků</p>
         <p class="m-0 text-sm">Nejnovější článek: <b><a href="{{last.link}}" class="text-white transition-opacity hover:opacity-75" target="_top">{{last.name}}</b></a></p>
     </div>
     <div class="absolute top-0 right-0 block p-2 font-semibold text-white rounded-tr-lg rounded-bl-lg bg-gradient-to-r from-teal-200 to-teal-500">Spisovatel</div>