From 491d71a9b5a40357f97fc8e7ccbe4b4a121f803a Mon Sep 17 00:00:00 2001 From: justcool393 Date: Sat, 8 Oct 2022 10:37:44 -0700 Subject: [PATCH] add owned hats to user page per fish request --- files/routes/users.py | 10 +++++++++- files/templates/userpage.html | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/files/routes/users.py b/files/routes/users.py index 1bdaf148c..c90fc2dd2 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -994,6 +994,11 @@ def u_username(username, v=None): listing = get_posts(ids, v=v) + # this is probably totalllly inefficient but maybe someone can fix it later + total_num_of_hats = g.db.query(HatDef).filter(HatDef.submitter_id == None).count() + owned_hats = len(u.owned_hats) + owned_hats_pct = f'{owned_hats / total_num_of_hats:.0%}' + if u.unban_utc: if request.headers.get("Authorization") or request.path.endswith(".json"): return {"data": [x.json for x in listing]} @@ -1007,7 +1012,10 @@ def u_username(username, v=None): sort=sort, t=t, next_exists=next_exists, - is_following=is_following) + is_following=is_following, + owned_hats=owned_hats, + owned_hats_pct=owned_hats_pct, + total_num_of_hats=total_num_of_hats) diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 957317b37..d56cab5c6 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -253,6 +253,7 @@

Coins spent: {{u.coins_spent}}

True score: {{u.truecoins}}

Winnings: {{u.winnings}}

+

{{owned_hats}}/{{total_num_of_hats}} ({{owned_hats_pct}})

{% if u.is_private %}

User has private mode enabled

{% endif %} @@ -496,6 +497,7 @@

Coins spent: {{u.coins_spent}}

True score: {{u.truecoins}}

Winnings: {{u.winnings}}

+

{{owned_hats}}/{{total_num_of_hats}} ({{owned_hats_pct}})

{% if u.is_private %}

User has private mode enabled

{% endif %}