From 612ea7354b8182b9d7db6e198d764c669e254e4e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 15 Jul 2022 03:13:03 +0200 Subject: [PATCH] show marsey author in deux --- files/routes/static.py | 2 +- files/templates/marseys.html | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 5fad9059c..8c4b155ba 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -19,7 +19,7 @@ def rdrama(id, title): @app.get("/marseys") @auth_required def marseys(v): - if SITE_NAME == 'rDrama': + if SITE in ('rdrama.net','devrama.xyz','deuxrama.net'): marseys = g.db.query(Marsey, User).join(User) sort = request.values.get("sort", "usage") if sort == "usage": marseys = marseys.order_by(Marsey.count.desc(), User.username) diff --git a/files/templates/marseys.html b/files/templates/marseys.html index bccd5242d..e5a7b890f 100644 --- a/files/templates/marseys.html +++ b/files/templates/marseys.html @@ -11,30 +11,21 @@ Name Marsey Usage - {% if SITE_NAME == 'rDrama' %}Author{% endif %} + {% if SITE in ('rdrama.net','devrama.xyz','deuxrama.net') %}Author{% endif %} -{% if SITE_NAME == 'rDrama' %} - {% for marsey, author in marseys %} - - {{loop.index}} - {{marsey.name}} - :#{{marsey.name}}: - {{marsey.count}} - {{author.username}} - - {% endfor %} -{% else %} - {% for marsey in marseys %} +{% for marsey, author in marseys %} {{loop.index}} {{marsey.name}} - :{{marsey.name}}: + :#{{marsey.name}}: {{marsey.count}} + {% if SITE in ('rdrama.net','devrama.xyz','deuxrama.net') %} + {{author.username}} + {% endif %} - {% endfor %} -{% endif %} +{% endfor %}