skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

big one

Browse source
This commit is contained in:
Aevann1 2022-01-06 18:46:09 +02:00
parent a297930dc7
commit 6b7e06f461
27 changed files with 87 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/classes/user.py
View file

@ -491,7 +491,7 @@ class User(Base):
def json_core(self):
now = int(time.time())
if self.is_banned and (not self.unban_utc or now < self.unban_utc):
if self.is_suspended:
return {'username': self.username,
'url': self.url,
'is_banned': True,
@ -545,7 +545,6 @@ class User(Base):
@property
@lazy
def is_suspended(self):
if self.unban_utc and self.unban_utc < time.time():
self.is_banned = 0
@ -553,7 +552,8 @@ class User(Base):
self.ban_evade = 0
g.db.add(self)
g.db.commit()
return (self.is_banned and (not self.unban_utc or self.unban_utc > time.time()))
return False
return (self.is_banned and (self.unban_utc == 0 or self.unban_utc > time.time()))
@property