diff --git a/files/routes/admin.py b/files/routes/admin.py index 290d2cf19..a8ff4c576 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -52,14 +52,6 @@ def distribute(v, cid): g.db.commit() return f"Each winner has received {coinsperperson} coins!" -@app.get("/truescore") -@auth_desired -def truescore(v): - users = g.db.query(User).order_by(User.truecoins.desc()).limit(25).all() - if not v or v.oldsite: template = '' - else: template = 'CHRISTMAS/' - return render_template(f"{template}truescore.html", v=v, users=users) - @app.post("/@/revert_actions") @limiter.limit("1/second") @admin_level_required(3) diff --git a/files/routes/posts.py b/files/routes/posts.py index ad9bfe4ae..42f60a855 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -1028,6 +1028,7 @@ def submit_post(v): name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp' file.save(name) new_post.url = process_image(name) + new_post.thumburl = process_image(name, True) elif file.content_type.startswith('video/'): file.save("video.mp4") @@ -1042,8 +1043,7 @@ def submit_post(v): - if (new_post.url or request.files.get('file')) and request.headers.get('cf-ipcountry')!="T1": - gevent.spawn( thumbnail_thread, new_post.id) + if not new_post.thumburl and new_post.url and request.headers.get('cf-ipcountry')!="T1": gevent.spawn( thumbnail_thread, new_post.id) if not new_post.private: diff --git a/files/routes/users.py b/files/routes/users.py index 6d1280f1e..102250885 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -256,15 +256,17 @@ def transfer_coins(v, username): @app.get("/leaderboard") @auth_desired def leaderboard(v): + if not v or v.oldsite: template = '' + else: template = 'CHRISTMAS/' + users = g.db.query(User) users1 = users.order_by(User.coins.desc()).limit(25).all() - users2 = users.order_by(User.stored_subscriber_count.desc()).limit(15).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() - users7 = users.order_by(User.coins_spent.desc()).limit(20).all() - - + users2 = users.order_by(User.stored_subscriber_count.desc()).limit(25).all() + users3 = users.order_by(User.post_count.desc()).limit(25).all() + users4 = users.order_by(User.comment_count.desc()).limit(25).all() + users5 = users.order_by(User.received_award_count.desc()).limit(25).all() + users7 = users.order_by(User.coins_spent.desc()).limit(25).all() + users10 = g.db.query(User).order_by(User.truecoins.desc()).limit(25).all() votes1 = g.db.query(Submission.author_id, func.count(Submission.author_id)).join(Vote, Vote.submission_id==Submission.id).filter(Vote.vote_type==-1).group_by(Submission.author_id).order_by(func.count(Submission.author_id).desc()).all() @@ -279,20 +281,11 @@ def leaderboard(v): users9 = sorted(users9, key=lambda x: x[1], reverse=True)[:25] - - - - - - if 'pcmemes.net' == request.host: users6 = users.order_by(User.basedcount.desc()).limit(10).all() - if not v or v.oldsite: template = '' - else: template = 'CHRISTMAS/' - return render_template(f"{template}leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5, users6=users6, users7=users7, users9=users9) - if not v or v.oldsite: template = '' - else: template = 'CHRISTMAS/' - return render_template(f"{template}leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5, users7=users7, users9=users9) + return render_template(f"{template}leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5, users6=users6, users7=users7, users9=users9, users10=users10) + + return render_template(f"{template}leaderboard.html", v=v, users1=users1, users2=users2, users3=users3, users4=users4, users5=users5, users7=users7, users9=users9, users10=users10) @app.get("/@/css") diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index 634ea1f4d..5d98af3c2 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -24,7 +24,7 @@
  • Users Feed
  • Shadowbanned Users
  • Users with Agendaposter Theme
    • -
  • Users by True Score
    • +
  • Currently Grassed Users

    • Safety

    diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html index b2d263f2d..5452b563f 100644 --- a/files/templates/leaderboard.html +++ b/files/templates/leaderboard.html @@ -28,7 +28,7 @@ -
    Top 20 by coins spent in shop
    +
    Top 25 by coins spent in shop
     
 
@@ -56,7 +56,35 @@
    -
    Top 15 by followers
    +
    Top 25 by truescore
    +
    +
+
+
    + + + + + + + + + + {% for user in users10 %} + + + + + + {% endfor %} + +
    #NameTruescore
    {{loop.index}}{{user[0].username}}{{user.truescore}}
    + +
    +
+
+
    +
    Top 25 by followers
     
 
@@ -81,7 +109,7 @@
    -
    Top 10 by post count
    +
    top 25 by post count
     
 
@@ -106,7 +134,7 @@
    -
    Top 10 by comment count
    +
    top 25 by comment count
     
 
@@ -133,7 +161,7 @@
    -
    Top 10 by received awards
    +
    top 25 by received awards
     
 
@@ -193,7 +221,7 @@
    -
    Top 10 by based count
    +
    top 25 by based count