Merge 272f3e11c1 into 3002426974

files/classes/badges.py

@@ -1,38 +1,49 @@
-from sqlalchemy import *
+from dataclasses import dataclass
+
+from sqlalchemy.sql.schema import Column, ForeignKey, Index
+from sqlalchemy.sql.sqltypes import Integer, String
 from sqlalchemy.orm import relationship
 from files.classes.base import Base
 from files.helpers.lazy import lazy
 from files.helpers.config.const import *
 from files.helpers.assetcache import assetcache_path
 
-class BadgeDef(Base):
+@dataclass(frozen=True, kw_only=True, slots=True)
-	__tablename__ = "badge_defs"
+class BadgeDef:
-	__table_args__ = (
+	id: str
-		UniqueConstraint('name', name='badge_def_name_unique'),
+	name: str
-	)
+	description: str
 
-	id = Column(Integer, primary_key=True, autoincrement=True)
+BADGES: list[BadgeDef] = [
-	name = Column(String, nullable=False)
+	BadgeDef(
-	description = Column(String)
+		id="unknown",
+		name="Unknown Badge",
+		description="Please report this if you see it! :x"
+	),
+	BadgeDef(
+		id="verified_email",
+		name="Verified Email",
+		description="Verified Email"
+	),
+]
 
-	def __repr__(self):
+BADGES_DICT: dict[str, BadgeDef] = {badge.id:badge for badge in BADGES}
-		return f"<{self.__class__.__name__}(id={self.id})>"
 
 class Badge(Base):
-
 	__tablename__ = "badges"
 
 	user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
-	badge_id = Column(Integer,  ForeignKey('badge_defs.id'), primary_key=True)
+	badge_id = Column(String, nullable=False)
 	description = Column(String)
 	url = Column(String)
 
 	Index('badges_badge_id_idx', badge_id)
 
 	user = relationship("User", viewonly=True)
-	badge = relationship("BadgeDef",
+	
-		primaryjoin="foreign(Badge.badge_id) == remote(BadgeDef.id)",
+	@property
-		lazy="joined", innerjoin=True, viewonly=True)
+	def badge(self) -> BadgeDef:
+		return BADGES_DICT.get(self.badge_id, BADGES_DICT['unknown'])
 
 	def __repr__(self):
 		return f"<{self.__class__.__name__}(user_id={self.user_id}, badge_id={self.badge_id})>"

files/mail/__init__.py

@@ -76,8 +76,8 @@ def activate(v):
 	user.email = email
 	user.is_activated = True
 
-	if not any(b.badge_id == 2 for b in user.badges):
+	if not user.has_badge("verified_email"):
-		mail_badge = Badge(user_id=user.id, badge_id=2)
+		mail_badge = Badge(user_id=user.id, badge_id="verified_email")
 		g.db.add(mail_badge)
 		g.db.flush()
 		send_notification(user.id, f"@AutoJanny has given you the following profile badge:\n\n![]({mail_badge.path})\n\n{mail_badge.name}")

files/routes/awards.py

@@ -54,32 +54,6 @@ def buy(v, award):
 		if v.coins < price: abort(400, "Not enough coins.")
 		v.coins -= price
 		v.coins_spent += price
-		if v.coins_spent >= 1000000 and not v.has_badge(73):
-			new_badge = Badge(badge_id=73, user_id=v.id)
-			g.db.add(new_badge)
-			g.db.flush()
-			send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-		elif v.coins_spent >= 500000 and not v.has_badge(72):
-			new_badge = Badge(badge_id=72, user_id=v.id)
-			g.db.add(new_badge)
-			g.db.flush()
-			send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-		elif v.coins_spent >= 250000 and not v.has_badge(71):
-			
-			new_badge = Badge(badge_id=71, user_id=v.id)
-			g.db.add(new_badge)
-			g.db.flush()
-			send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-		elif v.coins_spent >= 100000 and not v.has_badge(70):
-			new_badge = Badge(badge_id=70, user_id=v.id)
-			g.db.add(new_badge)
-			g.db.flush()
-			send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-		elif v.coins_spent >= 10000 and not v.has_badge(69):
-			new_badge = Badge(badge_id=69, user_id=v.id)
-			g.db.add(new_badge)
-			g.db.flush()
-			send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
 		g.db.add(v)
 
 

files/routes/login.py

@@ -321,26 +321,6 @@ def sign_up_post(v):
 	g.db.add(new_user)
 	g.db.flush()
 
-	if ref_id:
-		ref_user = g.db.query(User).filter_by(id=ref_id).one_or_none()
-
-		if ref_user:
-			if ref_user.referral_count and not ref_user.has_badge(10):
-				new_badge = Badge(user_id=ref_user.id, badge_id=10)
-				g.db.add(new_badge)
-				g.db.flush()
-				send_notification(ref_user.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-			if ref_user.referral_count >= 10 and not ref_user.has_badge(11):
-				new_badge = Badge(user_id=ref_user.id, badge_id=11)
-				g.db.add(new_badge)
-				g.db.flush()
-				send_notification(ref_user.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-			if ref_user.referral_count >= 100 and not ref_user.has_badge(12):
-				new_badge = Badge(user_id=ref_user.id, badge_id=12)
-				g.db.add(new_badge)
-				g.db.flush()
-				send_notification(ref_user.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
-
 	check_for_alts(new_user.id)
 
 	if email: send_verification_email(new_user)