diff --git a/files/assets/browserconfig.xml b/files/assets/browserconfig.xml index bca2f3578..9ec867930 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 fe5d5d2e0..87a88d910 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -228,34 +228,34 @@ } .sharpen-0:after { - background: url("/i/sharpen/0.webp?x=7"); + background: url("/i/sharpen/0.webp?x=8"); } .sharpen-1:after { - background: url("/i/sharpen/1.webp?x=7"); + background: url("/i/sharpen/1.webp?x=8"); } .sharpen-2:after { - background: url("/i/sharpen/2.webp?x=7"); + background: url("/i/sharpen/2.webp?x=8"); } .sharpen-3:after { - background: url("/i/sharpen/3.webp?x=7"); + background: url("/i/sharpen/3.webp?x=8"); } .sharpen-4:after { - background: url("/i/sharpen/4.webp?x=7"); + background: url("/i/sharpen/4.webp?x=8"); } .sharpen-5:after { - background: url("/i/sharpen/5.webp?x=7"); + background: url("/i/sharpen/5.webp?x=8"); } .sharpen-6:after { - background: url("/i/sharpen/6.webp?x=7"); + background: url("/i/sharpen/6.webp?x=8"); } .sharpen-7:after { - background: url("/i/sharpen/7.webp?x=7"); + background: url("/i/sharpen/7.webp?x=8"); } .sharpen-8:after { - background: url("/i/sharpen/8.webp?x=7"); + background: url("/i/sharpen/8.webp?x=8"); } .sharpen-9:after { - background: url("/i/sharpen/9.webp?x=7"); + background: url("/i/sharpen/9.webp?x=8"); } .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 b01b94fac..9f7766344 100644 --- a/files/assets/css/chud.css +++ b/files/assets/css/chud.css @@ -1,3 +1,3 @@ html { - cursor: url('/i/dildo.webp?x=7'), auto; + cursor: url('/i/dildo.webp?x=8'), auto; } diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 3072c361e..88e181765 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5628,7 +5628,7 @@ lite-youtube > .lty-playbtn { left: 50%; z-index: 1; background-color: transparent; - background-image: url('/i/youtube.webp?x=7'); + background-image: url('/i/youtube.webp?x=8'); border: none; } @@ -7277,29 +7277,29 @@ button, .btn { } .chud-0:after { - background: url("/i/chud/0.webp?x=7"); + background: url("/i/chud/0.webp?x=8"); } .chud-1:after { - background: url("/i/chud/1.webp?x=7"); + background: url("/i/chud/1.webp?x=8"); } .chud-2:after { - background: url("/i/chud/2.webp?x=7"); + background: url("/i/chud/2.webp?x=8"); } .chud-3:after { - background: url("/i/chud/3.webp?x=7"); + background: url("/i/chud/3.webp?x=8"); } .chud-4:after { - background: url("/i/chud/4.webp?x=7"); + background: url("/i/chud/4.webp?x=8"); } .chud-5:after { - background: url("/i/chud/5.webp?x=7"); + background: url("/i/chud/5.webp?x=8"); height: 100px; } .chud-6:after { - background: url("/i/chud/6.webp?x=7"); + background: url("/i/chud/6.webp?x=8"); } .chud-7:after, .chud-8:after, .chud-9:after { - background: url("/i/chud/7.webp?x=7"); + background: url("/i/chud/7.webp?x=8"); } @@ -7319,7 +7319,7 @@ button, .btn { width: 32px; height: 32px; position: fixed; - background-image: url('/i/cursormarsey.webp?x=7'); + background-image: url('/i/cursormarsey.webp?x=8'); image-rendering: pixelated; background-position: -64px -32px; } @@ -7329,7 +7329,7 @@ button, .btn { height: 24px; position: fixed; pointer-events: none; - background-image: url('/i/cursormarsey-heart.webp?x=7'); + background-image: url('/i/cursormarsey-heart.webp?x=8'); background-size: cover; left: 24px; top: 0px; diff --git a/files/assets/js/casino/roulette_screen.js b/files/assets/js/casino/roulette_screen.js index 22ee86604..3076ccad8 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=7&t=" + + "/i/rDrama/lottery_active.webp?x=8&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 9964fe659..898a29552 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 61912222c..b2dcc92f3 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=7", + "src": "/i/WPD/192.png?x=8", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/i/WPD/512.png?x=7", + "src": "/i/WPD/512.png?x=8", "sizes": "512x512", "type": "image/png" } diff --git a/files/assets/manifest_rDrama.json b/files/assets/manifest_rDrama.json index 1aab1cc57..206618233 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=7", + "src": "/i/rDrama/192.png?x=8", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/i/rDrama/512.png?x=7", + "src": "/i/rDrama/512.png?x=8", "sizes": "512x512", "type": "image/png" } diff --git a/files/classes/hole.py b/files/classes/hole.py index 7fe85c38e..ab7b07a44 100644 --- a/files/classes/hole.py +++ b/files/classes/hole.py @@ -58,7 +58,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=7' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=8' @property @lazy diff --git a/files/classes/post.py b/files/classes/post.py index 5b02bc8d3..f3ca76ae8 100644 --- a/files/classes/post.py +++ b/files/classes/post.py @@ -188,20 +188,20 @@ class Post(Base): @lazy def thumb_url(self): if self.nsfw: - return f"{SITE_FULL_IMAGES}/i/nsfw.webp?x=7" + return f"{SITE_FULL_IMAGES}/i/nsfw.webp?x=8" elif not self.url: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?x=7" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?x=8" 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=7" + return f"{SITE_FULL_IMAGES}/i/default_thumb_video.webp?x=8" elif self.is_audio: - return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?x=7" + return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?x=8" elif self.domain == SITE: - return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=7" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=8" else: - return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?x=7" + return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?x=8" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 2dd7dd127..5ef53171b 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -687,7 +687,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=7"', '') \ + .replace(f'src="{SITE_FULL_IMAGES}/i/loading.webp?x=8"', '') \ .replace(f'src="{SITE_FULL_IMAGES}/i/loading.webp"', '') \ .replace(f'src="{SITE_FULL_IMAGES}/i/l.webp"', '') @@ -983,7 +983,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=7" + return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?x=8" @property @lazy @@ -1005,7 +1005,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=7" + return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?x=8" @property @lazy diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 787e647c4..be1f90ab7 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -302,7 +302,7 @@ def _push_notif_thread(subscriptions, title, body, url): "title": title, "body": body, 'url': url, - 'icon': f'{SITE_FULL}/icon.webp?x=7', + 'icon': f'{SITE_FULL}/icon.webp?x=8', }), 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 faf486a11..a4e017a25 100644 --- a/files/routes/hats.py +++ b/files/routes/hats.py @@ -109,7 +109,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=7' + href = f'{SITE_FULL_IMAGES}/i/hats/{name}.webp?x=8' page = get_page() diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index d2b8717be..3d204fac0 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -63,7 +63,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=7' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=8' @app.template_filter("timestamp") def timestamp(timestamp): diff --git a/files/templates/bank_statement.html b/files/templates/bank_statement.html index 75f4a5400..03df9bf78 100644 --- a/files/templates/bank_statement.html +++ b/files/templates/bank_statement.html @@ -23,7 +23,7 @@ {% for log in logs %} - {{log.currency}} + {{log.currency}} {% if log.amount > 0 %}+{% endif %}{{log.amount}} diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index 2e0890cd6..0c6ef189a 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 31a4c78b2..d7b704eac 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 0d9e4d1d4..6e82b6ceb 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 a87cdf643..9119975ec 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -199,7 +199,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 d5923fcbb..f85a6dcec 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 @@ - - + + @@ -24,9 +24,9 @@ - + - + @@ -34,35 +34,35 @@ - + - - + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -84,7 +84,7 @@ @@ -96,11 +96,11 @@ @@ -344,7 +344,7 @@ {% if u.hat_active(v)[0] -%} - + {%- endif %} @@ -417,11 +417,11 @@ {{u.coins}} - coins + coins {% 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 610ef9bcb..d0b4706f4 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 %} - + @@ -159,20 +159,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 72ab1c18d..f476557a1 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)|seeded_random(p) ~ '?x=7' -}} + {{- SITE_FULL_IMAGES ~ "/" ~ path ~ "/" ~ listdir('files/' ~ path)|seeded_random(p) ~ '?x=8' -}} {%- endmacro -%} {% macro post_meta(p) %} @@ -106,7 +106,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}}