diff --git a/files/classes/hats.py b/files/classes/hats.py index 25fcbb45c..a90f72136 100644 --- a/files/classes/hats.py +++ b/files/classes/hats.py @@ -2,6 +2,7 @@ from sqlalchemy import * from sqlalchemy.orm import relationship from files.__main__ import Base from files.helpers.lazy import lazy +from files.helpers.regex import censor_slurs from flask import g class HatDef(Base): @@ -20,6 +21,10 @@ class HatDef(Base): def number_sold(self): return g.db.query(Hat).filter_by(hat_id=self.id).count() + @lazy + def censored_description(self, v): + return censor_slurs(self.description, v) + class Hat(Base): __tablename__ = "hats" diff --git a/files/classes/user.py b/files/classes/user.py index b738d2db1..db1502ad8 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -665,9 +665,8 @@ class User(Base): return '' - @property @lazy - def hat_tooltip(self): + def hat_tooltip(v, self): if not FEATURES['HATS']: return '' @@ -675,7 +674,7 @@ class User(Base): return "I've spent another year rotting my brain with dramaposting, please ridicule me 🤓" if self.equipped_hat_id: - return self.equipped_hat.description + return self.equipped_hat.censored_description(v) return '' diff --git a/files/templates/comments.html b/files/templates/comments.html index 0d47e1cb7..8f9b630fd 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -212,7 +212,7 @@