diff --git a/drama/classes/user.py b/drama/classes/user.py index dc00ad58d..3b8ff0225 100644 --- a/drama/classes/user.py +++ b/drama/classes/user.py @@ -295,6 +295,21 @@ class User(Base, Stndrd, Age_times): return f"Unban in {text}" + @property + @lazy + def display_awards(self): + + _awards = {} + + for a in self.awards: + if a.kind in _awards: + _awards[a.kind]['count'] += 1 + else: + _awards[a.kind] = a.type + _awards[a.kind]['count'] = 1 + + return list(_awards.values()) + @property @lazy def post_notifications_count(self): diff --git a/drama/templates/patrons.html b/drama/templates/patrons.html index f4b409198..735118ed0 100644 --- a/drama/templates/patrons.html +++ b/drama/templates/patrons.html @@ -7,8 +7,7 @@ # Name Tier - Shit awards - Ban awards + Awards {% for user in users %} @@ -18,9 +17,14 @@ - {% if user.shitawards %}{{user.shitawards}}{% endif %} - - {% if user.banawards %}{{user.banawards}}{% endif %} + + {% for a in user.display_awards %} + + + {{ a['count'] }} + + {% endfor %} + {% endfor %}