rDrama
/
rDrama
9
10
Fork 6
Code Issues Pull Requests Packages Releases Wiki Activity

House Edgy creation #140

Closed
TheDunceonMaster wants to merge 3 commits from <deleted>:master into master
pull from: <deleted>:master
merge into: rDrama:master
Conversation 0 Commits 3 Files Changed 2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/helpers/config/const.py
View File

@ -332,6 +332,7 @@ if SITE_NAME == 'rDrama':
'chudrama',
'wallstreetbets',
'lit',
'edgy',
}
REDDIT_NOTIFS_SITE.add('marsey')
@ -760,6 +761,8 @@ if SITE == 'rdrama.net':
' capy': AEVANN_ID,
'carp': CARP_ID,
'clit': CARP_ID,
'morbius': CARP_ID,
'radjeesh': CARP_ID,
'snakes': SNAKES_ID,
'sneks': SNAKES_ID,
'snekky': SNAKES_ID,
@ -905,7 +908,7 @@ else: # localhost or testing environment implied
FEATURES['USERS_PERMANENT_WORD_FILTERS'] = True
SUB_BANNER_LIMIT = 69420
HOUSES = ("None","Furry","Femboy","Vampire","Racist") if FEATURES['HOUSES'] else ("None")
HOUSES = ("None","Furry","Femboy","Vampire","Racist","Edgy") if FEATURES['HOUSES'] else ("None")
bots = {AUTOJANNY_ID, SNAPPY_ID, LONGPOSTBOT_ID, ZOZBOT_ID}

2
files/helpers/stats.py
View File

@ -140,10 +140,12 @@ def stats(site=None):
"House femboy members": "{:,}".format(g.db.query(User).filter(User.house.like('Femboy%')).count()),
"House vampire members": "{:,}".format(g.db.query(User).filter(User.house.like('Vampire%')).count()),
"House racist members": "{:,}".format(g.db.query(User).filter(User.house.like('Racist%')).count()),
"House edgy members": "{:,}".format(g.db.query(User).filter(User.house.like('Edgy%')).count()),
"House furry total truescore": "{:,}".format(g.db.query(func.sum(User.truescore)).filter(User.house.like('Furry%')).scalar() or 0),
"House femboy total truescore": "{:,}".format(g.db.query(func.sum(User.truescore)).filter(User.house.like('Femboy%')).scalar() or 0),
"House vampire total truescore": "{:,}".format(g.db.query(func.sum(User.truescore)).filter(User.house.like('Vampire%')).scalar() or 0),
"House racist total truescore": "{:,}".format(g.db.query(func.sum(User.truescore)).filter(User.house.like('Racist%')).scalar() or 0),
"House edgy total truescore": "{:,}".format(g.db.query(func.sum(User.truescore)).filter(User.house.like('Edgy%')).scalar() or 0),
}
stats.update(stats2)