rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

Refactor UI name of hole/sub to constant.

remotes/1693045480750635534/spooky-22
Snakes 2022-06-23 05:02:49 -04:00
parent 13ceb8818d
commit cd556b6d8e
13 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/helpers/const.py
View File

@ -138,6 +138,7 @@ AGENDAPOSTER_MSG_HTML = """<p>Hi <a href="/id/{id}"><img loading="lazy" src="/pp
### SITE SPECIFIC CONSTANTS
################################################################################
HOLE_NAME = 'hole'
HOLE_COST = 0
HOLE_CREATE_JL_MIN = 0
HOLE_INACTIVITY_DELETION = False
@ -283,6 +284,7 @@ elif SITE == 'cringetopia.org':
"7": "886781932430565418",
}
elif SITE == 'watchpeopledie.co':
HOLE_NAME = 'flair'
HOLE_CREATE_JL_MIN = 2
GIFT_NOTIF_ID = 13

4
files/helpers/jinja2.py
View File

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

12
files/routes/search.py
View File

@ -5,11 +5,13 @@ from flask import *
from files.__main__ import app
from files.helpers.regex import *
search_operator_hole = HOLE_NAME
valid_params = [
'author',
'domain',
'over18',
'hole',
search_operator_hole,
]
def searchparse(text):
@ -117,8 +119,8 @@ def searchposts(v):
)
)
if 'hole' in criteria:
posts = posts.filter(Submission.sub == criteria['hole'])
if search_operator_hole in criteria:
posts = posts.filter(Submission.sub == criteria[search_operator_hole])
if t:
now = int(time.time())
@ -203,8 +205,8 @@ def searchcomments(v):
if 'over18' in criteria: comments = comments.filter(Comment.over_18 == True)
if 'hole' in criteria:
comments = comments.filter(Submission.sub == criteria['hole'])
if search_operator_hole in criteria:
comments = comments.filter(Submission.sub == criteria[search_operator_hole])
if t:
now = int(time.time())

2
files/templates/admin/admin_home.html
View File

@ -67,7 +67,7 @@
{% if SITE_NAME == 'PCM' -%}
<li><a href="/admin/sidebar">Edit Sidebar</a></li>
{%- elif SITE_NAME == 'WPD' -%}
<li><a href="/create_hole">Create Hole</a></li>
<li><a href="/create_hole">Create {{ HOLE_NAME | capitalize }}</a></li>
{%- endif %}
</ul>
{%- endif %}

2
files/templates/header.html
View File

@ -1,6 +1,6 @@
{%- set search_placeholder = "Search" -%}
{%- if sub -%}
{%- set search_placeholder = "Search (try 'hole:" ~ sub.name ~ "')" -%}
{%- set search_placeholder = "Search (try '" ~ HOLE_NAME ~ ":" ~ sub.name ~ "')" -%}
{%- endif -%}
<nav class=" shadow-md fixed-top">

2
files/templates/search.html
View File

@ -71,7 +71,7 @@
</div>
<div class="card-body">
<div class="pl-md-3">
<div class="text-muted text-small mb-1">Advanced search parameters (with examples): "author:quadnarca", "domain:reddit.com", "over18:true", "hole:music"<div>
<div class="text-muted text-small mb-1">Advanced search parameters (with examples): "author:quadnarca", "domain:reddit.com", "over18:true", "{{HOLE_NAME}}:music"<div>
<br>
<div class="text-muted text-small mb-1">Showing {% block listinglength %}{{listing | length}}{% endblock %} of {{total}} result{{'s' if total != 1 else ''}} for</div>
<h1 class="h4 mb-0">{{query}}</h1>

18
files/templates/sidebar_Cringetopia.html
View File

@ -19,22 +19,22 @@
<div class="mb-4">{{sub.sidebar_html|safe}}</div>
{% endif %}
{% if v %}
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE HOLES</a>
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE {{HOLE_NAME|upper}}S</a>
{% if v.can_create_hole -%}
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE HOLE</a>
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE {{HOLE_NAME|upper}}</a>
{%- endif %}
{% if v.mods(sub.name) %}
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/settings">HOLE SETTINGS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/settings">{{HOLE_NAME|upper}} SETTINGS</a>
{% endif %}
{% endif %}
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/mods">HOLE MODS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/exilees">HOLE EXILEES</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/followers">HOLE FOLLOWERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/blockers">HOLE BLOCKERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/mods">{{HOLE_NAME|upper}} MODS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/exilees">{{HOLE_NAME|upper}} EXILEES</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/followers">{{HOLE_NAME|upper}} FOLLOWERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/blockers">{{HOLE_NAME|upper}} BLOCKERS</a>
{% else %}
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE HOLES</a>
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE {{HOLE_NAME|upper}}S</a>
{% if v and v.can_create_hole -%}
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE HOLE</a>
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE {{HOLE_NAME|upper}}</a>
{%- endif %}
<div class="mt-4">

14
files/templates/sidebar_PCM.html
View File

@ -11,18 +11,18 @@
<div class="mb-4">{{sub.sidebar_html|safe}}</div>
{% endif %}
{% if v and v.mods(sub.name) %}
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/settings">HOLE SETTINGS</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/settings">{{HOLE_NAME|upper}} SETTINGS</a>
{% endif %}
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/mods">HOLE MODS</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/exilees">HOLE EXILEES</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/followers">HOLE FOLLOWERS</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/blockers">HOLE BLOCKERS</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/mods">{{HOLE_NAME|upper}} MODS</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/exilees">{{HOLE_NAME|upper}} EXILEES</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/followers">{{HOLE_NAME|upper}} FOLLOWERS</a>
<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/blockers">{{HOLE_NAME|upper}} BLOCKERS</a>
{% endif %}
{% if v and v.can_create_hole -%}
<a class="btn btn-primary btn-block" href="/create_hole">CREATE HOLE</a>
<a class="btn btn-primary btn-block" href="/create_hole">CREATE {{HOLE_NAME|upper}}</a>
{%- endif %}
<a class="btn btn-primary btn-block" href="/holes">BROWSE HOLES</a>
<a class="btn btn-primary btn-block" href="/holes">BROWSE {{HOLE_NAME|upper}}S</a>
<a class="btn btn-primary btn-block mt-5" href="https://ip2.network">STREAM LIST</a>
<a class="btn btn-primary btn-block" href="/post/4103">BUGS/SUGGESTIONS MEGATHREAD</a>
<a class="btn btn-primary btn-block" href="/post/9694" >OFFICIAL CONSPIRACY THEORY THREAD</a>

10
files/templates/sidebar_WPD.html
View File

@ -21,12 +21,12 @@
<div class="mb-4">{{sub.sidebar_html|safe}}</div>
{% endif %}
{% if v and v.mods(sub.name) %}
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/settings">HOLE SETTINGS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/settings">{{HOLE_NAME|upper}} SETTINGS</a>
{% endif %}
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/mods">HOLE MODS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/exilees">HOLE EXILEES</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/followers">HOLE FOLLOWERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/blockers">HOLE BLOCKERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/mods">{{HOLE_NAME|upper}} MODS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/exilees">{{HOLE_NAME|upper}} EXILEES</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/followers">{{HOLE_NAME|upper}} FOLLOWERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/blockers">{{HOLE_NAME|upper}} BLOCKERS</a>
{% endif %}
<div id="sidebar--rules">

18
files/templates/sidebar_rDrama.html
View File

@ -63,26 +63,26 @@ set VISITORS_HERE_FLAVOR = [
<div class="mb-4">{{sub.sidebar_html|safe}}</div>
{% endif %}
{% if v %}
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE HOLES</a>
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE {{HOLE_NAME|upper}}S</a>
{% if v.can_create_hole -%}
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE HOLE</a>
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE {{HOLE_NAME|upper}}</a>
{%- endif %}
{% if v.mods(sub.name) %}
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/settings">HOLE SETTINGS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/settings">{{HOLE_NAME|upper}} SETTINGS</a>
{% endif %}
{% endif %}
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/mods">HOLE MODS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/exilees">HOLE EXILEES</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/followers">HOLE FOLLOWERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/blockers">HOLE BLOCKERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/mods">{{HOLE_NAME|upper}} MODS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/exilees">{{HOLE_NAME|upper}} EXILEES</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/followers">{{HOLE_NAME|upper}} FOLLOWERS</a>
<a class="btn btn-primary btn-block mb-3" href="/h/{{sub.name}}/blockers">{{HOLE_NAME|upper}} BLOCKERS</a>
{% else %}
<a id="sidebar--directory--btn" class="btn btn-primary btn-block mb-3" href="/directory">
<span id="sidebar--directory--head">DIRECTORY</span>
<span id="sidebar--directory--subhead">Submit Marseys & Art | Info Megathreads</span>
</a>
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE HOLES</a>
<a class="btn btn-primary btn-block mb-3" href="/holes">BROWSE {{HOLE_NAME|upper}}S</a>
{% if v and v.can_create_hole -%}
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE HOLE</a>
<a class="btn btn-primary btn-block mb-3" href="/create_hole">CREATE {{HOLE_NAME|upper}}</a>
{%- endif %}
<div class="rules mt-5">

8
files/templates/sub/create_hole.html
View File

@ -1,7 +1,7 @@
{% extends "submit.html" %}
{% block title %}
<title>Create a hole</title>
<title>Create a {{HOLE_NAME}}</title>
{% endblock %}
{% block form %}
@ -19,9 +19,9 @@
<div class="col col-md-6 p-3 py-md-0">
<h1 class="d-none d-md-block">Create a hole</h1>
<h1 class="d-none d-md-block">Create a {{HOLE_NAME}}</h1>
<h2 class="h3 d-md-none">Create a hole</h2>
<h2 class="h3 d-md-none">Create a {{HOLE_NAME}}</h2>
<div class="body">
@ -44,7 +44,7 @@
</p>
{% endif %}
<button class="btn btn-primary ml-auto" id="create_button" {% if cost > v.coins %}disabled{% endif %}>Create Hole</button>
<button class="btn btn-primary ml-auto" id="create_button" {% if cost > v.coins %}disabled{% endif %}>Create {{HOLE_NAME|capitalize}}</button>
</div>

2
files/templates/sub/subs.html
View File

@ -6,7 +6,7 @@
</pre>
<h5>List of holes</h5>
<h5>List of {{HOLE_NAME}}s</h5>
<pre></pre>
<div class="overflow-x-auto">
<table id="sortable_table" class="table table-striped mb-5">

7
files/templates/submit.html
View File

@ -80,7 +80,7 @@
<input type="hidden" name="formkey" value="{{v.formkey}}">
<label class='mt-4' for="title">Hole</label>
<label class='mt-4' for="title">{{HOLE_NAME|capitalize}}</label>
<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">
@ -91,7 +91,10 @@
</datalist>
</div>
<div class="mt-1" style="font-size: min(3.5vw,14px)"><span style="color:#ffcccb ">WARNING</span>: Selecting a hole considerably reduces the number of people who will see your post. Don't select a hole unless that's what you want.</div>
{% if not SITE_NAME == 'WPD' -%}
<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 %}
<label class='mt-4' for="title">Post Title</label>