From d59a80245d037aa6213b7003180982ba92f6401b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 25 Jun 2022 01:22:20 +0200 Subject: [PATCH] add total counter for simps, haters, simping for, hates --- files/routes/users.py | 28 ++++++++++++++++++++++++---- files/templates/voters.html | 3 ++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/files/routes/users.py b/files/routes/users.py index 71d441e38..559538f8c 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -283,6 +283,8 @@ def upvoters(v, username): votes = Counter(dict(votes)) + Counter(dict(votes2)) + total = sum(votes.values()) + users = g.db.query(User).filter(User.id.in_(votes.keys())).all() users2 = [] for user in users: users2.append((user, votes[user.id])) @@ -294,7 +296,10 @@ def upvoters(v, username): pos = (pos+1, users[pos][1]) except: pos = (len(users)+1, 0) - return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Up', name2=f'@{username} biggest simps') + if total == 1: total=f'{total} upvote received' + else: total=f'{total} upvotes received' + + return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Up', name2=f'@{username} biggest simps', total=total) @@ -309,6 +314,8 @@ def downvoters(v, username): votes = Counter(dict(votes)) + Counter(dict(votes2)) + total = sum(votes.values()) + users = g.db.query(User).filter(User.id.in_(votes.keys())).all() users2 = [] for user in users: users2.append((user, votes[user.id])) @@ -320,7 +327,10 @@ def downvoters(v, username): pos = (pos+1, users[pos][1]) except: pos = (len(users)+1, 0) - return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Down', name2=f'@{username} biggest haters') + if total == 1: total=f'{total} downvote received' + else: total=f'{total} downvotes received' + + return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Down', name2=f'@{username} biggest haters', total=total) @app.get("/@/upvoting") @auth_required @@ -333,6 +343,8 @@ def upvoting(v, username): votes = Counter(dict(votes)) + Counter(dict(votes2)) + total = sum(votes.values()) + users = g.db.query(User).filter(User.id.in_(votes.keys())).all() users2 = [] for user in users: users2.append((user, votes[user.id])) @@ -344,7 +356,10 @@ def upvoting(v, username): pos = (pos+1, users[pos][1]) except: pos = (len(users)+1, 0) - return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Up', name2=f'Who @{username} simps for') + if total == 1: total=f'{total} upvote given' + else: total=f'{total} upvotes given' + + return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Up', name2=f'Who @{username} simps for', total=total) @app.get("/@/downvoting") @auth_required @@ -357,6 +372,8 @@ def downvoting(v, username): votes = Counter(dict(votes)) + Counter(dict(votes2)) + total = sum(votes.values()) + users = g.db.query(User).filter(User.id.in_(votes.keys())).all() users2 = [] for user in users: users2.append((user, votes[user.id])) @@ -368,7 +385,10 @@ def downvoting(v, username): pos = (pos+1, users[pos][1]) except: pos = (len(users)+1, 0) - return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Down', name2=f'Who @{username} hates') + if total == 1: total=f'{total} downvote given' + else: total=f'{total} downvotes given' + + return render_template("voters.html", v=v, users=users[:25], pos=pos, name='Down', name2=f'Who @{username} hates', total=total) diff --git a/files/templates/voters.html b/files/templates/voters.html index 4c37a6956..96205c5fe 100644 --- a/files/templates/voters.html +++ b/files/templates/voters.html @@ -4,7 +4,8 @@ -
{{name2}}
+

{{name2}}

+
Total: {{total}}