From ac15bd64b3596687f4b3ba151a5a5beb7bd584e4 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 24 Jan 2022 18:17:21 +0200
Subject: [PATCH] fgg

---
 files/classes/badges.py       | 8 ++++----
 files/templates/userpage.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/classes/badges.py b/files/classes/badges.py
index 94ad69a61..7c6e2ccb1 100644
--- a/files/classes/badges.py
+++ b/files/classes/badges.py
@@ -10,7 +10,7 @@ from json import loads
 class BadgeDef(Base):
 	__tablename__ = "badge_defs"
 
-	id = Column(Integer, ForeignKey("badges.id"), primary_key=True, autoincrement=True)
+	id = Column(Integer, primary_key=True, autoincrement=True)
 	name = Column(String)
 	description = Column(String)
 
@@ -29,7 +29,7 @@ class Badge(Base):
 	description = Column(String)
 	url = Column(String)
 	user = relationship("User", viewonly=True)
-	badge = relationship("BadgeDef", viewonly=True)
+	badge = relationship("BadgeDef", primaryjoin="foreign(Badge.badge_id) == remote(BadgeDef.id)", viewonly=True)
 
 	def __repr__(self):
 		return f"<Badge(user_id={self.user_id}, badge_id={self.badge_id})>"
@@ -51,12 +51,12 @@ class Badge(Base):
 		elif self.description: text = self.description
 		elif self.badge.description: text = self.badge.description
 		else: return ''
-		return f' - {text}'
+		return f'{self.name} - {text}'
 
 	@property
 	@lazy
 	def name(self):
-		return ""
+		return self.badge.name
 
 	@property
 	@lazy
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 237821b69..299386fc3 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -311,9 +311,9 @@
 					<div>
 						{% for b in u.badges %}
 							{% if b.url %}
-								<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}}{{b.text}}"></a>
+								<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.text}}"></a>
 							{% else %}
-								<img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}}{{b.text}}">
+								<img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.text}}">
 							{% endif %}
 						{% endfor %}
 					</div>
@@ -419,9 +419,9 @@
 				<div class="mb-3">
 					{% for b in u.badges %}
 						{% if b.url %}
-							<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}}{{b.text}}"></a>
+							<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.text}}"></a>
 						{% else %}
-							<img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}}{{b.text}}">
+							<img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.text}}">
 						{% endif %}
 					{% endfor %}
 				</div>