fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/helpers/const.py

@@ -76,7 +76,6 @@ SLURS = {
 	"sheeny": "Israeli friend",
 	"sheenies": "Israeli friends",
 	"hymie": "Israeli friend",
-	"god": "Allah (SWT)",
 	"allah": "Allah (SWT)",
 	"mohammad": "Prophet Mohammad (PBUH)",
 	"muhammad": "Prophet Mohammad (PBUH)",

files/routes/front.py

@@ -177,9 +177,9 @@ def front_all(v, sub=None, subdomain=None):
 	try: lt=int(request.values.get("utc_less_than", 0))
 	except: lt=0
 
-	if SITE_NAME == 'Drama': defaultsubs = 1
-	else: defaultsubs = 2
-	subs = v.subs if v else defaultsubs
+	if v: subs = v.subs
+	elif SITE_NAME == 'Drama': subs = 1
+	else: subs = 2
 
 	ids, next_exists = frontlist(sort=sort,
 					page=page,

files/routes/votes.py

@@ -90,7 +90,7 @@ def api_vote_post(post_id, new, v):
 		post.author.truecoins += 1
 		g.db.add(post.author)
 
-		if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profileurl.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False
+		if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False
 		else: real = True
 
 		vote = Vote(user_id=v.id,
@@ -154,7 +154,7 @@ def api_vote_comment(comment_id, new, v):
 		comment.author.truecoins += 1
 		g.db.add(comment.author)
 
-		if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profileurl.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False
+		if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False
 		else: real = True
 
 		vote = CommentVote(user_id=v.id,

files/templates/award_modal.html

@@ -1,4 +1,4 @@
-<script src="/static/assets/js/award_modal.js?v=244"></script>
+<script src="/static/assets/js/award_modal.js?v=245"></script>
 <div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered awardmodal my-5" role="document">
 		<div class="modal-content">

files/templates/default.html

@@ -233,7 +233,7 @@
 				<img alt="/h/{{sub.name}} banner" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{sub.banner_url}}')" loading="lazy" src="{{sub.banner_url}}" width=100% style="object-fit:cover;max-height:25vw">
 			{% elif SITE_NAME == 'Drama' %}
 				{% set path = "assets/images/" + SITE_NAME + "/banners" %}
-				{% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=22' %}
+				{% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=23' %}
 
 				<a href="https://secure.transequality.org/site/Donation2?df_id=1480">
 					<img alt="site banner" src="{{image}}" width="100%">

files/templates/emoji_modal.html

@@ -94,4 +94,4 @@
 	</div>
 </div>
 
-<script src="/static/assets/js/emoji_modal.js?v=260"></script>
+<script src="/static/assets/js/emoji_modal.js?v=261"></script>

files/templates/oauth.html

@@ -11,15 +11,6 @@
 		<h1 class="h2">{{application.app_name}}</h1>
 
 		<p class="mb-md-5">wants to access your @{{v.username}} account.</p>
-		<p>It will be able to:</p>
-		<ul>
-		{% for scope in scopes %}
-				<li>{{SCOPES[scope]}}</li>
-		{% endfor %}
-		{% if permanent %}
-		<li>Maintain this access indefinitely, or until you revoke it</li>
-		{% endif %}
-		</ul>
 
 		<p class="mb-md-5">It will not be able to see your password, or change your account settings.</p>
 

files/templates/sidebar_Drama.html

@@ -4,7 +4,7 @@
 		{% set image=sub.sidebar_url %}
 	{% else %}
 		{% set path = "assets/images/" + SITE_NAME + "/sidebar" %}
-		{% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=35' %}
+		{% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=36' %}
 	{% endif %}
 
 	<img class="mb-4" alt="sidebar image" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{image}}')" loading="lazy" src="{{image}}" width=100%>