From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 24 Jun 2023 19:20:52 +0000 (+0000)
Subject: accounts: Make path to avatar relative unless specifically asking for absolute
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0da30c2843655e53e32c1d4572b8a6d1d53f7e9d;p=ipfire.org.git

accounts: Make path to avatar relative unless specifically asking for absolute

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 6a3cb42f..7954312a 100644
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -1183,8 +1183,12 @@ class Account(LDAPObject):
 
 		return has_avatar
 
-	def avatar_url(self, size=None):
-		url = "https://people.ipfire.org/users/%s.jpg?h=%s" % (self.uid, self.avatar_hash)
+	def avatar_url(self, size=None, absolute=False):
+		url = "/users/%s.jpg?h=%s" % (self.uid, self.avatar_hash)
+
+		# Return an absolute URL
+		if absolute:
+			url = urllib.parse.urljoin("https://people.ipfire.org", url)
 
 		if size:
 			url += "&size=%s" % size
diff --git a/src/web/people.py b/src/web/people.py
index 4a469c40..1124dda7 100644
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -396,7 +396,7 @@ class SSODiscourse(auth.CacheMixin, base.BaseHandler):
 			"bio" : self.current_user.description or "",
 
 			# Avatar
-			"avatar_url" : self.current_user.avatar_url(),
+			"avatar_url" : self.current_user.avatar_url(absolute=True),
 			"avatar_force_update" : "true",
 
 			# Send a welcome message