Merge branch 'master' into mistletoe

files/helpers/const.py

@@ -36,7 +36,6 @@ AJ_REPLACEMENTS = {
 }
 
 SLURS = {
-	"white": "mayo",
 	"retarded": "r-slurred",
 	"retard": "r-slur",
 	"tard": "r-slur",
@@ -149,6 +148,7 @@ if SITE == 'rdrama.net':
 	DAD_ID = 2513
 	MOM_ID = 4588
 	BUG_THREAD = 18459
+	EMOJI_THREAD = 22479
 elif SITE == "pcmemes.net":
 	BASEDBOT_ID = 800
 	KIPPY_ID = 1592
@@ -158,7 +158,7 @@ elif SITE == "pcmemes.net":
 	LONGPOSTBOT_ID = 1832
 	ZOZBOT_ID = 1833
 	AUTOPOLLER_ID = 3369
-	TAX_RECEIVER_ID = 1577
+	TAX_RECEIVER_ID = 1592
 	PIZZA_SHILL_ID = 0
 	IDIO_ID = 0
 	CARP_ID = 0
@@ -170,6 +170,7 @@ elif SITE == "pcmemes.net":
 	DAD_ID = 0
 	MOM_ID = 0
 	BUG_THREAD = 4103
+	EMOJI_THREAD = 0
 else:
 	BASEDBOT_ID = 0
 	KIPPY_ID = 0
@@ -191,6 +192,7 @@ else:
 	DAD_ID = 0
 	MOM_ID = 0
 	BUG_THREAD = 0
+	EMOJI_THREAD = 0
 
 PUSHER_INSTANCE_ID = '02ddcc80-b8db-42be-9022-44c546b4dce6'
 PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()

files/helpers/sanitize.py

@@ -165,20 +165,23 @@ def sanitize(sanitized, noimages=False):
 
 	if start in sanitized and end in sanitized and start in sanitized.split(end)[0] and end in sanitized.split(start)[1]: sanitized = sanitized.replace(start, '<span class="spoiler">').replace(end, '</span>')
 	
-	for i in re.finditer("[^a]>\s*(:[!#]?\w+:\s*)+<\/", sanitized):
+	for i in re.finditer("[^a]>\s*(:[!#]{0,2}\w+:\s*)+<\/", sanitized):
 		old = i.group(0)
 		if 'marseylong1' in old or 'marseylong2' in old or 'marseyllama1' in old or 'marseyllama2' in old: new = old.lower().replace(">", " class='mb-0'>")
 		else: new = old.lower()
 		for i in re.finditer('(?<!"):([^ ]{1,30}?):', new):
 			emoji = i.group(1).lower()
-			if emoji.startswith("!"):
-				classes = 'class="bigemoji mirrored" '
+			if emoji.startswith("#!") or emoji.startswith("!#"):
+				classes = 'class="mirrored" '
+				remoji = emoji[2:]
+			elif emoji.startswith("!"):
+				classes = 'height=60 class="mirrored" '
 				remoji = emoji[1:]
 			elif emoji.startswith("#"):
 				classes = ""
 				remoji = emoji[1:]
 			else:
-				classes = 'class="bigemoji" '
+				classes = 'height=60 '
 				remoji = emoji
 
 			if path.isfile(f'./files/assets/images/emojis/{remoji}.webp'):
@@ -195,13 +198,13 @@ def sanitize(sanitized, noimages=False):
 		if emoji.startswith("!"):
 			emoji = emoji[1:]
 			if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-				sanitized = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="emoji mirrored" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
+				sanitized = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" height=30 class="mirrored" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
 		
 				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
 				else: session["favorite_emojis"][emoji] = 1
 
 		elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-			sanitized = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="emoji" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
+			sanitized = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
 				
 			if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
 			else: session["favorite_emojis"][emoji] = 1

files/routes/posts.py

@@ -101,7 +101,8 @@ def post_id(pid, anything=None, v=None):
 	try: pid = int(pid)
 	except Exception as e: pass
 
-	if v: defaultsortingcomments = v.defaultsortingcomments
+	if request.host == 'rdrama.net' and pid in [BUG_THREAD, EMOJI_THREAD]: defaultsortingcomments = 'new'
+	elif v: defaultsortingcomments = v.defaultsortingcomments
 	else: defaultsortingcomments = "top"
 
 	sort = request.values.get("sort", defaultsortingcomments)
@@ -247,7 +248,7 @@ def viewmore(v, pid, sort, offset):
 		if not (v and v.shadowbanned) and not (v and v.admin_level > 1):
 			comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None)
  
-		comments=comments.filter(Comment.parent_submission == pid, Comment.author_id != AUTOPOLLER_ID).join(
+		comments=comments.filter(Comment.parent_submission == pid, Comment.author_id != AUTOPOLLER_ID, Comment.is_pinned == None).join(
 			votes,
 			votes.c.comment_id == Comment.id,
 			isouter=True
@@ -268,10 +269,8 @@ def viewmore(v, pid, sort, offset):
 			comment.is_blocking = c[2] or 0
 			comment.is_blocked = c[3] or 0
 			output.append(comment)
-		
-		pinned = [c[0] for c in comments.filter(Comment.is_pinned != None).all()]
-		
-		comments = comments.filter(Comment.level == 1, Comment.is_pinned == None)
+				
+		comments = comments.filter(Comment.level == 1)
 
 		if sort == "new":
 			comments = comments.order_by(Comment.created_utc.desc())
@@ -305,26 +304,24 @@ def viewmore(v, pid, sort, offset):
 		
 		comments = comments.all()
 
-	if len(comments) > 60:
-		comments2 = []
-		count = 0
-		post = get_post(pid, v=v)
-		if post.created_utc > 1638672040:
-			for comment in comments:
-				comments2.append(comment)
-				count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1
-				offset += 1
-				if count > 50: break
-		else:
-			for comment in comments:
-				comments2.append(comment)
-				count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1
-				offset += 1
-				if count > 10: break
+	comments2 = []
+	count = 0
+	post = get_post(pid, v=v)
+	if post.created_utc > 1638672040:
+		for comment in comments:
+			comments2.append(comment)
+			count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1
+			offset += 1
+			if count > 50: break
+	else:
+		for comment in comments:
+			comments2.append(comment)
+			count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1
+			offset += 1
+			if count > 10: break
 
-		if len(comments) == len(comments2): offset = None
-		comments = comments2
-	else: offset = None
+	if len(comments) == len(comments2): offset = None
+	comments = comments2
 
 	return render_template("comments.html", v=v, comments=comments, render_replies=True, pid=pid, sort=sort, offset=offset)
 

files/templates/formatting.html

@@ -56,16 +56,21 @@ On {{'SITE_NAME' | app_config}}, you can use Markdown formatting.
 		<tr>
 			<td>Emojis</td>
 			<td>:marseylove:</td>
-			<td><img loading="lazy" data-bs-toggle="tooltip" alt=":marseylove:" data-bs-original-title=":marseylove:" delay="0" height="20" src="/assets/images/emojis/marseylove.webp?v=1"></td>
+			<td><img loading="lazy" data-bs-toggle="tooltip" alt=":marseylove:" data-bs-original-title=":marseylove:" delay="0" height="30" src="/assets/images/emojis/marseylove.webp?v=1"></td>
 		</tr>
 		<tr>
 			<td>Mirrored Emojis</td>
 			<td>:!marseylove:</td>
-			<td><img loading="lazy" data-bs-toggle="tooltip" class="mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" height="20" src="/assets/images/emojis/marseylove.webp?v=1"></td>
+			<td><img loading="lazy" data-bs-toggle="tooltip" class="mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" height="30" src="/assets/images/emojis/marseylove.webp?v=1"></td>
 		</tr>
 		<tr>
 			<td>Large Emojis</td>
 			<td>:#marseylove:</td>
+			<td><img loading="lazy" data-bs-toggle="tooltip" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" src="/assets/images/emojis/marseylove.webp?v=1"></td>
+		</tr>
+		<tr>
+			<td>Large Mirroed Emojis</td>
+			<td>:#!marseylove:</td>
 			<td><img loading="lazy" data-bs-toggle="tooltip" class="mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" src="/assets/images/emojis/marseylove.webp?v=1"></td>
 		</tr>
 		<tr>

snappy_Drama.txt

@@ -2751,3 +2751,21 @@ I punched her in the face. She was a disgusting person to look at and smelled, a
 
 And in the end I walked out and said, "Enjoy the rest of your stay here, redneck."
 {[para]}
+They have that white and red cat posted everywhere. they are obsessed with it. they call it marsey. they have made sexually suggestive drawings of it too
+{[para]}
+Small cocks are so cute omg(⁄ ⁄•⁄ω⁄•⁄ ⁄)⁄ when you hold one in your hand and it starts twitching its like its nuzzling you(/ω＼) or when they perk up and look at you like "owo nya? :3c" hehe ~ penis-kun is happy to see me!!（＾ワ＾）and the most adorable thing ever is when sperm-sama comes out but theyre rlly shy so u have to work hard!!(๑•̀ㅁ•́๑)✧ but when penis-kun and sperm-sama meet and theyre blushing and all like "uwaaa~!" (ﾉ´ヮ´)ﾉ: ･ﾟhehehe~penis-kun is so adorable (●´Д｀●)・::・
+{[para]}
+Im so fucking horny for crazy hoes. I want to fuck a coked-out tumblr hipster DIY aesthetic astrology thot in her lip gloss DSL mouth. I want to cum all over a girl with thick frame glasses and edge dyed bobcut bangs. Everytime I hear a THICK, waist-high-jean-clad braindead slutty wiccan minx say "yikes," "y'all," "big mood," "this is a bop," or "g*y disaster" I get an uncontrollable urge to run up to her and fondle her d cups and sweaty thighs. 
+{[para]}
+Wearing a condom during sex doesn't mean you're having sex. You're literally fucking a plastic bag, your dick isn't actually touching the vagina. If you've had sex with hundreds of women but each and every time you wore a condom you would still be a virgin since your dick never made contact with the vagina. It's literally the softcore version of a chastity cage, imagine cucking yourself before putting your dick inbetween some nasty roastie curtains. Imagine sticking your dick inside a girl and still being a virgin, kek.
+{[para]}
+WARNING!!!! If you overuse lefty lingo and go over the top, they can smell you out as "sus" and a r-word. you have to play midwit IQ, and agree to other peoples comments, before making them look like leftist tools.
+
+THEY TOO HATE BEING SUBVERTED BY ME!!!
+
+But they follow me for years on those sites and on invite only discords and on other reddits not in that news link. I CAUSED THE BOTS TONIGHT, SORRY!
+{[para]}
+I only follow the patriarchal aspects of Islam. Not the aspects that make you a cuck e.g. Abstaining from womanising, penetrating a sweet trap virgin ass and lowering your gaze.
+{[para]}
+There are only two rules: no bigotry and no /r/drama users.
+{[para]}