diff --git a/files/assets/browserconfig.xml b/files/assets/browserconfig.xml index d01d16d50..bca2f3578 100644 --- a/files/assets/browserconfig.xml +++ b/files/assets/browserconfig.xml @@ -2,7 +2,7 @@ - + #FF459A diff --git a/files/assets/css/awards.css b/files/assets/css/awards.css index a8b9abd79..c44bbfd96 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -268,34 +268,34 @@ } .sharpen-0:after { - background: url("/i/sharpen/0.webp?x=6"); + background: url("/i/sharpen/0.webp?x=7"); } .sharpen-1:after { - background: url("/i/sharpen/1.webp?x=6"); + background: url("/i/sharpen/1.webp?x=7"); } .sharpen-2:after { - background: url("/i/sharpen/2.webp?x=6"); + background: url("/i/sharpen/2.webp?x=7"); } .sharpen-3:after { - background: url("/i/sharpen/3.webp?x=6"); + background: url("/i/sharpen/3.webp?x=7"); } .sharpen-4:after { - background: url("/i/sharpen/4.webp?x=6"); + background: url("/i/sharpen/4.webp?x=7"); } .sharpen-5:after { - background: url("/i/sharpen/5.webp?x=6"); + background: url("/i/sharpen/5.webp?x=7"); } .sharpen-6:after { - background: url("/i/sharpen/6.webp?x=6"); + background: url("/i/sharpen/6.webp?x=7"); } .sharpen-7:after { - background: url("/i/sharpen/7.webp?x=6"); + background: url("/i/sharpen/7.webp?x=7"); } .sharpen-8:after { - background: url("/i/sharpen/8.webp?x=6"); + background: url("/i/sharpen/8.webp?x=7"); } .sharpen-9:after { - background: url("/i/sharpen/9.webp?x=6"); + background: url("/i/sharpen/9.webp?x=7"); } .rainbow-text:not(a) > p, .gold-text:not(a) > p { diff --git a/files/assets/css/chud.css b/files/assets/css/chud.css index a51d9d486..b01b94fac 100644 --- a/files/assets/css/chud.css +++ b/files/assets/css/chud.css @@ -1,3 +1,3 @@ html { - cursor: url('/i/dildo.webp?x=6'), auto; + cursor: url('/i/dildo.webp?x=7'), auto; } diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 88ffce419..92ff1518e 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5614,7 +5614,7 @@ lite-youtube > .lty-playbtn { left: 50%; z-index: 1; background-color: transparent; - background-image: url('/i/youtube.webp?x=6'); + background-image: url('/i/youtube.webp?x=7'); border: none; } @@ -7266,29 +7266,29 @@ button, .btn { } .chud-0:after { - background: url("/i/chud/0.webp?x=6"); + background: url("/i/chud/0.webp?x=7"); } .chud-1:after { - background: url("/i/chud/1.webp?x=6"); + background: url("/i/chud/1.webp?x=7"); } .chud-2:after { - background: url("/i/chud/2.webp?x=6"); + background: url("/i/chud/2.webp?x=7"); } .chud-3:after { - background: url("/i/chud/3.webp?x=6"); + background: url("/i/chud/3.webp?x=7"); } .chud-4:after { - background: url("/i/chud/4.webp?x=6"); + background: url("/i/chud/4.webp?x=7"); } .chud-5:after { - background: url("/i/chud/5.webp?x=6"); + background: url("/i/chud/5.webp?x=7"); height: 100px; } .chud-6:after { - background: url("/i/chud/6.webp?x=6"); + background: url("/i/chud/6.webp?x=7"); } .chud-7:after, .chud-8:after, .chud-9:after { - background: url("/i/chud/7.webp?x=6"); + background: url("/i/chud/7.webp?x=7"); } @@ -7308,7 +7308,7 @@ button, .btn { width: 32px; height: 32px; position: fixed; - background-image: url('/i/cursormarsey.webp?x=6'); + background-image: url('/i/cursormarsey.webp?x=7'); image-rendering: pixelated; background-position: -64px -32px; } @@ -7318,7 +7318,7 @@ button, .btn { height: 24px; position: fixed; pointer-events: none; - background-image: url('/i/cursormarsey-heart.webp?x=6'); + background-image: url('/i/cursormarsey-heart.webp?x=7'); background-size: cover; left: 24px; top: 0px; diff --git a/files/assets/events/fistmas/css/lights.css b/files/assets/events/fistmas/css/lights.css index 55d642abf..c975a8163 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=6'); + background: url('/assets/events/fistmas/images/lights.webp?x=7'); animation: lights 1s infinite steps(2); pointer-events: none; z-index: 1; diff --git a/files/assets/events/fistmas/css/main_fistmas.css b/files/assets/events/fistmas/css/main_fistmas.css index 3511c5a43..4e3e42fdd 100644 --- a/files/assets/events/fistmas/css/main_fistmas.css +++ b/files/assets/events/fistmas/css/main_fistmas.css @@ -127,15 +127,15 @@ pre { } body { - cursor: url(/assets/events/fistmas/images/cursor.webp?x=6), auto !important; + cursor: url(/assets/events/fistmas/images/cursor.webp?x=7), auto !important; } textarea, input[type=textbox], input[type=search] { - cursor: url(/assets/events/fistmas/images/text.webp?x=6) 9 14, auto !important; + cursor: url(/assets/events/fistmas/images/text.webp?x=7) 9 14, auto !important; } .btn, input[type=button], button, a { - cursor: url(/assets/events/fistmas/images/pointer.webp?x=6), auto !important; + cursor: url(/assets/events/fistmas/images/pointer.webp?x=7), auto !important; } .fa-moon-over-sun:before{content:"\f74a"} @@ -161,7 +161,7 @@ textarea, input[type=textbox], input[type=search] { left: 0; height: 57px; width: 100%; - background: url('/assets/events/fistmas/images/lights.webp?x=6'); + background: url('/assets/events/fistmas/images/lights.webp?x=7'); animation: lights 1s infinite steps(2); pointer-events: none; } @@ -186,7 +186,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=6") repeat-x; + background: url("/assets/events/fistmas/images/snowcap.webp?x=7") repeat-x; background-size: contain; position: absolute; bottom: -18px; @@ -410,7 +410,7 @@ blockquote { } #cursormarsey { - background-image: url('/assets/events/fistmas/images/cursormarsey.webp?x=6') !important; + background-image: url('/assets/events/fistmas/images/cursormarsey.webp?x=7') !important; } @media (min-width: 768px) { diff --git a/files/assets/events/homoween/css/main_homoween.css b/files/assets/events/homoween/css/main_homoween.css index 56dfb4a68..b1d26429f 100644 --- a/files/assets/events/homoween/css/main_homoween.css +++ b/files/assets/events/homoween/css/main_homoween.css @@ -720,7 +720,7 @@ body::after { } #cursormarsey { - background-image: url('/assets/events/homoween/images/cursormarsey.webp?x=6') !important; + background-image: url('/assets/events/homoween/images/cursormarsey.webp?x=7') !important; } .post-flair { diff --git a/files/assets/js/casino/roulette_screen.js b/files/assets/js/casino/roulette_screen.js index 3f43eef3e..6bf40e70b 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 { ticketPulled.style.display = "none"; ticketPulled.src = - "/i/rDrama/lottery_active.webp?x=6&t=" + + "/i/rDrama/lottery_active.webp?x=7&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 90b6295f7..9964fe659 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 0b55bff90..61912222c 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=6", + "src": "/i/WPD/192.png?x=7", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/i/WPD/512.png?x=6", + "src": "/i/WPD/512.png?x=7", "sizes": "512x512", "type": "image/png" } diff --git a/files/assets/manifest_rDrama.json b/files/assets/manifest_rDrama.json index e52dbb780..1aab1cc57 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=6", + "src": "/i/rDrama/192.png?x=7", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/i/rDrama/512.png?x=6", + "src": "/i/rDrama/512.png?x=7", "sizes": "512x512", "type": "image/png" } diff --git a/files/classes/hole.py b/files/classes/hole.py index 86269d5ac..8fac3c87f 100644 --- a/files/classes/hole.py +++ b/files/classes/hole.py @@ -52,7 +52,7 @@ class Hole(Base): @lazy def marsey_url(self): if self.marseyurl: return self.marseyurl - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=6' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=7' @property @lazy diff --git a/files/classes/post.py b/files/classes/post.py index 568f8113d..acd1a72b0 100644 --- a/files/classes/post.py +++ b/files/classes/post.py @@ -168,20 +168,20 @@ class Post(Base): @lazy def thumb_url(self): if self.nsfw: - return f"{SITE_FULL_IMAGES}/i/nsfw.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/nsfw.webp?x=7" elif not self.url: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?x=7" 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=6" + return f"{SITE_FULL_IMAGES}/i/default_thumb_video.webp?x=7" elif self.is_audio: - return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?x=7" elif self.domain == SITE: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=7" else: - return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?x=7" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 52b8e2bca..de81b9912 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -627,7 +627,7 @@ class User(Base): def bio_html_eager(self): if self.bio_html == None: return '' return self.bio_html.replace('data-src', 'src') \ - .replace(f'src="{SITE_FULL_IMAGES}/i/loading.webp?x=6"', '') \ + .replace(f'src="{SITE_FULL_IMAGES}/i/loading.webp?x=7"', '') \ .replace(f'src="{SITE_FULL_IMAGES}/i/loading.webp"', '') \ .replace(f'src="{SITE_FULL_IMAGES}/i/l.webp"', '') @@ -918,7 +918,7 @@ class User(Base): def banner_url(self): if FEATURES['USERS_PROFILE_BANNER'] and self.bannerurl and can_see(g.v, self): return self.bannerurl - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=7" @property @lazy @@ -938,7 +938,7 @@ class User(Base): if self.profileurl and can_see(g.v, self): if self.profileurl.startswith('/'): return SITE_FULL + self.profileurl return self.profileurl - return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?x=6" + return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?x=7" @property @lazy diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index e6e342572..8ccf83a9d 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -273,7 +273,7 @@ def _push_notif_thread(subscriptions, title, body, url): "title": title, "body": body, 'url': url, - 'icon': f'{SITE_FULL}/icon.webp?x=6', + 'icon': f'{SITE_FULL}/icon.webp?x=7', }), vapid_private_key=VAPID_PRIVATE_KEY, vapid_claims={"sub": f"mailto:{EMAIL}"} diff --git a/files/routes/hats.py b/files/routes/hats.py index 6bd593958..b01f57bfa 100644 --- a/files/routes/hats.py +++ b/files/routes/hats.py @@ -150,7 +150,7 @@ def unequip_hat(v, hat_id): def hat_owners(v, hat_id): name = g.db.query(HatDef.name).filter_by(id=hat_id).one()[0] - href = f'{SITE_FULL_IMAGES}/i/hats/{name}.webp?x=6' + href = f'{SITE_FULL_IMAGES}/i/hats/{name}.webp?x=7' page = get_page() diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 14552363d..7be439739 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -60,7 +60,7 @@ def template_change_arg(arg, value, url): @app.template_filter("asset_siteimg") def template_asset_siteimg(asset_path): - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=6' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=7' @app.template_filter("timestamp") def timestamp(timestamp): diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index eaa0bd2c6..cf43dd8f3 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 dbef3eba8..705a4cc84 100644 --- a/files/templates/casino/roulette_screen.html +++ b/files/templates/casino/roulette_screen.html @@ -26,10 +26,10 @@

diff --git a/files/templates/casino/slots_screen.html b/files/templates/casino/slots_screen.html index 64bd20500..4ffee5844 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 603f2e643..a04605c0e 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -157,7 +157,7 @@ {% endif %} {% if FEATURES['HOUSES'] and c.author.house %} - House {{c.author.house}} + House {{c.author.house}} {% endif %} {% if c.author.verified %} @@ -167,7 +167,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 2e595fcc7..47391fbdb 100644 --- a/files/templates/errors/WPD/404.html +++ b/files/templates/errors/WPD/404.html @@ -2,9 +2,9 @@ Not Found - WPD - + - + @@ -12,8 +12,8 @@ - - + + @@ -34,35 +34,35 @@ - + - - + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -84,7 +84,7 @@ @@ -96,11 +96,11 @@ @@ -351,7 +351,7 @@ {% endif %} {% if FEATURES['HOUSES'] and u.house %} - House {{u.house}} + House {{u.house}} {% endif %} {% if u.verified %} @@ -408,7 +408,7 @@ {% if FEATURES['MARSEYBUX'] %} {{u.marseybux}} - marseybux + marseybux {% endif %}
joined {{u.created_date}} diff --git a/files/templates/util/html_head.html b/files/templates/util/html_head.html index 8fa6474ec..2b4924bbb 100644 --- a/files/templates/util/html_head.html +++ b/files/templates/util/html_head.html @@ -62,7 +62,7 @@ '/h/'+hole.name, hole.sidebar if hole.sidebar %} {% endif %} - + @@ -163,20 +163,20 @@ - + - - + + - + {% for size in ('320x480', '640x960', '640x1136', '750x1334', '768x1004', '828x1792', '1024x748', '1024x768', '1125x2436', '1242x2208', '1356x2048', '1668x2224', '1792x828', '2048x1496', '2048x2732', '2208x1242', '2224x1668', '2436x1125', '2668x1242', '2737x2048') %} - + {% endfor %} {% endmacro %} diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index 281787046..eb3bcc179 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -5,7 +5,7 @@ {%- endmacro -%} {%- macro random_image(path) -%} - {{- SITE_FULL_IMAGES ~ "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=6' -}} + {{- SITE_FULL_IMAGES ~ "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=7' -}} {%- endmacro -%} {% macro post_meta(p) %} @@ -73,7 +73,7 @@ {% endif %} {% if FEATURES['HOUSES'] and p.author.house %} - House {{p.author.house}} + House {{p.author.house}} {% endif %} {% if p.author.verified %} @@ -82,7 +82,7 @@
@{{p.author.username}}'s profile picture {% if p.author.hat_active(v)[0] -%} - @{{p.author.username}}'s hat + @{{p.author.username}}'s hat {%- endif %}
{{p.author_name}}