From 2b490437fa5edc69b353675f3d72de6ee3a4efc1 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 19:42:39 +0200 Subject: [PATCH] gf --- files/classes/user.py | 13 +----------- files/routes/users.py | 21 ++++--------------- files/templates/award_leaderboard.html | 29 -------------------------- files/templates/leaderboard.html | 26 +++++++++++++++++++++++ 4 files changed, 31 insertions(+), 58 deletions(-) delete mode 100644 files/templates/award_leaderboard.html diff --git a/files/classes/user.py b/files/classes/user.py index 5fefc9e556..de85c1392d 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -52,6 +52,7 @@ class User(Base, Stndrd, Age_times): passhash = deferred(Column(String)) post_count = Column(Integer, default=0) comment_count = Column(Integer, default=0) + received_award_count = Column(Integer, default=0) created_utc = Column(Integer, default=0) suicide_utc = Column(Integer, default=0) rent_utc = Column(Integer, default=0) @@ -353,18 +354,6 @@ class User(Base, Stndrd, Age_times): return sorted(list(awards.values()), key=lambda x: x['kind'], reverse=True) - @property - @lazy - def received_awards_num(self): - - posts_idlist = g.db.query(Submission.id).filter_by(author_id=self.id).subquery() - comments_idlist = g.db.query(Comment.id).filter_by(author_id=self.id).subquery() - - post_awards = g.db.query(AwardRelationship).filter(AwardRelationship.submission_id.in_(posts_idlist)).count() - comment_awards = g.db.query(AwardRelationship).filter(AwardRelationship.comment_id.in_(comments_idlist)).count() - - return post_awards + comment_awards - @property @lazy def post_notifications_count(self): diff --git a/files/routes/users.py b/files/routes/users.py index dffedb9550..c38b3d8574 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -140,24 +140,11 @@ def leaderboard(v): users2 = users.order_by(User.stored_subscriber_count.desc()).limit(10).all() users3 = users.order_by(User.post_count.desc()).limit(10).all() users4 = users.order_by(User.comment_count.desc()).limit(10).all() + users5 = users.order_by(User.received_award_count.desc()).limit(10).all() if "pcm" in request.host: - users5 = users.order_by(User.basedcount.desc()).limit(10).all() - return render_template("leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5) - return render_template("leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4) - - -@app.get("/award_leaderboard") -@auth_desired -def award_leaderboard(v): - return render_template("award_leaderboard.html", v=v, users=a_leaderboard()) - - -@cache.memoize(timeout=86400) -def a_leaderboard(): - users = g.db.query(User).options(lazyload('*')).all() - users = sorted(users, key=lambda x: x.received_awards_num, reverse=True)[:10] - return users - + users6 = users.order_by(User.basedcount.desc()).limit(10).all() + return render_template("leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5, users6=users6) + return render_template("leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5) @app.get("/@/css") def get_css(username): diff --git a/files/templates/award_leaderboard.html b/files/templates/award_leaderboard.html deleted file mode 100644 index 3846340a49..0000000000 --- a/files/templates/award_leaderboard.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "settings2.html" %} - -{% block pagetitle %}Leaderboard - awards received{% endblock %} - -{% block content %} -

-
Top 10 by awards received

-

-
-
-	
-		
-		
-		
-	
-
-{% for user in users %}
-	
-		
-		
-		
-	
-{% endfor %}
-
#NameAwards
{{users.index(user)+1}}{{user.username}}{{user.received_awards_num}}

-
-
-
-

-{% endblock %}
\ No newline at end of file
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index ff11800650..d31744a782 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -98,6 +98,32 @@
 {% endfor %}
 
 
+
+
+
+
+

+
Top 10 by received awards

+
+
+
+

+
+
+	
+		
+		
+		
+	
+
+{% for user in users5 %}
+	
+		
+		
+		
+	
+{% endfor %}
+
#NameReceived awards
{{users5.index(user)+1}}{{user.username}}{{user.received_award_count}}

 {% if "pcm" in request.host %}