From c7bab4ec6c033f8fa7af664d65236d2cbccf9c7b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 28 Jan 2022 23:42:09 +0200 Subject: [PATCH] fsd --- files/classes/badges.py | 4 ++-- files/classes/submission.py | 21 ++++++--------------- files/classes/user.py | 8 +------- files/routes/feeds.py | 6 +++--- files/routes/settings.py | 2 +- files/templates/default.html | 4 ++-- files/templates/settings2.html | 4 ++-- files/templates/submission_listing.html | 4 ++-- 8 files changed, 19 insertions(+), 34 deletions(-) diff --git a/files/classes/badges.py b/files/classes/badges.py index 4405e88bc..3ccfccf20 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -61,7 +61,7 @@ class Badge(Base): @property @lazy def path(self): - return f"/static/assets/images/badges/{self.badge_id}.webp?a=1008" + return f"{SITE_FULL}/static/assets/images/badges/{self.badge_id}.webp?a=1008" @property @lazy @@ -69,5 +69,5 @@ class Badge(Base): return {'text': self.text, 'name': self.name, 'url': self.url, - 'icon_url':f"{SITE_FULL}{self.path}" + 'icon_url':self.path } diff --git a/files/classes/submission.py b/files/classes/submission.py index c4a30b75d..626453e82 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -237,22 +237,12 @@ class Submission(Base): def thumb_url(self): if self.over_18: return f"{SITE_FULL}/static/assets/images/nsfw.webp" elif not self.url: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/default_text.webp" - elif self.thumburl: return self.thumburl + 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}/static/assets/images/default_thumb_yt.webp" else: return f"{SITE_FULL}/static/assets/images/default_thumb_link.webp" - @property - @lazy - def full_thumb(self): - if self.thumb_url.startswith('/'): return SITE_FULL + self.thumb_url - return self.thumb_url - - @property - @lazy - def full_url(self): - if self.url and self.url.startswith('/'): return SITE_FULL + self.url - return self.url - @property @lazy def json_raw(self): @@ -268,9 +258,9 @@ class Submission(Base): 'title': self.title, 'is_nsfw': self.over_18, 'is_bot': self.is_bot, - 'thumb_url': self.full_thumb, + 'thumb_url': self.thumb_url, 'domain': self.domain, - 'url': self.full_url, + 'url': self.realurl(None), 'body': self.body, 'body_html': self.body_html, 'created_utc': self.created_utc, @@ -351,6 +341,7 @@ class Submission(Base): return url elif self.url: if v and v.nitter: return self.url.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net") + if self.url.startswith('/'): return SITE_FULL + self.url return self.url else: return "" diff --git a/files/classes/user.py b/files/classes/user.py index c8bfa8be0..61e3c7edf 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -455,12 +455,6 @@ class User(Base): return data - @property - @lazy - def full_profileurl(self): - if self.profile_url.startswith('/'): return SITE_FULL + self.profile_url - return self.profile_url - @property @lazy def json_raw(self): @@ -470,7 +464,7 @@ class User(Base): 'created_utc': self.created_utc, 'id': self.id, 'is_private': self.is_private, - 'profile_url': self.full_profileurl, + 'profile_url': self.profile_url, 'bannerurl': self.banner_url, 'bio': self.bio, 'bio_html': self.bio_html_eager, diff --git a/files/routes/feeds.py b/files/routes/feeds.py index 6b79038ad..c95c98157 100644 --- a/files/routes/feeds.py +++ b/files/routes/feeds.py @@ -31,11 +31,11 @@ def feeds_user(v=None, sort='hot', t='all'): with tag("title", type="text"): text(f"{sort} posts from {domain}") - doc.stag("link", href=request.url) - doc.stag("link", href=request.url_root) + doc.stag("link", href=SITE_FULL + request.full_path) + doc.stag("link", href=SITE_FULL) for post in posts: - with tag("entry", ("xml:base", request.url)): + with tag("entry", ("xml:base", SITE_FULL + request.full_path)): with tag("title", type="text"): text(post.realtitle(None)) diff --git a/files/routes/settings.py b/files/routes/settings.py index 4522f86e9..0b4c240f7 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -542,7 +542,7 @@ def settings_security_post(v): if new_email == v.email: return render_template("settings_security.html", v=v, error="That email is already yours!") - url = f"{request.host_url}activate" + url = f"{SITE_FULL}/activate" now = int(time.time()) diff --git a/files/templates/default.html b/files/templates/default.html index 6a0935c40..9aa4b34b0 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + {% endblock %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 9e08efa5c..4242602aa 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -19,7 +19,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 9d8f13e73..9812241ba 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -518,8 +518,8 @@ {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}
- - Unable to load image + + Unable to load image
{% elif p.is_video %}