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

Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

master
Aevann1 2022-09-21 20:05:10 +00:00
parent b49887b771 5526bcf79d
commit 62a0712b86
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/routes/admin.py
View File

@ -552,7 +552,7 @@ def badge_grant_post(v):
try: badge_id = int(request.values.get("badge_id"))
except: abort(400)
if badge_id in {16,17,21,22,23,24,25,26,27,94,95,96,97,98,109,137} and v.id != AEVANN_ID:
if badge_id in {16,17,21,22,23,24,25,26,27,94,95,96,97,98,109,137} and v.id != AEVANN_ID and SITE != 'pcmemes.net':
abort(403)
if user.has_badge(badge_id):

6
files/routes/static.py
View File

@ -228,7 +228,11 @@ def submit_contact(v):
g.db.flush()
new_comment.top_comment_id = new_comment.id
for admin in g.db.query(User).filter(User.admin_level > 2).all():
admins = g.db.query(User).filter(User.admin_level > 2)
if SITE == 'watchpeopledie.co':
admins = admins.filter(User.id != AEVANN_ID)
for admin in admins.all():
notif = Notification(comment_id=new_comment.id, user_id=admin.id)
g.db.add(notif)

6
files/routes/users.py
View File

@ -826,7 +826,11 @@ def messagereply(v):
if c.top_comment.sentto == 2:
admins = [x[0] for x in g.db.query(User.id).filter(User.admin_level > 2, User.id != v.id).all()]
admins = g.db.query(User.id).filter(User.admin_level > 2, User.id != v.id)
if SITE == 'watchpeopledie.co':
admins = admins.filter(User.id != AEVANN_ID)
admins = [x[0] for x in admins.all()]
if parent.author.id not in admins:
admins.append(parent.author.id)