From eeb975b177f27d01b2b289a90a2fc008c2511b0c Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 29 Jun 2023 23:14:30 +0300 Subject: [PATCH] cachebust everything --- files/assets/browserconfig.xml | 2 +- files/assets/css/chud.css | 2 +- files/assets/css/main.css | 22 +++--- files/assets/events/fistmas/css/fistmas.css | 10 +-- files/assets/events/fistmas/css/lights.css | 2 +- files/assets/js/casino/roulette_screen.js | 4 +- files/assets/js/chat.js | 4 +- files/assets/js/fp.js | 2 +- files/assets/js/hats.js | 2 +- files/assets/js/lottery.js | 2 +- files/assets/js/settings_profile.js | 2 +- files/assets/manifest_WPD.json | 4 +- files/assets/manifest_rDrama.json | 4 +- files/assets/offline.html | 2 +- files/classes/post.py | 12 ++-- files/classes/sub.py | 4 +- files/classes/user.py | 6 +- files/helpers/alerts.py | 2 +- files/routes/jinja2.py | 2 +- files/templates/casino/game_screen.html | 4 +- files/templates/casino/roulette_screen.html | 4 +- files/templates/casino/slots_screen.html | 6 +- files/templates/comments.html | 4 +- files/templates/errors/WPD/404.html | 74 ++++++++++----------- files/templates/errors/WPD/502.html | 74 ++++++++++----------- files/templates/errors/rDrama/404.html | 72 ++++++++++---------- files/templates/errors/rDrama/502.html | 72 ++++++++++---------- files/templates/events/DKD/music.html | 2 +- files/templates/events/fistmas/awards.html | 2 +- files/templates/events/fistmas/music.html | 2 +- files/templates/hats.html | 4 +- files/templates/header.html | 4 +- files/templates/log.html | 2 +- files/templates/lottery.html | 4 +- files/templates/notifications.html | 2 +- files/templates/sidebar_WPD.html | 2 +- files/templates/user_in_table.html | 2 +- files/templates/user_listing.html | 2 +- files/templates/userpage/banner.html | 12 ++-- files/templates/util/html_head.html | 14 ++-- files/templates/util/macros.html | 6 +- 41 files changed, 230 insertions(+), 230 deletions(-) diff --git a/files/assets/browserconfig.xml b/files/assets/browserconfig.xml index 5b9464e21..d01d16d50 100644 --- a/files/assets/browserconfig.xml +++ b/files/assets/browserconfig.xml @@ -2,7 +2,7 @@ - + #FF459A diff --git a/files/assets/css/chud.css b/files/assets/css/chud.css index 3d4535848..393140ad2 100644 --- a/files/assets/css/chud.css +++ b/files/assets/css/chud.css @@ -1,3 +1,3 @@ html { - cursor:url('/i/dildo.webp?x=2'), auto; + cursor:url('/i/dildo.webp?x=6'), auto; } diff --git a/files/assets/css/main.css b/files/assets/css/main.css index c030b5acf..358e3444a 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5633,7 +5633,7 @@ lite-youtube > .lty-playbtn { left: 50%; z-index: 1; background-color: transparent; - background-image: url('/i/youtube.webp?x=2'); + background-image: url('/i/youtube.webp?x=6'); transition: filter .1s cubic-bezier(0, 0, 0.2, 1); border: none; } @@ -7319,29 +7319,29 @@ button, .btn { } .chud-0:after { - background: url("/i/chud/0.webp?x=2"); + background: url("/i/chud/0.webp?x=6"); } .chud-1:after { - background: url("/i/chud/1.webp?x=2"); + background: url("/i/chud/1.webp?x=6"); } .chud-2:after { - background: url("/i/chud/2.webp?x=2"); + background: url("/i/chud/2.webp?x=6"); } .chud-3:after { - background: url("/i/chud/3.webp?x=2"); + background: url("/i/chud/3.webp?x=6"); } .chud-4:after { - background: url("/i/chud/4.webp?x=2"); + background: url("/i/chud/4.webp?x=6"); } .chud-5:after { - background: url("/i/chud/5.webp?x=2"); + background: url("/i/chud/5.webp?x=6"); height: 100px; } .chud-6:after { - background: url("/i/chud/6.webp?x=2"); + background: url("/i/chud/6.webp?x=6"); } .chud-7:after, .chud-8:after, .chud-9:after { - background: url("/i/chud/7.webp?x=2"); + background: url("/i/chud/7.webp?x=6"); } @@ -7361,7 +7361,7 @@ button, .btn { width: 32px; height: 32px; position: fixed; - background-image: url('/i/cursormarsey.webp?x=2'); + background-image: url('/i/cursormarsey.webp?x=6'); image-rendering: pixelated; background-position: -64px -32px; } @@ -7371,7 +7371,7 @@ button, .btn { height: 24px; position: fixed; pointer-events: none; - background-image: url('/i/cursormarsey-heart.webp?x=2'); + background-image: url('/i/cursormarsey-heart.webp?x=6'); background-size: cover; left: 24px; top: 0px; diff --git a/files/assets/events/fistmas/css/fistmas.css b/files/assets/events/fistmas/css/fistmas.css index 48dc0df2b..cd8410a36 100644 --- a/files/assets/events/fistmas/css/fistmas.css +++ b/files/assets/events/fistmas/css/fistmas.css @@ -136,15 +136,15 @@ color: #7a7a7a !important; } body { - cursor: url(/assets/events/fistmas/images/cursor.webp?x=2), auto !important; + cursor: url(/assets/events/fistmas/images/cursor.webp?x=6), auto !important; } textarea, input[type=textbox], input[type=search] { - cursor: url(/assets/events/fistmas/images/text.webp?x=2) 9 14, auto !important; + cursor: url(/assets/events/fistmas/images/text.webp?x=6) 9 14, auto !important; } .btn, input[type=button], button, a { - cursor: url(/assets/events/fistmas/images/pointer.webp?x=2), auto !important; + cursor: url(/assets/events/fistmas/images/pointer.webp?x=6), auto !important; } .fa-moon-over-sun:before{content:"\f74a"} @@ -170,7 +170,7 @@ textarea, input[type=textbox], input[type=search] { left: 0; height: 57px; width: 100%; - background: url('/assets/events/fistmas/images/lights.webp?x=2'); + background: url('/assets/events/fistmas/images/lights.webp?x=6'); animation: lights 1s infinite steps(2); pointer-events: none; } @@ -195,7 +195,7 @@ textarea, input[type=textbox], input[type=search] { .btn::after, .snow-cap::after { content: ''; pointer-events: none; - background: url("/assets/events/fistmas/images/snowcap.webp?x=2") repeat-x; + background: url("/assets/events/fistmas/images/snowcap.webp?x=6") repeat-x; background-size: contain; position: absolute; bottom: -18px; diff --git a/files/assets/events/fistmas/css/lights.css b/files/assets/events/fistmas/css/lights.css index 04fb6d1c2..55d642abf 100644 --- a/files/assets/events/fistmas/css/lights.css +++ b/files/assets/events/fistmas/css/lights.css @@ -5,7 +5,7 @@ left: 0; height: 57px; width: 100%; - background: url('/assets/events/fistmas/images/lights.webp?x=2'); + background: url('/assets/events/fistmas/images/lights.webp?x=6'); animation: lights 1s infinite steps(2); pointer-events: none; z-index: 1; diff --git a/files/assets/js/casino/roulette_screen.js b/files/assets/js/casino/roulette_screen.js index 0b68d4da5..48d51823e 100644 --- a/files/assets/js/casino/roulette_screen.js +++ b/files/assets/js/casino/roulette_screen.js @@ -221,7 +221,7 @@ function buildRouletteBets(bets) { const normalizedBets = formatNormalizedBets(bets); const coinImgHtml = ` coin { script.onload = resolve; script.onerror = reject; script.async = true; - script.src = "/assets/js/vendor/fp.js?x=2"; + script.src = "/assets/js/vendor/fp.js?x=6"; document.head.appendChild(script); }) .then(() => FingerprintJS.load({token: fp_token})); diff --git a/files/assets/js/hats.js b/files/assets/js/hats.js index 18aeaf1d6..2ca399d4c 100644 --- a/files/assets/js/hats.js +++ b/files/assets/js/hats.js @@ -2,7 +2,7 @@ function equip_hat(t, hat_id, hat_name) { const profile_pic_hat = document.getElementById("profile-pic-35-hat"); function extra_actions(xhr) { if(xhr.status == 200) { - profile_pic_hat.src = `/i/hats/${hat_name}.webp?x=2` + profile_pic_hat.src = `/i/hats/${hat_name}.webp?x=6` profile_pic_hat.classList.remove('d-none') } } diff --git a/files/assets/js/lottery.js b/files/assets/js/lottery.js index 9ca91ce99..490a5ca55 100644 --- a/files/assets/js/lottery.js +++ b/files/assets/js/lottery.js @@ -12,7 +12,7 @@ const lotteryOnReady = function () { setTimeout(() => { ticketPulled.style.display = "none"; ticketPulled.src = - "/i/rDrama/lottery_active.webp?x=2&t=" + + "/i/rDrama/lottery_active.webp?x=6&t=" + new Date().getTime(); purchaseTicket.disabled = false; }, 1780); diff --git a/files/assets/js/settings_profile.js b/files/assets/js/settings_profile.js index a2caf83ae..52352ca65 100644 --- a/files/assets/js/settings_profile.js +++ b/files/assets/js/settings_profile.js @@ -89,7 +89,7 @@ function updatebgselection(){ let bgsDir = backgrounds[bgselector.selectedIndex].folder; for (i=0; i < bgsToDisplay.length; i++) { let onclickPost = bgsDir + "/" + bgsToDisplay[i]; - str += ``; + str += ``; } bgContainer.innerHTML = str; diff --git a/files/assets/manifest_WPD.json b/files/assets/manifest_WPD.json index 66964acb1..56f3e3466 100644 --- a/files/assets/manifest_WPD.json +++ b/files/assets/manifest_WPD.json @@ -8,13 +8,13 @@ "description": "WPD", "icons": [ { - "src": "/i/WPD/192.png?x=2", + "src": "/i/WPD/192.png?x=6", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/i/WPD/512.png?x=2", + "src": "/i/WPD/512.png?x=6", "sizes": "512x512", "type": "image/png" } diff --git a/files/assets/manifest_rDrama.json b/files/assets/manifest_rDrama.json index ffcdfb2c5..d054cda82 100644 --- a/files/assets/manifest_rDrama.json +++ b/files/assets/manifest_rDrama.json @@ -8,13 +8,13 @@ "description": "rDrama", "icons": [ { - "src": "/i/rDrama/192.png?x=2", + "src": "/i/rDrama/192.png?x=6", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/i/rDrama/512.png?x=2", + "src": "/i/rDrama/512.png?x=6", "sizes": "512x512", "type": "image/png" } diff --git a/files/assets/offline.html b/files/assets/offline.html index 8b6574165..084402673 100644 --- a/files/assets/offline.html +++ b/files/assets/offline.html @@ -1,7 +1,7 @@ No Internet Connection - +
diff --git a/files/classes/post.py b/files/classes/post.py index 6d3f167ee..b9b1828dd 100644 --- a/files/classes/post.py +++ b/files/classes/post.py @@ -162,20 +162,20 @@ class Post(Base): @lazy def thumb_url(self): if self.over_18: - return f"{SITE_FULL_IMAGES}/i/nsfw.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/nsfw.webp?x=6" elif not self.url: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?x=6" elif self.thumburl: if self.thumburl.startswith('/'): return SITE_FULL + self.thumburl return self.thumburl elif self.is_youtube or self.is_video: - return f"{SITE_FULL_IMAGES}/i/default_thumb_video.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/default_thumb_video.webp?x=6" elif self.is_audio: - return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?x=6" elif self.domain == SITE: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=6" else: - return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?x=6" @property @lazy diff --git a/files/classes/sub.py b/files/classes/sub.py index cacd433c3..91457d2f0 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -41,7 +41,7 @@ class Sub(Base): @lazy def sidebar_url(self): if self.sidebarurl: return self.sidebarurl - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/sidebar.webp?x=2' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/sidebar.webp?x=6' @property @lazy @@ -62,7 +62,7 @@ class Sub(Base): @lazy def marsey_url(self): if self.marseyurl: return self.marseyurl - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=2' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=6' @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index eaf3d9918..8f79af3af 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -568,7 +568,7 @@ class User(Base): def bio_html_eager(self): if self.bio_html == None: return '' return self.bio_html.replace('data-src', 'src') \ - .replace('src="/i/loading.webp?x=2"', '') \ + .replace('src="/i/loading.webp?x=6"', '') \ .replace('src="/i/loading.webp"', '') \ .replace('src="/i/l.webp"', '') @@ -840,7 +840,7 @@ class User(Base): def banner_url(self): if FEATURES['USERS_PROFILE_BANNER'] and self.bannerurl and self.can_see_my_shit: return self.bannerurl - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=6" @property @lazy @@ -856,7 +856,7 @@ class User(Base): if self.profileurl and self.can_see_my_shit: if self.profileurl.startswith('/'): return SITE_FULL + self.profileurl return self.profileurl - return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?x=2" + return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?x=6" @lazy def real_post_count(self, v): diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 9383c2cbc..c28626eff 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -223,7 +223,7 @@ def _push_notif_thread(subscriptions, title, body, url): "title": title, "body": body, 'url': url, - 'icon': f'{SITE_FULL}/icon.webp?x=2', + 'icon': f'{SITE_FULL}/icon.webp?x=6', }), vapid_private_key=VAPID_PRIVATE_KEY, vapid_claims={"sub": f"mailto:{EMAIL}"} diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 6a77a80e5..de88d384f 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -48,7 +48,7 @@ def template_change_page(new_page, url): @app.template_filter("asset_siteimg") def template_asset_siteimg(asset_path): # TODO: Add hashing for these using files.helpers.assetcache - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=3' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=6' @app.template_filter("timestamp") def timestamp(timestamp): diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index 099d0415a..58264ba7a 100644 --- a/files/templates/casino/game_screen.html +++ b/files/templates/casino/game_screen.html @@ -43,7 +43,7 @@ {{v.coins}} @@ -53,7 +53,7 @@ {{v.marseybux}} diff --git a/files/templates/casino/roulette_screen.html b/files/templates/casino/roulette_screen.html index abcede86c..88db50189 100644 --- a/files/templates/casino/roulette_screen.html +++ b/files/templates/casino/roulette_screen.html @@ -26,10 +26,10 @@ Bets

diff --git a/files/templates/casino/slots_screen.html b/files/templates/casino/slots_screen.html index 4a8e8ce37..bb5dd6126 100644 --- a/files/templates/casino/slots_screen.html +++ b/files/templates/casino/slots_screen.html @@ -9,13 +9,13 @@
- coin + coin
- coin + coin
- coin + coin
{% endblock %} diff --git a/files/templates/comments.html b/files/templates/comments.html index 9e367616a..a64b76810 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -163,7 +163,7 @@ {% endif %} {% if FEATURES['HOUSES'] and c.author.house %} - House {{c.author.house}} + House {{c.author.house}} {% endif %} {% if c.author.verified %} @@ -173,7 +173,7 @@
@{{c.author.username}}'s profile picture {% if c.author.hat_active(v)[0] -%} - @{{c.author.username}}'s hat + @{{c.author.username}}'s hat {%- endif %}
{{c.author_name}} diff --git a/files/templates/errors/WPD/404.html b/files/templates/errors/WPD/404.html index 2fb0f138e..bb258b677 100644 --- a/files/templates/errors/WPD/404.html +++ b/files/templates/errors/WPD/404.html @@ -3,15 +3,15 @@ - - + + - + - + Not Found - WPD @@ -20,57 +20,57 @@ - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - site banner + + site banner