excise country club (#665)
This commit is contained in:
parent
b557812e07
commit
335f19f561
22 changed files with 63 additions and 199 deletions
|
@ -22,9 +22,7 @@ from files.classes.userblock import UserBlock
|
|||
from files.classes.visstate import StateMod
|
||||
from files.helpers.assetcache import assetcache_path
|
||||
from files.helpers.config.const import *
|
||||
from files.helpers.config.environment import (CARD_VIEW,
|
||||
CLUB_TRUESCORE_MINIMUM,
|
||||
DEFAULT_COLOR,
|
||||
from files.helpers.config.environment import (CARD_VIEW, DEFAULT_COLOR,
|
||||
DEFAULT_TIME_FILTER, SITE_FULL,
|
||||
SITE_ID)
|
||||
from files.helpers.security import *
|
||||
|
@ -95,7 +93,6 @@ class User(CreatedBase):
|
|||
is_banned = Column(Integer, default=0, nullable=False)
|
||||
unban_utc = Column(Integer, default=0, nullable=False)
|
||||
ban_reason = deferred(Column(String))
|
||||
club_allowed = Column(Boolean)
|
||||
login_nonce = Column(Integer, default=0, nullable=False)
|
||||
reserved = deferred(Column(String))
|
||||
coins = Column(Integer, default=0, nullable=False)
|
||||
|
@ -218,11 +215,6 @@ class User(CreatedBase):
|
|||
def is_blocking(self, target):
|
||||
return g.db.query(UserBlock).filter_by(user_id=self.id, target_id=target.id).one_or_none()
|
||||
|
||||
@property
|
||||
@lazy
|
||||
def paid_dues(self):
|
||||
return not self.shadowbanned and not (self.is_banned and not self.unban_utc) and (self.admin_level or self.club_allowed or (self.club_allowed != False and self.truescore > CLUB_TRUESCORE_MINIMUM))
|
||||
|
||||
@lazy
|
||||
def any_block_exists(self, other):
|
||||
return g.db.query(UserBlock).filter(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue