carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

dont april fool deleted accounts

master
Aevann 2024-11-14 20:31:54 +02:00
parent fee783b03a
commit c2dcfd08ce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/classes/user.py
View File

@ -1429,11 +1429,17 @@ class User(Base):
@property
@lazy
def switched(self):
if not IS_FOOL() or (has_request_context() and request.path in {'/notifications/modmail', '/notifications/messages'}):
if not IS_FOOL() \
or self.username.startswith('deleted~') \
or (has_request_context() and request.path in {'/notifications/modmail', '/notifications/messages'}):
return self
three_days = time.time() - 259200
return g.db.query(User).filter(User.truescore < self.truescore, User.last_active > three_days).order_by(User.truescore.desc()).first() or self
return g.db.query(User).filter(
User.truescore < self.truescore,
User.last_active > three_days,
not_(User.username.like('deleted~%')),
).order_by(User.truescore.desc()).first() or self
@property
@lazy