diff --git a/files/assets/images/badges/262.webp b/files/assets/images/badges/262.webp index 32a26c395..12f209ddf 100644 Binary files a/files/assets/images/badges/262.webp and b/files/assets/images/badges/262.webp differ diff --git a/files/assets/images/badges/263.webp b/files/assets/images/badges/263.webp index 126cfa62d..9705d0805 100644 Binary files a/files/assets/images/badges/263.webp and b/files/assets/images/badges/263.webp differ diff --git a/files/assets/images/badges/264.webp b/files/assets/images/badges/264.webp index c2a2be2d8..8fbaa9211 100644 Binary files a/files/assets/images/badges/264.webp and b/files/assets/images/badges/264.webp differ diff --git a/files/assets/images/badges/265.webp b/files/assets/images/badges/265.webp index fd4485efc..fb9ccf028 100644 Binary files a/files/assets/images/badges/265.webp and b/files/assets/images/badges/265.webp differ diff --git a/files/assets/images/badges/266.webp b/files/assets/images/badges/266.webp index ac67d8aa5..c8568fb89 100644 Binary files a/files/assets/images/badges/266.webp and b/files/assets/images/badges/266.webp differ diff --git a/files/assets/images/badges/267.webp b/files/assets/images/badges/267.webp index ff992ee70..cf41cfd50 100644 Binary files a/files/assets/images/badges/267.webp and b/files/assets/images/badges/267.webp differ diff --git a/files/assets/images/badges/268.webp b/files/assets/images/badges/268.webp index 03fea45b6..5a89bfda4 100644 Binary files a/files/assets/images/badges/268.webp and b/files/assets/images/badges/268.webp differ diff --git a/files/assets/images/badges/269.webp b/files/assets/images/badges/269.webp index 52b48798e..070e37300 100644 Binary files a/files/assets/images/badges/269.webp and b/files/assets/images/badges/269.webp differ diff --git a/files/assets/images/badges/270.webp b/files/assets/images/badges/270.webp index 379ca1314..63c65610f 100644 Binary files a/files/assets/images/badges/270.webp and b/files/assets/images/badges/270.webp differ diff --git a/files/assets/images/badges/271.webp b/files/assets/images/badges/271.webp index c343346f1..a9ac4caf2 100644 Binary files a/files/assets/images/badges/271.webp and b/files/assets/images/badges/271.webp differ diff --git a/files/assets/images/badges/272.webp b/files/assets/images/badges/272.webp index 8c7ddae36..bac94802f 100644 Binary files a/files/assets/images/badges/272.webp and b/files/assets/images/badges/272.webp differ diff --git a/files/assets/images/badges/273.webp b/files/assets/images/badges/273.webp index 3aa356071..565064e5b 100644 Binary files a/files/assets/images/badges/273.webp and b/files/assets/images/badges/273.webp differ diff --git a/files/assets/images/badges/274.webp b/files/assets/images/badges/274.webp index 89066126b..59bdae961 100644 Binary files a/files/assets/images/badges/274.webp and b/files/assets/images/badges/274.webp differ diff --git a/files/assets/images/badges/275.webp b/files/assets/images/badges/275.webp index 938408286..ee5487ac6 100644 Binary files a/files/assets/images/badges/275.webp and b/files/assets/images/badges/275.webp differ diff --git a/files/assets/images/badges/276.webp b/files/assets/images/badges/276.webp index c8940e362..30736691b 100644 Binary files a/files/assets/images/badges/276.webp and b/files/assets/images/badges/276.webp differ diff --git a/files/assets/images/badges/277.webp b/files/assets/images/badges/277.webp index cf3629920..5a327b7db 100644 Binary files a/files/assets/images/badges/277.webp and b/files/assets/images/badges/277.webp differ diff --git a/files/assets/images/badges/278.webp b/files/assets/images/badges/278.webp index e9ca9fdf1..3e09926cd 100644 Binary files a/files/assets/images/badges/278.webp and b/files/assets/images/badges/278.webp differ diff --git a/files/assets/images/badges/279.webp b/files/assets/images/badges/279.webp index 305b40439..292a324eb 100644 Binary files a/files/assets/images/badges/279.webp and b/files/assets/images/badges/279.webp differ diff --git a/files/assets/images/badges/280.webp b/files/assets/images/badges/280.webp index 2fd913a51..a30e99b79 100644 Binary files a/files/assets/images/badges/280.webp and b/files/assets/images/badges/280.webp differ diff --git a/files/assets/js/comments+submission_listing.js b/files/assets/js/comments+submission_listing.js index 1f148eebd..85d3810a1 100644 --- a/files/assets/js/comments+submission_listing.js +++ b/files/assets/js/comments+submission_listing.js @@ -27,7 +27,7 @@ document.addEventListener('shown.bs.popover', (e) => { badgesDOM.innerHTML = ""; for (const badge of author["badges"]) { const badgeDOM = popClickBadgeTemplateDOM.cloneNode(); - badgeDOM.src = badge + "?b=8"; + badgeDOM.src = badge + "?b=9"; badgesDOM.append(badgeDOM); } diff --git a/files/classes/badges.py b/files/classes/badges.py index 8bfe7639b..103cd9561 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -27,9 +27,9 @@ class BadgeDef(Base): @lazy def path(self): if self.id == 7 or 20 < self.id < 29 or self.id == 222: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/badges/{self.id}.webp?b=8" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/badges/{self.id}.webp?b=9" - return f"{SITE_FULL_IMAGES}/i/badges/{self.id}.webp?b=8" + return f"{SITE_FULL_IMAGES}/i/badges/{self.id}.webp?b=9" class Badge(Base): diff --git a/files/routes/comments.py b/files/routes/comments.py index cbaca5cf8..f5197cdda 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -212,7 +212,7 @@ def comment(v:User): g.db.flush() filename = f'files/assets/images/badges/{badge.id}.webp' copyfile(oldname, filename) - process_image(filename, v, resize=300) + process_image(filename, v, resize=300, trim=True) purge_files_in_cache(f"https://{SITE}/assets/images/badges/{badge.id}.webp") except Exception as e: abort(400, str(e)) diff --git a/files/templates/admin/patrons.html b/files/templates/admin/patrons.html index 25c99b1a1..1e076f058 100644 --- a/files/templates/admin/patrons.html +++ b/files/templates/admin/patrons.html @@ -17,7 +17,7 @@ {% include "user_in_table.html" %} {% if user.patron > 1 %} - 2{{user.patron}} + 2{{user.patron}} {% endif %} ${{user.lifetime_donated}} diff --git a/files/templates/comments.html b/files/templates/comments.html index 0c51eb434..02d4d2706 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -159,7 +159,7 @@ 👻 {% else %} {% if FEATURES['PATRON_ICONS'] and c.author.patron > 1 %} - {{c.author.patron_tooltip}} + {{c.author.patron_tooltip}} {% endif %} {% if FEATURES['HOUSES'] and c.author.house %} diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html index 8e7e7f03b..043fe02b0 100644 --- a/files/templates/userpage/banner.html +++ b/files/templates/userpage/banner.html @@ -32,7 +32,7 @@ {% endif %} {% if FEATURES['PATRON_ICONS'] and u.patron > 1 %} - {{u.patron_tooltip}} + {{u.patron_tooltip}} {% endif %} {% if FEATURES['HOUSES'] and u.house %} @@ -300,7 +300,7 @@ {% endif %} {% if FEATURES['PATRON_ICONS'] and u.patron > 1 %} - {{u.patron_tooltip}} + {{u.patron_tooltip}} {% endif %} {% if FEATURES['HOUSES'] and u.house %} diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index 86e829fef..bb5f8a03f 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -60,7 +60,7 @@ 👻 {% else %} {% if FEATURES['PATRON_ICONS'] and p.author.patron > 1 %} - {{p.author.patron_tooltip}} + {{p.author.patron_tooltip}} {% endif %} {% if FEATURES['HOUSES'] and p.author.house %}