diff --git a/files/routes/users.py b/files/routes/users.py index e4a9db1a65..66fbb95b4a 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -362,25 +362,22 @@ def leaderboard(v): try: pos9 = [x[0].id for x in users9].index(v.id) - pos9 = (pos9, users9[pos9][1]) + pos9 = (pos9+1, users9[pos9][1]) except: pos9 = None try: pos12 = [x[0].id for x in users12].index(v.id) - pos12 = (pos12, users12[pos12][1]) - except Exception as e: - print([x[0].id for x in users12]) - print(e) - pos12 = None + pos12 = (pos12+1, users12[pos12][1]) + except: pos12 = None try: pos13 = [x[0] for x in users13].index(v.username.lower()) - pos13 = (pos13, users13[pos13][1]) + pos13 = (pos13+1, users13[pos13][1]) except: pos13 = None try: pos15 = [x[0].id for x in users15].index(v.id) - pos15 = (pos15, users15[pos15][1]) + pos15 = (pos15+1, users15[pos15][1]) except: pos15 = None return render_template("leaderboard.html", v=v, users1=users1, pos1=pos1, users2=users2, pos2=pos2, users3=users3, pos3=pos3, users4=users4, pos4=pos4, users5=users5, pos5=pos5, users6=users6, pos6=pos6, users7=users7, pos7=pos7, users9=userss9, pos9=pos9, users10=users10, pos10=pos10, users12=userss12, pos12=pos12, users13=userss13, pos13=pos13, users15=userss15, pos15=pos15) diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html index 9cff16d68c..6e050170a8 100644 --- a/files/templates/leaderboard.html +++ b/files/templates/leaderboard.html @@ -17,14 +17,14 @@ {% for user in users1 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.coins}} {% endfor %} {% if pos1 > 25 %} {{pos1}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.coins}} {% endif %} @@ -52,14 +52,14 @@ {% for user in users7 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.coins_spent}} {% endfor %} {% if pos7 > 25 %} {{pos7}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.coins_spent}} {% endif %} @@ -87,14 +87,14 @@ {% for user in users10 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.truecoins}} {% endfor %} {% if pos10 > 25 %} {{pos10}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.truecoins}} {% endif %} @@ -121,14 +121,14 @@ {% for user in users2 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.stored_subscriber_count}} {% endfor %} {% if pos2 > 25 %} {{pos2}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.stored_subscriber_count}} {% endif %} @@ -153,14 +153,14 @@ {% for user in users3 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.post_count}} {% endfor %} {% if pos3 > 25 %} {{pos3}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.post_count}} {% endif %} @@ -185,14 +185,14 @@ {% for user in users4 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.comment_count}} {% endfor %} {% if pos4 > 25 %} {{pos4}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.comment_count}} {% endif %} @@ -219,14 +219,14 @@ {% for user in users5 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.received_award_count}} {% endfor %} {% if pos5 > 25 %} {{pos5}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.received_award_count}} {% endif %} @@ -255,14 +255,14 @@ {% for user in users9 %} {{loop.index}} - @{{user[0].username}}'s profile picture{{user[0].username}} + @{{user[0].username}}'s profile picture{{user[0].username}} {{user[1]}} {% endfor %} {% if pos9 and pos9[0] > 25 %} {{pos9[0]}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{pos9[1]}} {% endif %} @@ -292,14 +292,14 @@ {% for user in users12 %} {{loop.index}} - @{{user[0].username}}'s profile picture{{user[0].username}} + @{{user[0].username}}'s profile picture{{user[0].username}} {{user[1]}} {% endfor %} {% if pos12 and pos12[0] > 25 %} {{pos12[0]}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{pos12[1]}} {% endif %} @@ -329,14 +329,14 @@ {% for user in users6 %} {{loop.index}} - @{{user.username}}'s profile picture{{user.username}} + @{{user.username}}'s profile picture{{user.username}} {{user.basedcount}} {% endfor %} {% if pos6 > 25 %} {{pos6}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{v.basedcount}} {% endif %} @@ -366,14 +366,14 @@ {% for user in users13 %} {{loop.index}} - @{{user[0].username}}'s profile picture{{user[0].username}} + @{{user[0].username}}'s profile picture{{user[0].username}} {{user[1]}} {% endfor %} - {% if pos13 and pos13[0] > 1 %} + {% if pos13 and pos13[0] > 25 %} {{pos13[0]}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{pos13[1]}} {% endif %} @@ -404,14 +404,14 @@ {% for user in users15 %} {{loop.index}} - @{{user[0].username}}'s profile picture{{user[0].username}} + @{{user[0].username}}'s profile picture{{user[0].username}} {{user[1]}} {% endfor %} {% if pos15 and pos15[0] > 25 %} {{pos15[0]}} - @{{v.username}}'s profile picture{{v.username}} + @{{v.username}}'s profile picture{{v.username}} {{pos15[1]}} {% endif %}