From f1ceb5b07976170851c320f4e0618145aaa8f5e8 Mon Sep 17 00:00:00 2001 From: TLSM Date: Wed, 9 Nov 2022 04:15:19 -0500 Subject: [PATCH] Respect upper bound on award quantity. --- files/helpers/jinja2.py | 1 + files/templates/awards.html | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py index 8c06c066bc..2d132e8955 100644 --- a/files/helpers/jinja2.py +++ b/files/helpers/jinja2.py @@ -47,6 +47,7 @@ def inject_constants(): "KOFI_TOKEN":KOFI_TOKEN, "KOFI_LINK":KOFI_LINK, "approved_embed_hosts":approved_embed_hosts, "site_settings":app.config['SETTINGS'], "EMAIL":EMAIL, "calc_users":calc_users, + "max": max, "min": min, "TELEGRAM_LINK":TELEGRAM_LINK, "EMAIL_REGEX_PATTERN":EMAIL_REGEX_PATTERN, "CONTENT_SECURITY_POLICY_DEFAULT":CONTENT_SECURITY_POLICY_DEFAULT, "CONTENT_SECURITY_POLICY_HOME":CONTENT_SECURITY_POLICY_HOME, diff --git a/files/templates/awards.html b/files/templates/awards.html index 2f76362766..19ca2ec1f9 100644 --- a/files/templates/awards.html +++ b/files/templates/awards.html @@ -4,7 +4,7 @@ {% set wholesome = '/e/marseywholesome.webp' %} {% endif %} -{% for i in range(p.award_count("wholesome", v)) %} +{% for i in range(min(p.award_count("wholesome", v), 4)) %} {% if g.inferior_browser %}
:#marseywholesome: @@ -20,7 +20,7 @@ {% endif %} {% endfor %} -{% for i in range(p.award_count("train", v)) %} +{% for i in range(min(p.award_count("train", v), 4)) %} {% set train_dir = 'left' if (i % 2) == 0 else 'right' %} {% set train_mirror = ' mirrored' if (i % 2) == 0 else '' %} @@ -28,7 +28,7 @@ {% endfor %} -{% for i in range(p.award_count("scooter", v)) %} +{% for i in range(min(p.award_count("scooter", v), 4)) %} {% set scooter_dir = 'right' if (i % 2) == 0 else 'left' %} {% set scooter_mirror = '' if (i % 2) == 0 else ' mirrored' %} @@ -68,7 +68,7 @@ {% if p.award_count("firework", v) %} - {% for i in range(p.award_count("firework", v)) %} + {% for i in range(min(p.award_count("firework", v), 4)) %}
@@ -77,7 +77,7 @@ {% if p.award_count("ricardo", v) %} - {% for i in range(p.award_count("ricardo", v)) %} + {% for i in range(min(p.award_count("ricardo", v), 3)) %}