diff --git a/files/classes/badges.py b/files/classes/badges.py
index cbf32cf28..265f9dffe 100644
--- a/files/classes/badges.py
+++ b/files/classes/badges.py
@@ -26,8 +26,10 @@ class BadgeDef(Base):
@property
@lazy
def path(self):
- if 20 < self.id < 28 or self.id == 222: return SITE_FULL + f"/i/{SITE_NAME}/badges/{self.id}.webp?b=7"
- return SITE_FULL + f"/i/badges/{self.id}.webp?b=7"
+ if 20 < self.id < 28 or self.id == 222:
+ return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/badges/{self.id}.webp?b=7"
+
+ return f"{SITE_FULL_IMAGES}/i/badges/{self.id}.webp?b=7"
class Badge(Base):
diff --git a/files/classes/sub.py b/files/classes/sub.py
index fb3cad0b6..07ab6fee4 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'/i/{SITE_NAME}/sidebar.webp?v=3009'
+ return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/sidebar.webp?v=3009'
@property
@lazy
@@ -62,7 +62,7 @@ class Sub(Base):
@lazy
def marsey_url(self):
if self.marseyurl: return self.marseyurl
- return f'/i/{SITE_NAME}/headericon.webp?v=3009'
+ return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?v=3009'
@property
@lazy
diff --git a/files/classes/submission.py b/files/classes/submission.py
index f544fb83d..e88d96d0a 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -153,16 +153,21 @@ class Submission(Base):
@property
@lazy
def thumb_url(self):
- if self.over_18: return f"{SITE_FULL}/i/nsfw.webp?v=1"
- elif not self.url: return f"{SITE_FULL}/i/{SITE_NAME}/default_text.webp?v=2"
+ if self.over_18:
+ return f"{SITE_FULL_IMAGES}/i/nsfw.webp?v=1"
+ elif not self.url:
+ return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/default_text.webp?v=2"
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}/i/default_thumb_video.webp?v=2"
- elif self.is_audio: return f"{SITE_FULL}/i/default_thumb_audio.webp?v=1"
+ elif self.is_youtube or self.is_video:
+ return f"{SITE_FULL_IMAGES}/i/default_thumb_video.webp?v=2"
+ elif self.is_audio:
+ return f"{SITE_FULL_IMAGES}/i/default_thumb_audio.webp?v=1"
elif self.domain in {SITE, BAN_EVASION_DOMAIN}:
- return f"{SITE_FULL}/i/{SITE_NAME}/site_preview.webp?v=3009"
- else: return f"{SITE_FULL}/i/default_thumb_link.webp?v=1"
+ return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?v=3009"
+ else:
+ return f"{SITE_FULL_IMAGES}/i/default_thumb_link.webp?v=1"
@property
@lazy
diff --git a/files/classes/user.py b/files/classes/user.py
index c2f529b52..10790bd79 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -295,9 +295,9 @@ class User(Base):
if IS_FISTMAS():
hat = random.choice(('Santa Hat III', 'Winter Cap', 'Present Bow'))
if SITE_NAME == 'rDrama':
- return (f'/i/hats/{hat}.webp', 'Merry Fistmas!')
+ return (f'{SITE_FULL_IMAGES}/i/hats/{hat}.webp', 'Merry Fistmas!')
else:
- return (f'/i/hats/{hat}.webp', 'Merry Christmas!')
+ return (f'{SITE_FULL_IMAGES}/i/hats/{hat}.webp', 'Merry Christmas!')
if self.is_cakeday:
return ('/i/hats/Cakeday.webp', "I've spent another year rotting my brain with dramaposting, please ridicule me 🤓")
@@ -306,10 +306,10 @@ class User(Base):
return ('/i/new-user.webp', "Hi, I'm new here! Please be gentle :)")
if self.forced_hat:
- return (f'/i/hats/{self.forced_hat[0]}.webp', self.forced_hat[1])
+ return (f'{SITE_FULL_IMAGES}/i/hats/{self.forced_hat[0]}.webp', self.forced_hat[1])
if self.equipped_hat:
- return (f'/i/hats/{self.equipped_hat.name}.webp', self.equipped_hat.name + ' - ' + self.equipped_hat.censored_description(v))
+ return (f'{SITE_FULL_IMAGES}/i/hats/{self.equipped_hat.name}.webp', self.equipped_hat.name + ' - ' + self.equipped_hat.censored_description(v))
return ('', '')
@@ -792,7 +792,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"/i/{SITE_NAME}/site_preview.webp?v=3009"
+ return f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/site_preview.webp?v=3009"
@property
@lazy
@@ -804,7 +804,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}/i/default-profile-pic.webp?v=1008"
+ return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?v=1008"
@lazy
def real_post_count(self, v):
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index d9bb67aea..8343f3c0f 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -286,7 +286,7 @@ def sanitize_settings_text(sanitized:Optional[str], max_length:Optional[int]=Non
chud_images = listdir("files/assets/images/chud")
-chud_images = [f'\n\n{SITE_FULL}/i/chud/{f}' for f in chud_images]
+chud_images = [f'\n\n{SITE_FULL_IMAGES}/i/chud/{f}' for f in chud_images]
chud_images.extend([':#trumpjaktalking:', ':#reposthorse:'])
def handle_youtube_links(url):
@@ -404,7 +404,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=True, count_emojis=
tag["loading"] = "lazy"
tag["data-src"] = tag["src"]
- tag["src"] = "/i/l.webp"
+ tag["src"] = f"{SITE_FULL_IMAGES}/i/l.webp"
tag['alt'] = tag["data-src"]
tag['class'] = "img"
diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py
index 1def6f353..dd27ef190 100644
--- a/files/routes/asset_submissions.py
+++ b/files/routes/asset_submissions.py
@@ -396,7 +396,7 @@ def approve_hat(v, name):
ma = ModAction(
kind="approve_hat",
user_id=v.id,
- _note=f'{name}'
+ _note=f'{name}'
)
g.db.add(ma)
@@ -547,7 +547,7 @@ def update_hat(v):
ma = ModAction(
kind="update_hat",
user_id=v.id,
- _note=f'{name}'
+ _note=f'{name}'
)
g.db.add(ma)
return render_template("admin/update_assets.html", v=v, msg=f"'{name}' updated successfully!", type="Hat")
diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py
index 25d19080c..e9357e106 100644
--- a/files/routes/jinja2.py
+++ b/files/routes/jinja2.py
@@ -40,7 +40,7 @@ def template_asset(ctx, asset_path):
@app.template_filter("asset_siteimg")
def template_asset_siteimg(asset_path):
# TODO: Add hashing for these using files.helpers.assetcache
- return f'/i/{SITE_NAME}/{asset_path}?v=3010'
+ return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?v=3010'
@app.template_filter("timestamp")
def timestamp(timestamp):
@@ -144,5 +144,5 @@ def inject_constants():
"DEFAULT_CONFIG_VALUE":DEFAULT_CONFIG_VALUE, "IS_LOCALHOST":IS_LOCALHOST, "BACKGROUND_CATEGORIES":BACKGROUND_CATEGORIES, "PAGE_SIZE":PAGE_SIZE, "TAGLINES":TAGLINES, "IS_FISTMAS":IS_FISTMAS, "get_alt_graph":get_alt_graph, "current_registered_users":current_registered_users,
"git_head":git_head, "max_days":max_days,
"BIO_FRIENDS_ENEMIES_LENGTH_LIMIT":BIO_FRIENDS_ENEMIES_LENGTH_LIMIT,
- "IMMUNE_TO_AWARDS": IMMUNE_TO_AWARDS,
+ "IMMUNE_TO_AWARDS": IMMUNE_TO_AWARDS, "SITE_FULL_IMAGES": SITE_FULL_IMAGES
}
diff --git a/files/templates/admin/patrons.html b/files/templates/admin/patrons.html
index 570948fa5..9fbc7b002 100644
--- a/files/templates/admin/patrons.html
+++ b/files/templates/admin/patrons.html
@@ -14,7 +14,7 @@
{{loop.index}} |
{% include "user_in_table.html" %} |
-
+
|
{% endfor %}
diff --git a/files/templates/app.html b/files/templates/app.html
index 6cab1f0d5..5c86fd0f5 100644
--- a/files/templates/app.html
+++ b/files/templates/app.html
@@ -11,9 +11,9 @@
{% endif %}
First step:
-
+
Second step:
-
+
{% endblock %}
diff --git a/files/templates/awards.html b/files/templates/awards.html
index 34b23a20e..45ad5d9a0 100644
--- a/files/templates/awards.html
+++ b/files/templates/awards.html
@@ -34,7 +34,7 @@
{% if p.award_count("ricardo", v) %}
{% for i in range(min(p.award_count("ricardo", v), 3)) %}
-
+
{% endfor %}
{% endif %}
diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html
index 8f21e7e53..3852fa7bb 100644
--- a/files/templates/casino/game_screen.html
+++ b/files/templates/casino/game_screen.html
@@ -42,13 +42,13 @@
diff --git a/files/templates/casino/rehab.html b/files/templates/casino/rehab.html
index 26c3ecfba..a2989691b 100644
--- a/files/templates/casino/rehab.html
+++ b/files/templates/casino/rehab.html
@@ -9,6 +9,6 @@
…but we’re here for you. You’ve been checked into Rehab.
-
+
{% endblock %}
diff --git a/files/templates/casino/roulette_screen.html b/files/templates/casino/roulette_screen.html
index b29e91076..1fa8047a0 100644
--- a/files/templates/casino/roulette_screen.html
+++ b/files/templates/casino/roulette_screen.html
@@ -19,17 +19,17 @@ Bets
- - 2 2 that
the number will be black.
- - 2 2 that
the number will be even.
diff --git a/files/templates/casino/slots_screen.html b/files/templates/casino/slots_screen.html
index 66ef39dc5..807b0c31f 100644
--- a/files/templates/casino/slots_screen.html
+++ b/files/templates/casino/slots_screen.html
@@ -9,13 +9,13 @@
{% endblock %}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 73a460389..24d7f952f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -159,11 +159,11 @@
👻
{% else %}
{% if FEATURES['PATRON_ICONS'] and c.author.patron %}
-
+
{% endif %}
{% if FEATURES['HOUSES'] and c.author.house %}
-
+
{% endif %}
{% if c.author.verified %}
@@ -207,17 +207,17 @@
{% if c.treasure_amount and c.treasure_amount != '0' %}
{% if c.treasure_amount.startswith('l') %}
-
+
Found {{c.treasure_amount.replace('l', '')}} Lottershe Tickets!
{% elif '-' in c.treasure_amount %}
-
+
A Mimic Ate {{c.treasure_amount.replace('-', '')}} Coins!
{% else %}
-
+
Found {{c.treasure_amount}} Coins!
{% endif %}
diff --git a/files/templates/errors/WPD/404.html b/files/templates/errors/WPD/404.html
index 2040b7868..687cea06e 100644
--- a/files/templates/errors/WPD/404.html
+++ b/files/templates/errors/WPD/404.html
@@ -9,7 +9,7 @@
-
+
@@ -57,20 +57,20 @@
-
-
+
+