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

dfMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

Browse source
This commit is contained in:
Aevann1 2022-03-24 01:00:12 +00:00
commit 1e8c9feedd
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
files/helpers/const.py
View file

@ -214,6 +214,14 @@ DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "fff").strip()
COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR}
AWARDS = {
"ghost": {
"kind": "ghost",
"title": "Ghost",
"description": "???",
"icon": "fas fa-ghost",
"color": "text-white",
"price": 3000
},
"nword": {
"kind": "nword",
"title": "Nword Pass",
@ -430,14 +438,6 @@ AWARDS = {
"color": "text-purple",
"price": 2500
},
"ghost": {
"kind": "ghost",
"title": "Ghost",
"description": "???",
"icon": "fas fa-ghost",
"color": "text-white",
"price": 3000
},
"marsey": {
"kind": "marsey",
"title": "Marsey",

4
files/routes/awards.py
View file

@ -182,7 +182,7 @@ def award_post(pid, v):
return {"error": "You can't use this award on yourself."}, 400
if v.id != author.id:
if author.deflector and AWARDS[kind]['price'] > 300 and kind not in ('pin','unpin'):
if author.deflector and AWARDS[kind]['price'] > 300 and kind not in ('pin','unpin','benefactor'):
msg = f"@{v.username} has tried to give your [post]({post.shortlink}) the {AWARDS[kind]['title']} Award but it was deflected and applied to them :marseytroll:"
send_repeatable_notification(author.id, msg)
msg = f"@{author.username} is under the effect of a deflector award; your {AWARDS[kind]['title']} Award has been deflected back to you :marseytroll:"
@ -410,7 +410,7 @@ def award_comment(cid, v):
return {"error": "Pizzashill is immune to awards."}, 403
if v.id != author.id:
if author.deflector and AWARDS[kind]['price'] > 300 and kind not in ('pin','unpin'):
if author.deflector and AWARDS[kind]['price'] > 300 and kind not in ('pin','unpin','benefactor'):
msg = f"@{v.username} has tried to give your [comment]({c.shortlink}) the {AWARDS[kind]['title']} Award but it was deflected and applied to them :marseytroll:"
send_repeatable_notification(author.id, msg)
msg = f"@{author.username} is under the effect of a deflector award; your {AWARDS[kind]['title']} Award has been deflected back to you :marseytroll:"