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

files/classes/comment.py

@@ -424,11 +424,13 @@ class Comment(Base):
 
 		if path == '/admin/removed/comments': return False
 
+		if f'/{self.id}' in path: return False
+
 		if self.over_18 and not (v and v.over_18) and not (self.post and self.post.over_18): return True
 
 		if self.is_banned: return True
 
-		if '?context' not in path and (self.slots_result or self.blackjack_result or self.wordle_result) and (not self.body or len(self.body_html) <= 100) and 9 > self.level > 1: return True
+		if (self.slots_result or self.blackjack_result or self.wordle_result) and (not self.body or len(self.body_html) <= 100) and 9 > self.level > 1: return True
 			
 		if v and v.filter_words and self.body and any(x in self.body for x in v.filter_words): return True
 		

files/routes/posts.py

@@ -1265,6 +1265,16 @@ def submit_post(v, sub=None):
 		post.upvotes += 3
 		g.db.add(post)
 
+	if request.host == 'rdrama.net' and post.sub == 'slackernews' and v.id != AEVANN_ID:
+		g.db.commit()
+		autovote = Vote(user_id=AEVANN_ID, submission_id=post.id, vote_type=1)
+		g.db.add(autovote)
+		v.coins += 1
+		v.truecoins += 1
+		g.db.add(v)
+		post.upvotes += 1
+		g.db.add(post)
+
 	g.db.commit()
 
 	cache.delete_memoized(frontlist)

files/templates/admin/admin_home.html

@@ -102,6 +102,10 @@
 	</div>
 
 	<button class="btn btn-primary mt-3" onclick="post_toast(this,'/admin/purge_cache');" style="margin-bottom: 2em;">PURGE CACHE</button>
+	<br>
+	{% if SITE_NAME == 'PCM' %}
+		<button class="btn btn-primary" onclick="post_toast(this,'/kippy');" style="margin-bottom: 2em;">Print 10k Marseybux</button>
+	{% endif %}
 {% endif %}
 
 <h4>Server Status</h4>

files/templates/admin/awards.html

@@ -63,8 +63,5 @@
 	</form>
 
 	<pre></pre>
-	{% if SITE == 'pcmemes.net' and v.id == KIPPY_ID %}
-		<div><a class="btn btn-danger" role="button" onclick="post_toast(this,'/kippy')">Print 10k Marseybux</a></div>
-	{% endif %}
 
 {% endblock %}

snappy_rDrama.txt

@@ -3757,7 +3757,7 @@ Laughter, like the wheezing of a thousand consumptive men. The Great Carp reared
 &gt;The Moskva will never reach the east coast of the US.<br>
 &gt;The Moskva will never ship to shore the Outer Loop and the Capitol.
 {[para]}
-DUDE i just LOVE the calm relaxation of the Midwest town, it's so PEACEFUL and makes me feel like i'm at one of my favorite FARMERS MARKETS. you should totally come on down to my rural farmhouse, it's got a MULTIPLE ACRE GRASS yard and everything, we can crack open a nice Busch Lite or eight and get crazy shooting some guns on the range! and ope, ope, OPE, we have GOTTA go down to the towny bar- listen here, right, it's a BAR where us FARMERS who do FARMING can go DRINK. BUT!!!! it’s also a BAR that doesn’t ID kids, so we can smoke cigarettes INSIDE, with dumb kids bothering us. speaking of which harper and i have just celebrated our 7th anniversary -we’re both going to her 5 year high school reunion tomorrow at the church, that way we can show off how much we spend on our THREE KIDS. OOFTA , i’m gonna SLAM this puppy chow and have some deer chislic!!!
+DUDE i just LOVE the calm relaxation of the Midwest town, it's so PEACEFUL and makes me feel like i'm at one of my favorite FARMERS MARKETS. you should totally come on down to my rural farmhouse, it's got a MULTIPLE ACRE GRASS yard and everything, we can crack open a nice Busch Lite or eight and get crazy shooting some guns on the range! and dude, dude, DUDE, we have GOTTA go down to the towny bar- listen here, right, it's a BAR where us FARMERS who do FARMING can go DRINK. BUT!!!! it’s also a BAR that doesn’t ID kids, so we can smoke cigarettes INSIDE, with dumb kids bothering us. speaking of which harper and i have just celebrated our 7th anniversary -we’re both going to her 5 year high school reunion tomorrow at the church, that way we can show off how much we spend on our THREE KIDS. OOFTA , i’m gonna SLAM this puppy chow and have some deer chislic!!!
 {[para]}
 ![](/images/16507507339621985.webp)
 {[para]}