diff --git a/files/helpers/const.py b/files/helpers/const.py index 012675a09..a40d4dd74 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -5,18 +5,6 @@ SITE = environ.get("DOMAIN", '').strip() SITE_NAME = environ.get("SITE_NAME", '').strip() AJ_REPLACEMENTS = { - ':': '', - "'": '', - '-': '', - '.': '', - '!': '', - '"': '', - ';': '', - - 'their': '$#3$1', - 'there': 'their', - '$#3$1': 'there', - "you're": '$#3$2', 'your': "you're", '$#3$2': 'your', @@ -24,15 +12,6 @@ AJ_REPLACEMENTS = { "too": '$#3$3', 'to': "too", '$#3$3': 'to', - - '$#3$3': 'to', - '$#3$3': 'to', - '$#3$3': 'to', - - 'she': 'they', - 'her': 'they', - 'he': 'they', - 'him': 'they', } SLURS = { @@ -434,32 +413,48 @@ AWARDS = { "title": "Snow", "description": "???", "icon": "fas fa-snowflake", - "color": "text-gray", + "color": "text-blue-200", + "price": 300 + }, + "gingerbread": { + "kind": "gingerbread", + "title": "Gingerbread", + "description": "???", + "icon": "fas fa-gingerbread-man", + "color": "", + "price": 300 + }, + "lights": { + "kind": "lights", + "title": "Lights", + "description": "???", + "icon": "fad fa-lights-holiday", + "color": "", "price": 300 }, "candycane": { "kind": "candycane", "title": "Candy Cane", "description": "???", - "icon": "fas fa-candy-cane", - "color": "text-gray", - "price": 500 + "icon": "fad fa-candy-cane", + "color": "", + "price": 400 + }, + "fireplace": { + "kind": "fireplace", + "title": "Fireplace", + "description": "???", + "icon": "fad fa-fireplace", + "color": "", + "price": 600 }, "mistletoe": { "kind": "mistletoe", "title": "Mistletoe", "description": "???", "icon": "fas fa-mistletoe", - "color": "text-gray", - "price": 600 - }, - "mariah": { - "kind": "mariah", - "title": "Mariah", - "description": "???", - "icon": "fas fa-music", - "color": "text-gray", - "price": 800 + "color": "", + "price": 1000 }, "haunt": { "kind": "haunt", @@ -669,41 +664,58 @@ AWARDS = { "color": "text-gold", "price": 50000 }, + +} + +AWARDS2 = { "snow": { "kind": "snow", "title": "Snow", "description": "???", "icon": "fas fa-snowflake", - "color": "text-gray", + "color": "text-blue-200", + "price": 300 + }, + "gingerbread": { + "kind": "gingerbread", + "title": "Gingerbread", + "description": "???", + "icon": "fas fa-gingerbread-man", + "color": "", + "price": 300 + }, + "lights": { + "kind": "lights", + "title": "Lights", + "description": "???", + "icon": "fad fa-lights-holiday", + "color": "", "price": 300 }, "candycane": { "kind": "candycane", "title": "Candy Cane", "description": "???", - "icon": "fas fa-candy-cane", - "color": "text-gray", - "price": 500 + "icon": "fad fa-candy-cane", + "color": "", + "price": 400 + }, + "fireplace": { + "kind": "fireplace", + "title": "Fireplace", + "description": "???", + "icon": "fad fa-fireplace", + "color": "", + "price": 600 }, "mistletoe": { "kind": "mistletoe", "title": "Mistletoe", "description": "???", "icon": "fas fa-mistletoe", - "color": "text-gray", - "price": 600 + "color": "", + "price": 1000 }, - "mariah": { - "kind": "mariah", - "title": "Mariah", - "description": "???", - "icon": "fas fa-music", - "color": "text-gray", - "price": 800 - }, -} - -AWARDS2 = { "shit": { "kind": "shit", "title": "Shit", @@ -856,30 +868,6 @@ AWARDS2 = { "color": "text-gold", "price": 50000 }, - "snow": { - "kind": "snow", - "title": "Snow", - "description": "???", - "icon": "fas fa-snowflake", - "color": "text-gray", - "price": 300 - }, - "mistletoe": { - "kind": "mistletoe", - "title": "Mistletoe", - "description": "???", - "icon": "fas fa-mistletoe", - "color": "text-gray", - "price": 600 - }, - "mariah": { - "kind": "mariah", - "title": "Mariah", - "description": "???", - "icon": "fas fa-music", - "color": "text-gray", - "price": 800 - }, } TROLLTITLES = [ diff --git a/files/routes/awards.py b/files/routes/awards.py index da4768b14..f6f8a4801 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -48,6 +48,60 @@ AWARDS3 = { @auth_required def shop(v): AWARDS = { + "snow": { + "kind": "snow", + "title": "Snow", + "description": "???", + "icon": "fas fa-snowflake", + "color": "text-blue-200", + "owned": 0, + "price": 300 + }, + "gingerbread": { + "kind": "gingerbread", + "title": "Gingerbread", + "description": "???", + "icon": "fas fa-gingerbread-man", + "color": "", + "owned": 0, + "price": 300 + }, + "lights": { + "kind": "lights", + "title": "Lights", + "description": "???", + "icon": "fad fa-lights-holiday", + "color": "", + "owned": 0, + "price": 300 + }, + "candycane": { + "kind": "candycane", + "title": "Candy Cane", + "description": "???", + "icon": "fad fa-candy-cane", + "color": "", + "owned": 0, + "price": 400 + }, + "fireplace": { + "kind": "fireplace", + "title": "Fireplace", + "description": "???", + "icon": "fad fa-fireplace", + "color": "", + "owned": 0, + "price": 600 + }, + "mistletoe": { + "kind": "mistletoe", + "title": "Mistletoe", + "description": "???", + "icon": "fas fa-mistletoe", + "color": "", + "owned": 0, + "price": 1000 + }, "shit": { "kind": "shit", "title": "Shit", @@ -219,42 +273,6 @@ def shop(v): "owned": 0, "price": 50000 }, - "snow": { - "kind": "snow", - "title": "Snow", - "description": "???", - "icon": "fas fa-snowflake", - "color": "text-gray", - "owned": 0, - "price": 300 - }, - "candycane": { - "kind": "candycane", - "title": "Candy Cane", - "description": "???", - "icon": "fas fa-candy-cane", - "color": "text-gray", - "owned": 0, - "price": 500 - }, - "mistletoe": { - "kind": "mistletoe", - "title": "Mistletoe", - "description": "???", - "icon": "fas fa-mistletoe", - "color": "text-gray", - "owned": 0, - "price": 600 - }, - "mariah": { - "kind": "mariah", - "title": "Mariah", - "description": "???", - "icon": "fas fa-music", - "color": "text-gray", - "owned": 0, - "price": 800 - }, } for useraward in g.db.query(AwardRelationship).filter(AwardRelationship.user_id == v.id, AwardRelationship.submission_id == None, AwardRelationship.comment_id == None).all(): @@ -282,6 +300,54 @@ def shop(v): @validate_formkey def buy(v, award): AWARDS = { + "snow": { + "kind": "snow", + "title": "Snow", + "description": "???", + "icon": "fas fa-snowflake", + "color": "text-blue-200", + "price": 300 + }, + "gingerbread": { + "kind": "gingerbread", + "title": "Gingerbread", + "description": "???", + "icon": "fas fa-gingerbread-man", + "color": "", + "price": 300 + }, + "lights": { + "kind": "lights", + "title": "Lights", + "description": "???", + "icon": "fad fa-lights-holiday", + "color": "", + "price": 300 + }, + "candycane": { + "kind": "candycane", + "title": "Candy Cane", + "description": "???", + "icon": "fad fa-candy-cane", + "color": "", + "price": 400 + }, + "fireplace": { + "kind": "fireplace", + "title": "Fireplace", + "description": "???", + "icon": "fad fa-fireplace", + "color": "", + "price": 600 + }, + "mistletoe": { + "kind": "mistletoe", + "title": "Mistletoe", + "description": "???", + "icon": "fas fa-mistletoe", + "color": "", + "price": 1000 + }, "shit": { "kind": "shit", "title": "Shit", @@ -434,38 +500,6 @@ def buy(v, award): "color": "text-gold", "price": 50000 }, - "snow": { - "kind": "snow", - "title": "Snow", - "description": "???", - "icon": "fas fa-snowflake", - "color": "text-gray", - "price": 300 - }, - "candycane": { - "kind": "candycane", - "title": "Candy Cane", - "description": "???", - "icon": "fas fa-candy-cane", - "color": "text-gray", - "price": 500 - }, - "mistletoe": { - "kind": "mistletoe", - "title": "Mistletoe", - "description": "???", - "icon": "fas fa-mistletoe", - "color": "text-gray", - "price": 600 - }, - "mariah": { - "kind": "mariah", - "title": "Mariah", - "description": "???", - "icon": "fas fa-music", - "color": "text-gray", - "price": 800 - }, } if award not in AWARDS: abort(400)