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

files/classes/user.py

@@ -236,7 +236,7 @@ class User(Base):
 
 	@lazy
 	def mods(self, sub):
-		return bool(g.db.query(Mod.user_id).filter_by(user_id=self.id, sub=sub).one_or_none())
+		return self.admin_level > 2 or bool(g.db.query(Mod.user_id).filter_by(user_id=self.id, sub=sub).one_or_none())
 
 	@lazy
 	def exiled_from(self, sub):

files/helpers/const.py

@@ -310,8 +310,6 @@ elif SITE == 'watchpeopledie.co':
 	CARP_ID = 14668
 	AEVANN_ID = 9
 	SNAKES_ID = 32
-
-	SIDEBAR_THREAD = 5403
 else: # localhost or testing environment implied
 	FEATURES['PRONOUNS'] = True
 	FEATURES['HOUSES'] = True

files/templates/sidebar_WPD.html

@@ -1,11 +1,10 @@
 <div class="col sidebar text-left {% if '/sidebar' not in request.path %}d-none d-lg-block{% endif %} pt-3 pb-5" {% if request.path != '/sidebar' %}id="sidebar-content"{% endif %}>
 
-	{%- set art_path = "assets/images/WPD/sidebar" -%}
+	{% set image='/i/' + SITE_NAME + '/sidebar.webp?v=3000' %}
-	{%- set art_image = "/" + art_path + "/" + listdir('files/' + art_path)|random() + '?v=45' -%}
 
 	{% if request.path != '/sidebar' %}
-		<a href="{{art_image}}">
+		<a href="{{image}}">
-			<img class="mb-4" alt="sidebar image" onclick="expandDesktopImage()" loading="lazy" src="{{art_image}}" width=100%>
+			<img class="mb-4" alt="sidebar image" onclick="expandDesktopImage()" loading="lazy" src="{{image}}" width=100%>
 		</a>
 	{% endif %}
 

files/templates/submission.html

@@ -728,7 +728,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 {% 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 %}">
+									<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 mb-3">
 										<span>{{p.realurl(v)}}</span>
 										<i class="fas fa-external-link-alt text-small"></i>
 									</div>