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

files/assets/css/main.css

@@ -6246,4 +6246,8 @@ blockquote + blockquote, blockquote:last-child {
 
 #searchparams-dropdown {
 	z-index: 100;
+}
+.contain {
+	-o-object-fit: contain;
+	object-fit: contain;
 }

files/routes/admin.py

@@ -531,7 +531,7 @@ def badge_grant_post(v):
 	try: badge_id = int(request.values.get("badge_id"))
 	except: abort(400)
 
-	if badge_id in {16,17,94,95,96,97,98,109,137} and v.id != AEVANN_ID:
+	if badge_id in {16,17,21,22,23,24,25,26,27,94,95,96,97,98,109,137} and v.id != AEVANN_ID:
 		abort(403)
 
 	if user.has_badge(badge_id):

files/templates/admin/badge_grant.html

@@ -60,7 +60,11 @@
 			<label class="custom-control-label" for="{{badge.id}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=64.16></label></td>
+	<td>
+		<label for="badge-{{badge.id}}">
+			<img class="contain" alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=64.16 height=70>
+		</label>
+	</td>
 	<td>{{badge.name}}</td>
 	<td>{{badge.description}}</td>
 </tr>

files/templates/admin/badge_remove.html

@@ -60,7 +60,11 @@
 			<label class="custom-control-label" for="{{badge.id}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=64.16></label></td>
+	<td>
+		<label for="badge-{{badge.id}}">
+			<img class="contain" alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=64.16 height=70>
+		</label>
+	</td>
 	<td>{{badge.name}}</td>
 	<td>{{badge.description}}</td>
 </tr>

files/templates/badges.html

@@ -27,7 +27,9 @@
 			<tr>
 				<td>{{loop.index}}</td>
 				<td>{{badge.name}}</td>
-				<td><img alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=45.83>
+				<td>
+					<img class="contain" alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=45.83 height=50>
+				</td>
 				<td>{{badge.description}}</td>
 				{%- set ct = counts[badge.id] if badge.id in counts else (0, 0) %}
 				<td class="badges-rarity-qty"><a href="/badge_owners/{{badge.id}}">{{ ct[0] }}</a></td>

files/templates/comments.html

@@ -945,10 +945,14 @@
 	<div id="viewmore-{{offset}}"><button id="viewbtn" class="btn btn-primary" onclick="viewmore({{pid}},'{{sort}}',{{offset}},{{ids}})">VIEW MORE COMMENTS</a></div>
 {% endif %}
 
-{% if SITE == 'rdrama.net' and not ajax and v and v.theme == 'midnight' and 'SamsungBrowser' not in g.agent %}
+{% if SITE_NAME == 'rDrama' and not ajax and v and 'SamsungBrowser' not in g.agent %}
 	<script>
+		const element = document.getElementsByClassName('comment-section')[0];
+		let color = getComputedStyle(element).getPropertyValue('background-color');
+		color = 'rgba' + color.slice(3,-1) + ', 0.1)'
+
 		const markTemplate = (name) => {
-			return `<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='50px' height='50px'><text transform='translate(10, 50) rotate(-45)' fill='rgba(45,45,45,0.1)' font-size='20'>${name}</text></svg>`;
+			return `<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='50px' height='50px'><text transform='translate(10, 50) rotate(-45)' fill='${color}' font-size='20'>${name}</text></svg>`;
 		};
 		const base64Mark = btoa(markTemplate("{{v.id}}"));
 		

files/templates/patrons.html

@@ -13,8 +13,9 @@
 	<tr>
 		<td>{{loop.index}}</td>
 		<td><a style="color:#{{u.namecolor}}" href="/@{{u.username}}"><img loading="lazy" src="{{u.profile_url}}" class="pp20"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></a></td>
-
+		<td>
-		<td><img alt="2{{u.patron}}" loading="lazy" width=29.33 src="{{asset_siteimg('patron_badges/', '2'+u.patron|string+'.webp')}}"></td>
+			<img class="contain" alt="2{{u.patron}}" loading="lazy" width=29.33 height=32 src="{{asset_siteimg('patron_badges/', '2'+u.patron|string+'.webp')}}">
+		</td>
 	</tr>
 {% endfor %}
 </table>

files/templates/userpage.html

@@ -366,9 +366,11 @@
 				<div id="profile--badges">
 					{% for b in u.badges %}
 						{% if b.url %}
-							<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=55 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}></a>
+							<a class="contain" rel="nofollow noopener noreferrer" href="{{b.url}}">
+								<img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
+							</a>
 						{% else %}
-							<img alt="{{b.name}}" width=55 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
+							<img class="contain" alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
 						{% endif %}
 					{% endfor %}
 				</div>
@@ -514,9 +516,11 @@
 				<div class="mb-3" id="profile-mobile--badges">
 					{% for b in u.badges %}
 						{% if b.url %}
-							<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=29.33 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}></a>
+							<a rel="nofollow noopener noreferrer" href="{{b.url}}">
+								<img class="contain" alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
+							</a>
 						{% else %}
-							<img alt="{{b.name}}" width=29.33 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
+							<img class="contain" alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
 						{% endif %}
 					{% endfor %}
 				</div>

files/templates/util/assetcache.html

@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 486,
+	'css/main.css': 487,
 	'css/catalog.css': 2,
 
 	'css/4chan.css': 61,