Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

files/classes/comment.py

@@ -21,8 +21,11 @@ def normalize_urls_runtime(body, v):
 	
 	if v and v.reddit != 'old.reddit.com':
 		body = reddit_to_vreddit_regex.sub(rf'\1https://{v.reddit}/\2/', body)
-		if v.nitter: body = twitter_to_nitter_regex.sub(r'https://nitter.42l.fr/\1', body)
+		if v.nitter:
-		if v.imginn: body = body.replace('https://instagram.com/', 'https://imginn.com/')
+			body = body.replace('https://twitter.com/', 'https://nitter.42l.fr/')
+			body = body.replace('https://nitter.42l.fr/i/', 'https://twitter.com/i/')
+		if v.imginn:
+			body = body.replace('https://instagram.com/', 'https://imginn.com/')
 
 	return body
 

files/helpers/const.py

@@ -998,6 +998,11 @@ tiers={
 	"(JIDF Bankroller)": 6,
 	"(Rich Bich)": 7,
 	"(LlamaBean)": 1,
+	"(Victim)": 1,
+	"(Corpse)": 2,
+	"(Zombie)": 3,
+	"(Ghost)": 4,
+	"(Survivor)": 5,
 	}
 
 DISCORD_WELCOME_CHANNEL = "846509313941700618"

files/helpers/regex.py

@@ -90,8 +90,6 @@ greentext_regex = re.compile("(\n|^)>([^ >][^\n]*)", flags=re.A)
 
 ascii_only_regex = re.compile("[ -~]+", flags=re.A)
 
-twitter_to_nitter_regex = re.compile("https:\/\/twitter.com\/(\w{2,15}(\/status\/\d+[^/]*)?)", flags=re.A)
-
 reddit_to_vreddit_regex = re.compile('(^|>|")https:\/\/old.reddit.com\/(r|u)\/', flags=re.A)
 
 reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|new\.reddit.com|www\.reddit.com|i\.reddit\.com|libredd\.it|teddit\.net)\/(r|u)\/", flags=re.A)

files/routes/settings.py

@@ -900,6 +900,10 @@ def settings_pronouns_change(v):
 	if not pronouns_regex.fullmatch(pronouns):
 		return render_template("settings_profile.html", v=v, error="The pronouns you entered don't match the required format.")
 
+	bare_pronouns = pronouns.lower().replace('/', '')
+	if 'nig' in bare_pronouns: pronouns = 'BI/POC'
+	elif 'fag' in bare_pronouns: pronouns = 'cute/twink'
+
 	v.pronouns = pronouns
 	g.db.add(v)
 

files/templates/header.html

@@ -169,7 +169,7 @@
 					<a class="nav-link position-relative" href="/chat">
 						<i class="fas fa-messages" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Chat"></i>						
 						<b class="text-lg" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Users in chat right now">
-							{{cache.get(ONLINE_STR) or 0}}
+							{{cache.get(ONLINE_STR) or 1}}
 						</b>
 					</a>
 				</li>

files/templates/megathread_index.html

@@ -14,7 +14,7 @@
 	),
 	(
 		'Submit Marseys',
-		'For original Marseys or other emoji.',
+		'For original Marseys or other emojis.',
 		'fa-cat', '#ffa500',
 		'/post/16583',
 	),

files/templates/mobile_navigation_bar.html

@@ -51,7 +51,7 @@
 				<button class="col px-0 btn btn-dead m-0 pt-0" style="background: None !important; border: None;">
 						<a href="/chat" class="text-decoration-none" role="button">
 								<div class="text-center {% if request.path=='/chat' %}text-primary{% else %}text-muted{% endif %}">
-									<b class="text-lg" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Users in chat right now">{{cache.get(ONLINE_STR) or 0}}</b>
+									<b class="text-lg" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Users in chat right now">{{cache.get(ONLINE_STR) or 1}}</b>
 									<div class="text-small">Chat</div>
 								</div>
 						</a>

files/templates/search.html

@@ -6,10 +6,8 @@
 <title>Search for "{{query}}" - {{SITE_NAME}}"</title> <meta name="description" content="{{total}} result{{'s' if total != 1 else ''}}">
 {% endblock %}
 
-{% block PseudoSubmitForm %}{% endblock %}
+{% block PseudoSubmitForm %}
-
+	<form class="form-inline search flex-nowrap mx-0 mx-lg-auto mt-1" action="/search/{% if '/posts' in request.path %}posts{% elif '/comments' in request.path %}comments{% else %}users{% endif %}" method="get">
-{% block navbar %}
-	<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="/search/{% if '/posts' in request.path %}posts{% elif '/comments' in request.path %}comments{% else %}users{% endif %}" method="get" style="padding-top:42px">
 		<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{query}}">
 		<span class="input-group-append">
 			<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem;">
@@ -17,50 +15,9 @@
 			</span>
 		</span>
 	</form>
-	{% if not '/users' in request.path %}
+{% endblock %}
-		<div class="mt-5 d-flex align-items-center">
-			<div class="dropdown dropdown-actions">
-				<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					{% if t=="hour" %}<i class="fas fa-clock mr-1"></i>
-					{% elif t=="day" %}<i class="fas fa-calendar-day mr-1"></i>
-					{% elif t=="week" %}<i class="fas fa-calendar-week mr-1"></i>
-					{% elif t=="month" %}<i class="fas fa-calendar-alt mr-1"></i>
-					{% elif t=="year" %}<i class="fas fa-calendar mr-1"></i>
-					{% elif t=="all" %}<i class="fas fa-infinity mr-1"></i>
-					{% endif %}
-				{{t | capitalize}}
-				</button>
-				<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
-					{% if t != "hour" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=hour"><i class="fas fa-clock mr-2"></i>Hour</a>{% endif %}
-					{% if t != "day" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=day"><i class="fas fa-calendar-day mr-2"></i>Day</a>{% endif %}
-					{% if t != "week" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=week"><i class="fas fa-calendar-week mr-2"></i>Week</a>{% endif %}
-					{% if t != "month" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=month"><i class="fas fa-calendar-alt mr-2"></i>Month</a>{% endif %}
-					{% if t != "year" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=year"><i class="fas fa-calendar mr-2"></i>Year</a>{% endif %}
-					{% if t != "all" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=all"><i class="fas fa-infinity mr-2"></i>All</a>{% endif %}
-				</div>
-			</div>
 
-			<div class="dropdown dropdown-actions">
+{% block navbar %}
-				<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-1"></i>{% endif %}
-					{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-1"></i>{% endif %}
-					{% if sort=="new" %}<i class="fas fa-sparkles mr-1"></i>{% endif %}
-					{% if sort=="old" %}<i class="fas fa-book mr-1"></i>{% endif %}
-					{% if sort=="controversial" %}<i class="fas fa-bullhorn mr-1"></i>{% endif %}
-					{% if sort=="comments" %}<i class="fas fa-comments mr-1"></i>{% endif %}
-					{{sort | capitalize}}
-				</button>
-				<div class="dropdown-menu" aria-labelledby="dropdownMenuButton2" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
-					{% if sort != "top" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=top&t={{t}}"><i class="fas fa-arrow-alt-circle-up mr-2"></i>Top</a>{% endif %}
-					{% if sort != "bottom" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=bottom&t={{t}}"><i class="fas fa-arrow-alt-circle-down mr-2"></i>Bottom</a>{% endif %}
-					{% if sort != "new" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=new&t={{t}}"><i class="fas fa-sparkles mr-2"></i>New</a>{% endif %}
-					{% if sort != "old" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=old&t={{t}}"><i class="fas fa-book mr-2"></i>Old</a>{% endif %}
-					{% if sort != "controversial" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=controversial&t={{t}}"><i class="fas fa-bullhorn mr-2"></i>Controversial</a>{% endif %}
-					{% if sort != "comments" and "/posts" in request.path %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=comments&t={{t}}"><i class="fas fa-comments mr-2"></i>Comments</a>{% endif %}
-				</div>
-			</div>
-		</div>
-	{% endif %}
 {% endblock %}
 
 {% block content %}
@@ -77,7 +34,7 @@
 					<li class="list-inline-item"><i class="fas fa-link text-gray-400"></i></li>
 				</ul>
 			</div>
-			<div class="card-body">
+			<div class="card-body pb-2">
 				<div class="pl-md-3">
 					{% if not request.path.startswith('/search/users') %}
 						<strong>Advanced search parameters (with examples)</strong>
@@ -97,6 +54,52 @@
 					<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>
 
+					{% if not '/users' in request.path %}
+						<div class="mt-3 d-flex align-items-center" style="float:right">
+							<div class="dropdown dropdown-actions">
+								<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+									{% if t=="hour" %}<i class="fas fa-clock mr-1"></i>
+									{% elif t=="day" %}<i class="fas fa-calendar-day mr-1"></i>
+									{% elif t=="week" %}<i class="fas fa-calendar-week mr-1"></i>
+									{% elif t=="month" %}<i class="fas fa-calendar-alt mr-1"></i>
+									{% elif t=="year" %}<i class="fas fa-calendar mr-1"></i>
+									{% elif t=="all" %}<i class="fas fa-infinity mr-1"></i>
+									{% endif %}
+								{{t | capitalize}}
+								</button>
+								<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
+									{% if t != "hour" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=hour"><i class="fas fa-clock mr-2"></i>Hour</a>{% endif %}
+									{% if t != "day" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=day"><i class="fas fa-calendar-day mr-2"></i>Day</a>{% endif %}
+									{% if t != "week" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=week"><i class="fas fa-calendar-week mr-2"></i>Week</a>{% endif %}
+									{% if t != "month" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=month"><i class="fas fa-calendar-alt mr-2"></i>Month</a>{% endif %}
+									{% if t != "year" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=year"><i class="fas fa-calendar mr-2"></i>Year</a>{% endif %}
+									{% if t != "all" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort={{sort}}&t=all"><i class="fas fa-infinity mr-2"></i>All</a>{% endif %}
+								</div>
+							</div>
+
+							<div class="dropdown dropdown-actions">
+								<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+									{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-1"></i>{% endif %}
+									{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-1"></i>{% endif %}
+									{% if sort=="new" %}<i class="fas fa-sparkles mr-1"></i>{% endif %}
+									{% if sort=="old" %}<i class="fas fa-book mr-1"></i>{% endif %}
+									{% if sort=="controversial" %}<i class="fas fa-bullhorn mr-1"></i>{% endif %}
+									{% if sort=="comments" %}<i class="fas fa-comments mr-1"></i>{% endif %}
+									{{sort | capitalize}}
+								</button>
+								<div class="dropdown-menu" aria-labelledby="dropdownMenuButton2" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
+									{% if sort != "top" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=top&t={{t}}"><i class="fas fa-arrow-alt-circle-up mr-2"></i>Top</a>{% endif %}
+									{% if sort != "bottom" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=bottom&t={{t}}"><i class="fas fa-arrow-alt-circle-down mr-2"></i>Bottom</a>{% endif %}
+									{% if sort != "new" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=new&t={{t}}"><i class="fas fa-sparkles mr-2"></i>New</a>{% endif %}
+									{% if sort != "old" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=old&t={{t}}"><i class="fas fa-book mr-2"></i>Old</a>{% endif %}
+									{% if sort != "controversial" %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=controversial&t={{t}}"><i class="fas fa-bullhorn mr-2"></i>Controversial</a>{% endif %}
+									{% if sort != "comments" and "/posts" in request.path %}<a class="dropdown-item" href="?q={{query | urlencode}}&sort=comments&t={{t}}"><i class="fas fa-comments mr-2"></i>Comments</a>{% endif %}
+								</div>
+							</div>
+						</div>
+					{% endif %}
+
+
 				</div>
 			</div>
 		</div>

files/templates/submission.html

@@ -725,7 +725,7 @@
 						{% if p.realurl(v) %}
 							{% if not p.embed_url and not p.is_image %}
 								<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
-									<div class="d-flex d-md-none justify-content-between align-items-center border rounded p-2{% if p.realbody(v) %} mb-3{% endif %}">
+									<div class="d-flex {% if p.is_video or p.is_audio %}d-md-none{% endif %} justify-content-between align-items-center border rounded p-2{% if p.realbody(v) %} mb-3{% endif %}">
 										<span>{{p.realurl(v)}}</span>
 										<i class="fas fa-external-link-alt text-small"></i>
 									</div>