diff --git a/files/classes/clients.py b/files/classes/clients.py index ca2786c3c..93d0ec2a2 100644 --- a/files/classes/clients.py +++ b/files/classes/clients.py @@ -34,7 +34,7 @@ class OauthApp(Base): @property @lazy - def permalink(self): return f"/admin/app/{self.id}" + def permalink(self): return f"{SITE_FULL}/admin/app/{self.id}" @lazy def idlist(self, page=1): diff --git a/files/classes/comment.py b/files/classes/comment.py index ad4868a0e..3df673d2b 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -233,10 +233,10 @@ class Comment(Base): @property @lazy def permalink(self): - if self.post and self.post.club: return f"/comment/{self.id}?context=9#context" + if self.post and self.post.club: return f"{SITE_FULL}/comment/{self.id}?context=9#context" - if self.post: return f"{self.post.permalink}/{self.id}?context=9#context" - else: return f"/comment/{self.id}?context=9#context" + if self.post: return f"{SITE_FULL}{self.post.permalink}/{self.id}?context=9#context" + else: return f"{SITE_FULL}/comment/{self.id}?context=9#context" @property @lazy diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index 62c1a31bd..6a6b2bf6b 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -108,7 +108,7 @@ class ModAction(Base): @property @lazy def permalink(self): - return f"/log/{self.id}" + return f"{SITE_FULL}/log/{self.id}" ACTIONTYPES={ "grant_awards": { diff --git a/files/classes/submission.py b/files/classes/submission.py index 2184c2782..c4a30b75d 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -197,7 +197,7 @@ class Submission(Base): @property @lazy def permalink(self): - if self.club: return f"/post/{self.id}" + if self.club: return f"{SITE_FULL}/post/{self.id}" output = self.title.lower() @@ -210,7 +210,7 @@ class Submission(Base): if not output: output = '-' - return f"/post/{self.id}/{output}" + return f"{SITE_FULL}/post/{self.id}/{output}" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index c86be7017..c8bfa8be0 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -313,7 +313,7 @@ class User(Base): @property @lazy def url(self): - return f"/@{self.username}" + return f"{SITE_FULL}/@{self.username}" def __repr__(self): return f"" diff --git a/files/routes/errors.py b/files/routes/errors.py index fbb450938..9fff73b1f 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -61,5 +61,7 @@ def error_500(e): def allow_nsfw(): session["over_18"] = int(time.time()) + 3600 redir = request.values.get("redir") - if redir and redir.startswith(SITE_FULL) or redir.startswith('/'): return redirect(redir) + if redir: + if redir.startswith(SITE_FULL): return redirect(redir) + if redir.startswith('/'): return redirect(f'{SITE_FULL}{redir}') return redirect(f'{SITE_FULL}/') \ No newline at end of file diff --git a/files/routes/users.py b/files/routes/users.py index 654a65f00..529ae5268 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -666,7 +666,7 @@ def u_username(username, v=None): if username != u.username: - return redirect(request.full_path.replace(username, u.username)) + return redirect(SITE_FULL + request.full_path.replace(username, u.username)) if u.reserved: if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": f"That username is reserved for: {u.reserved}"} diff --git a/files/templates/comments.html b/files/templates/comments.html index 1999a3e40..1f9729c6b 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -908,7 +908,7 @@ {% include "expanded_image_modal.html" %} - + - + \ No newline at end of file