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

files/helpers/const.py

@@ -762,4 +762,6 @@ YOUTUBE_KEY = environ.get("YOUTUBE_KEY", "").strip()
 
 ADMIGGERS = (37696,37697,37749,37833,37838)
 
-proxies = {"http":"http://127.0.0.1:18080","https":"http://127.0.0.1:18080"}
+proxies = {"http":"http://127.0.0.1:18080","https":"http://127.0.0.1:18080"}
+
+blackjack = environ.get("BLACKJACK", "").strip()

files/routes/admin.py

@@ -1157,11 +1157,11 @@ def ban_user(user_id, v):
 			x.ban(admin=v, reason=passed_reason, days=days)
 
 	if days:
-		if reason: text = f"Your account has been banned for **{days}** days for the following reason:\n\n> {reason}"
-		else: text = f"Your account has been banned for **{days}** days."
+		if reason: text = f"@{v.username} has banned you for **{days}** days for the following reason:\n\n> {reason}"
+		else: text = f"@{v.username} has banned you for **{days}** days."
 	else:
-		if reason: text = f"Your account has been permanently banned for the following reason:\n\n> {reason}"
-		else: text = "Your account has been permanently banned."
+		if reason: text = f"@{v.username} has banned you permanently for the following reason:\n\n> {reason}"
+		else: text = f"@{v.username} has banned you permanently."
 
 	send_repeatable_notification(user.id, text)
 	

files/routes/comments.py

@@ -401,6 +401,11 @@ def api_comment(v):
 	g.db.add(c)
 	g.db.flush()
 
+	if blackjack and blackjack in c.body.lower():
+		v.shadowbanned = 'AutoJanny'
+		notif = Notification(comment_id=c.id, user_id=CARP_ID)
+		g.db.add(notif)
+
 	if c.level == 1: c.top_comment_id = c.id
 	else: c.top_comment_id = parent.top_comment_id
 
@@ -805,6 +810,14 @@ def edit_comment(cid, v):
 		c.body = body[:10000]
 		c.body_html = body_html
 
+		if blackjack and blackjack in c.body.lower():
+			v.shadowbanned = 'AutoJanny'
+			g.db.add(v)
+			notif = g.db.query(Notification).filter_by(comment_id=c.id, user_id=CARP_ID).one_or_none()
+			if not notif:
+				notif = Notification(comment_id=c.id, user_id=CARP_ID)
+				g.db.add(notif)
+
 		if v.agendaposter and not v.marseyawarded and AGENDAPOSTER_PHRASE not in c.body.lower():
 
 			c.is_banned = True

files/routes/posts.py

@@ -520,6 +520,11 @@ def edit_post(pid, v):
 
 		p.body = body
 
+		if blackjack and blackjack in f'{p.body} {p.title} {p.url}'.lower():
+			v.shadowbanned = 'AutoJanny'
+			g.db.add(v)
+			send_repeatable_notification(CARP_ID, p.permalink)
+
 		if len(body_html) > 40000: return {"error":"Submission body_html too long! (max 40k characters)"}, 400
 
 		p.body_html = body_html
@@ -1144,6 +1149,10 @@ def submit_post(v, sub=None):
 	g.db.add(post)
 	g.db.flush()
 
+	if blackjack and blackjack in f'{post.body} {post.title} {post.url}'.lower():
+		v.shadowbanned = 'AutoJanny'
+		g.db.add(v)
+		send_repeatable_notification(CARP_ID, post.permalink)
 
 	if v and v.admin_level > 2:
 		for option in bet_options:

snappy_rDrama.txt

@@ -357,7 +357,7 @@ Every straight man wants to fuck another mans daughter, but no man actually want
 The amount of karma (points) on your post and Reddit account has decreased by one.
  
 ## Why did you do this?
- 
+
 There are several reasons I may deem a post to be unworthy of positive or neutral karma. These include, but are not limited to:
  
 * Rudeness towards other Redditors,
@@ -3729,32 +3729,34 @@ Shameful behavior from a deceitful desert tribe. Yet you feel pride. So strange.
 
 Begone, rat.
 {[para]}
-So exactly how *do* you jerk off to people you've never even seen pictures of?  Do you like, navigate to their own rdrama comments that you bookmarked and start stroking it as you read?
-
+So exactly how *do* you jerk off to people you've never even seen pictures of?  Do you like, navigate to their own rdrama comments that you bookmarked and start stroking it as you read?
+
 "Ungh... that's the stuff... :marseysexylibrarian:  dunk on that LOLcow baby... :marseytexan: :marseylolcow:  yeah, dunk on them harder... now a little smugposting, that's right.  :marseysmug2:  Doesn't that feel good baby?  :marseybutt: Punish that naughty LOLcow.  :spank: :marseylolcow:  Smack them around, teach them who's boss!  :marseybattered: Oh fuck, now it looks like Snappy is getting in on the action.  :marppy: Yes!  Fuck, yes!  Zozbot, zoz the fuck out of that thread!  Now the full zozzle!  :marseysnappyautism: :marseyfans:  OH YEAH!  Oh god I'm coming!"  :marseynut: :marseynut: :marseynut:
 {[para]}
-Laughter, like the wheezing of a thousand consumptive men. The Great Carp reared his bull-chest above Mellokind, revealing a necklace of steaming human heads.
-
+Laughter, like the wheezing of a thousand consumptive men. The Great Carp reared his bull-chest above Mellokind, revealing a necklace of steaming human heads.
+
 “Thou art overthrown, boomer. Thy tribe hath perished, dashed like a potter’s vessel by our fury. The earth is sown with thy nation’s blood, and soon thine enemies will compass thee with bent bow and whetted bronze. Wilt thou not repent thy folly? Wilt thou not abase thyself before our Lord?”
 {[para]}
->The Moskva was struck by two missiles from hero Ukraine.
-&gt;The Moskva is on fire<br>
-&gt;The Moskva has just had an explosion on board.<br>
-&gt;The Moskva is sinking.<br>
-&gt;The Moskva has all hands lost.<br>
-&gt;The Moskva has sunk.<br>
-&gt;The Moskva had some of it's crew survive.<br>
-&gt;The Moskva may not have been struck with missiles.<br>
-&gt;The Moskva is still afloat but it's basically a total loss and will probably sink.<br>
-&gt;The Moskva is being towed back to port.<br>
-&gt;The Moskva fire has been put out.<br>
-&gt;The Moskva's crew has survived and are all accounted for.<br>
-&gt;The Moskva did not have a stores detonation.<br>
-&gt;The Moskva is still moving under its own power and is apparently on it's way to port.<br>
-**YOU ARE HERE.**<br>
-&gt;The Moskva appears to have suffered some damage but will not be scrapped.<br>
-&gt;The Moskva will never return to battle.<br>
-&gt;The Moskva will never break out into the Atlantic.<br>
-&gt;The Moskva will never personally keelhaul Boris Johnson by his fucking wig.<br>
-&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.
+&gt;The Moskva was struck by two missiles from hero Ukraine.
+&gt;The Moskva is on fire<br>
+&gt;The Moskva has just had an explosion on board.<br>
+&gt;The Moskva is sinking.<br>
+&gt;The Moskva has all hands lost.<br>
+&gt;The Moskva has sunk.<br>
+&gt;The Moskva had some of it's crew survive.<br>
+&gt;The Moskva may not have been struck with missiles.<br>
+&gt;The Moskva is still afloat but it's basically a total loss and will probably sink.<br>
+&gt;The Moskva is being towed back to port.<br>
+&gt;The Moskva fire has been put out.<br>
+&gt;The Moskva's crew has survived and are all accounted for.<br>
+&gt;The Moskva did not have a stores detonation.<br>
+&gt;The Moskva is still moving under its own power and is apparently on it's way to port.<br>
+**YOU ARE HERE.**<br>
+&gt;The Moskva appears to have suffered some damage but will not be scrapped.<br>
+&gt;The Moskva will never return to battle.<br>
+&gt;The Moskva will never break out into the Atlantic.<br>
+&gt;The Moskva will never personally keelhaul Boris Johnson by his fucking wig.<br>
+&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!!!