diff --git a/files/helpers/awards.py b/files/helpers/awards.py index 4c33422d2..3c6a6a770 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -17,7 +17,7 @@ def award_timers(v, bot=False): if v.patron_utc and v.patron_utc < now: v.patron = 0 v.patron_utc = 0 - notify_if_not_bot("Your paypig status has expired!") + notify_if_not_bot(f"Your {patron} status has expired!") if not bot and v.discord_id: remove_role(v, "1") dirty = True if v.unban_utc and v.unban_utc < now: diff --git a/files/helpers/const.py b/files/helpers/const.py index 1ee49d656..fc75bb607 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -19,6 +19,9 @@ if SITE == 'pcmemes.net': CC = "SPLASH MOUNTAIN" else: CC = "COUNTRY CLUB" CC_TITLE = CC.title() +if SITE_NAME == 'rDrama': patron = 'Paypig' +else: patron = 'Patron' + AJ_REPLACEMENTS = { ' your ': " you're ", ' to ': " too ", @@ -316,7 +319,7 @@ elif SITE == 'pcmemes.net': elif SITE == 'watchpeopledie.co': PERMS['HOLE_CREATE'] = 2 - FEATURES['PROCOINS'] = False + FEATURES['PROCOINS'] = True HOLE_NAME = 'flair' HOLE_STYLE_FLAIR = True @@ -689,7 +692,7 @@ AWARDS = { "benefactor": { "kind": "benefactor", "title": "Benefactor", - "description": "Grants one month of paypig status and 2500 marseybux to the recipient. Cannot be used on yourself.", + "description": f"Grants one month of {patron} status and 2500 marseybux to the recipient. Cannot be used on yourself.", "icon": "fas fa-gift", "color": "text-blue", "price": 4000 @@ -857,8 +860,6 @@ FACTCHECK_REPLIES = ('Factcheck: This claim has been co EIGHTBALL_REPLIES = ('The 8-Ball Says: It is certain.', 'The 8-Ball Says: It is decidedly so.', 'The 8-Ball Says: Without a doubt.', 'The 8-Ball Says: Yes definitely.', 'The 8-Ball Says: You may rely on it.', 'The 8-Ball Says: As I see it, yes.', 'The 8-Ball Says: Most likely.', 'The 8-Ball Says: Outlook good.', 'The 8-Ball Says: Yes.', 'The 8-Ball Says: Signs point to yes.', 'The 8-Ball Says: Reply hazy, try again.', 'The 8-Ball Says: Ask again later.', 'The 8-Ball Says: Better not tell you now.', 'The 8-Ball Says: Cannot predict now.', 'The 8-Ball Says: Concentrate and ask again.', 'The 8-Ball Says: Don’t count on it.', 'The 8-Ball Says: My reply is no.', 'The 8-Ball Says: My sources say no.', 'The 8-Ball Says: Outlook not so good.', 'The 8-Ball Says: Very doubtful.') -if SITE_NAME == 'rDrama': patron = 'Paypig' -else: patron = 'Patron' NOTIF_MODACTION_JL_MIN = 2 diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py index 84c590c63..391b198a4 100644 --- a/files/helpers/jinja2.py +++ b/files/helpers/jinja2.py @@ -58,4 +58,4 @@ def inject_constants(): "LOTTERY_ENABLED": LOTTERY_ENABLED, "GUMROAD_LINK": GUMROAD_LINK, "DEFAULT_THEME": DEFAULT_THEME, "DESCRIPTION": DESCRIPTION, "has_sidebar": has_sidebar, "has_logo": has_logo, "has_app": has_app, - "FP": FP, "NOTIF_MODACTION_JL_MIN": NOTIF_MODACTION_JL_MIN, "cache": cache, "ONLINE_STR": f'{SITE}_online'} + "FP": FP, "NOTIF_MODACTION_JL_MIN": NOTIF_MODACTION_JL_MIN, "cache": cache, "ONLINE_STR": f'{SITE}_online', "patron": patron} diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html index 773d304c9..82ba0d522 100644 --- a/files/templates/settings_security.html +++ b/files/templates/settings_security.html @@ -45,7 +45,7 @@