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

WPD: Require flairs on all posts.

master
Snakes 2022-06-25 21:01:21 -04:00
parent 7b92db114a
commit e0c3c79902
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/helpers/const.py
View File

@ -140,6 +140,7 @@ AGENDAPOSTER_MSG_HTML = """<p>Hi <a href="/id/{id}"><img loading="lazy" src="/pp
HOLE_NAME = 'hole' HOLE_NAME = 'hole'
HOLE_STYLE_FLAIR = False HOLE_STYLE_FLAIR = False
HOLE_REQUIRED = False
HOLE_COST = 0 HOLE_COST = 0
HOLE_CREATE_JL_MIN = 0 HOLE_CREATE_JL_MIN = 0
HOLE_INACTIVITY_DELETION = False HOLE_INACTIVITY_DELETION = False
@ -287,6 +288,7 @@ elif SITE == 'cringetopia.org':
elif SITE == 'watchpeopledie.co': elif SITE == 'watchpeopledie.co':
HOLE_NAME = 'flair' HOLE_NAME = 'flair'
HOLE_STYLE_FLAIR = True HOLE_STYLE_FLAIR = True
HOLE_REQUIRED = True
HOLE_CREATE_JL_MIN = 2 HOLE_CREATE_JL_MIN = 2
GIFT_NOTIF_ID = 13 GIFT_NOTIF_ID = 13

2
files/helpers/jinja2.py
View File

@ -55,6 +55,6 @@ def inject_constants():
"CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID,
"PIZZASHILL_ID":PIZZASHILL_ID, "DEFAULT_COLOR":DEFAULT_COLOR, "PIZZASHILL_ID":PIZZASHILL_ID, "DEFAULT_COLOR":DEFAULT_COLOR,
"COLORS":COLORS, "ADMIGGERS":ADMIGGERS, "datetime":datetime, "time":time, "COLORS":COLORS, "ADMIGGERS":ADMIGGERS, "datetime":datetime, "time":time,
"HOLE_NAME": HOLE_NAME, "HOLE_STYLE_FLAIR": HOLE_STYLE_FLAIR, "HOLE_NAME": HOLE_NAME, "HOLE_STYLE_FLAIR": HOLE_STYLE_FLAIR, "HOLE_REQUIRED": HOLE_REQUIRED,
"LOTTERY_ENABLED": LOTTERY_ENABLED, "GUMROAD_LINK": GUMROAD_LINK, "LOTTERY_ENABLED": LOTTERY_ENABLED, "GUMROAD_LINK": GUMROAD_LINK,
"DEFAULT_THEME": DEFAULT_THEME, "DESCRIPTION": DESCRIPTION} "DEFAULT_THEME": DEFAULT_THEME, "DESCRIPTION": DESCRIPTION}

3
files/routes/posts.py
View File

@ -729,6 +729,9 @@ def submit_post(v, sub=None):
if v.exiled_from(sub): return error(f"You're exiled from /h/{sub}") if v.exiled_from(sub): return error(f"You're exiled from /h/{sub}")
else: sub = None else: sub = None
if not sub and HOLE_REQUIRED:
return error(f"You must choose a {HOLE_NAME} for your post!")
if v.is_suspended: return error("You can't perform this action while banned.") if v.is_suspended: return error("You can't perform this action while banned.")
if v.agendaposter and not v.marseyawarded: title = torture_ap(title, v.username) if v.agendaposter and not v.marseyawarded: title = torture_ap(title, v.username)

5
files/templates/submit.html
View File

@ -83,7 +83,8 @@
<label class='mt-4' for="title">{{HOLE_NAME|capitalize}}</label> <label class='mt-4' for="title">{{HOLE_NAME|capitalize}}</label>
<div class="input-group mb2"> <div class="input-group mb2">
<input list="subs" autocomplete="off" id='sub' class="form-control" form="submitform" name="sub" oninput="savetext()" {% if sub %}value="{{sub.name}}"{% endif %} placeholder="Optional"> {%- set hole_placeholder = 'Required' if HOLE_REQUIRED else 'Optional' -%}
<input list="subs" autocomplete="off" id='sub' class="form-control" form="submitform" name="sub" oninput="savetext()" {% if sub %}value="{{sub.name}}"{% endif %} placeholder="{{hole_placeholder}}">
<datalist id="subs"> <datalist id="subs">
{% for s in SUBS %} {% for s in SUBS %}
<option value="{{s}}"></option> <option value="{{s}}"></option>
@ -92,7 +93,7 @@
</div> </div>
{% if not SITE_NAME == 'WPD' -%} {% if not HOLE_REQUIRED -%}
<div class="mt-1" style="font-size: min(3.5vw,14px)"><span style="color:#ffcccb ">WARNING</span>: Selecting a {{HOLE_NAME}} considerably reduces the number of people who will see your post. Don't select a {{HOLE_NAME}} unless that's what you want.</div> <div class="mt-1" style="font-size: min(3.5vw,14px)"><span style="color:#ffcccb ">WARNING</span>: Selecting a {{HOLE_NAME}} considerably reduces the number of people who will see your post. Don't select a {{HOLE_NAME}} unless that's what you want.</div>
{%- endif %} {%- endif %}