From 50732582585e6267cb506e5289d316a63ed089bb Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 22 Jun 2022 18:17:26 +0200 Subject: [PATCH 1/4] try to fix marseybux prinitng on PCM --- files/templates/admin/admin_home.html | 4 ++++ files/templates/admin/awards.html | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index 4090395ba..c7cbe3745 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -102,6 +102,10 @@ +
+ {% if SITE_NAME == 'PCM' %} + + {% endif %} {% endif %}

Server Status

diff --git a/files/templates/admin/awards.html b/files/templates/admin/awards.html index 0e6ff1cde..a7b488672 100644 --- a/files/templates/admin/awards.html +++ b/files/templates/admin/awards.html @@ -63,8 +63,5 @@ 

-	{% if SITE == 'pcmemes.net' and v.id == KIPPY_ID %}
-		
Print 10k Marseybux

-	{% endif %}
 
 {% endblock %}
\ No newline at end of file

From 9ecca715fdac46c6d4b4603468bd68e9fec7d097 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 22 Jun 2022 18:25:11 +0200
Subject: [PATCH 2/4] don't collapse the comment the user is viewing

---
 files/classes/comment.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/classes/comment.py b/files/classes/comment.py
index 145d0b6bb..72f866d54 100644
--- a/files/classes/comment.py
+++ b/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
 		

From 91d77259979ccc4f034afe015f7eb950d5787a56 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 22 Jun 2022 18:28:59 +0200
Subject: [PATCH 3/4] make me autoupvote posts in slackernews

---
 files/routes/posts.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index bc0c72ef0..5879c8042 100644
--- a/files/routes/posts.py
+++ b/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)

From 8628e30aa5528acc7b0055e4ea464269c2184c15 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 22 Jun 2022 18:32:02 +0200
Subject: [PATCH 4/4] "ope" -> "dude" in snappy

---
 snappy_rDrama.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt
index 643fa8273..91fb74137 100644
--- a/snappy_rDrama.txt
+++ b/snappy_rDrama.txt
@@ -3757,7 +3757,7 @@ Laughter, like the wheezing of a thousand consumptive men. The Great Carp reared
 >The Moskva will never reach the east coast of the US.

 >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]}