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

files/classes/user.py

@@ -616,6 +616,9 @@ class User(Base):
 
 		if self.is_cakeday:
 			return 'cakeday-1'
+		elif SITE_NAME == 'rDrama': # temporary branch for flowercrown event
+			flowercrowns = ['01','02','03','04','05','06','07','08','09','10','11','12','13','14','15']
+			return 'flowercrown-' + random.choice(flowercrowns)
 		return ''
 
 	@property

files/helpers/const.py

@@ -318,6 +318,7 @@ elif SITE == 'pcmemes.net':
 	LOTTERY_SINK_RATE = -8
 elif SITE == 'watchpeopledie.co':
 	PERMS['HOLE_CREATE'] = 2
+	PERMS['CONTENT_THREADS'] = 2
 
 	FEATURES['PROCOINS'] = False
 
@@ -333,6 +334,8 @@ elif SITE == 'watchpeopledie.co':
 	CARP_ID = 14668
 	AEVANN_ID = 9
 	SNAKES_ID = 32
+
+	SIDEBAR_THREAD = 5403
 elif SITE == 'lgbdropthet.com':
 	PERMS['HOLE_CREATE'] = 3
 	PERMS['VOTES_VISIBLE'] = 2

files/routes/users.py

@@ -887,7 +887,8 @@ def following(username, v):
 @app.get("/views")
 @auth_required
 def visitors(v):
-	if v.admin_level < 2 and not v.patron: return render_template("errors/patron.html", v=v)
+	if v.admin_level < 2 and (not v.patron and SITE_NAME != 'WPD'):
+		return render_template("errors/patron.html", v=v)
 	viewers=sorted(v.viewers, key = lambda x: x.last_view_utc, reverse=True)
 	return render_template("viewers.html", v=v, viewers=viewers)
 

files/templates/sidebar_WPD.html

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