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-10-11 19:13:53 +02:00
parent 55eabc0871 71759e6afa
commit 96cdda57f7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
files/assets/images/rDrama/sidebar/820.webp 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

6
files/routes/awards.py
View File

@ -250,7 +250,7 @@ def award_thing(v, thing_type, id):
g.db.add(thing) g.db.add(thing)
elif kind == "agendaposter" and not (author.agendaposter and author.agendaposter == 0): elif kind == "agendaposter" and not (author.agendaposter and author.agendaposter == 0):
if author.marseyawarded: if author.marseyawarded:
abort(400, "This user is under the effect of a conflicting award: Marsey award.") abort(409, "This user is under the effect of a conflicting award: Marsey award.")
if author.agendaposter and time.time() < author.agendaposter: author.agendaposter += 86400 if author.agendaposter and time.time() < author.agendaposter: author.agendaposter += 86400
else: author.agendaposter = int(time.time()) + 86400 else: author.agendaposter = int(time.time()) + 86400
@ -280,13 +280,13 @@ def award_thing(v, thing_type, id):
badge_grant(user=author, badge_id=98) badge_grant(user=author, badge_id=98)
elif kind == "pizzashill": elif kind == "pizzashill":
if author.bird: if author.bird:
abort(400, "This user is under the effect of a conflicting award: Bird Site award.") abort(409, "This user is under the effect of a conflicting award: Bird Site award.")
if author.longpost: author.longpost += 86400 if author.longpost: author.longpost += 86400
else: author.longpost = int(time.time()) + 86400 else: author.longpost = int(time.time()) + 86400
badge_grant(user=author, badge_id=97) badge_grant(user=author, badge_id=97)
elif kind == "bird": elif kind == "bird":
if author.longpost: if author.longpost:
abort(400, "This user is under the effect of a conflicting award: Pizzashill award.") abort(409, "This user is under the effect of a conflicting award: Pizzashill award.")
if author.bird: author.bird += 86400 if author.bird: author.bird += 86400
else: author.bird = int(time.time()) + 86400 else: author.bird = int(time.time()) + 86400
badge_grant(user=author, badge_id=95) badge_grant(user=author, badge_id=95)