Merge branch 'master' into mistletoe

files/__main__.py

@@ -134,6 +134,7 @@ def teardown_request(error):
 
 @app.after_request
 def after_request(response):
+	if session.get("favorite_emojis"): del session["favorite_emojis"]
 
 	response.headers.add("Strict-Transport-Security", "max-age=31536000")
 	response.headers.add("X-Frame-Options", "deny")

files/helpers/sanitize.py

@@ -161,15 +161,7 @@ def sanitize(sanitized, noimages=False):
 
 	sanitized = str(soup)
 	
-	start = '<s>'
-	end = '</s>' 
-
-	try:
-		if not session.get("favorite_emojis"): session["favorite_emojis"] = {}
-	except:
-		pass
-
-	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>')
+	sanitized = re.sub('\|\|(.*?)\|\|', r'<span class="spoiler">\1</span>', sanitized)
 	
 	for i in re.finditer("[^a]>\s*(:[!#]{0,2}\w+:\s*)+<\/", sanitized):
 		old = i.group(0)
@@ -192,9 +184,6 @@ def sanitize(sanitized, noimages=False):
 
 			if path.isfile(f'./files/assets/images/emojis/{remoji}.webp'):
 				new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" {classes}src="https://{site}/assets/images/emojis/{remoji}.webp" >', new)
-
-				if remoji in session["favorite_emojis"]: session["favorite_emojis"][remoji] += 1
-				else: session["favorite_emojis"][remoji] = 1
 					
 		sanitized = sanitized.replace(old, new)
 
@@ -205,16 +194,9 @@ def sanitize(sanitized, noimages=False):
 			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" height=30 class="emj 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" height=30 class="emj" 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
-
 
 	sanitized = sanitized.replace("https://www.", "https://").replace("https://youtu.be/", "https://youtube.com/watch?v=").replace("https://music.youtube.com/watch?v=", "https://youtube.com/watch?v=").replace("https://open.spotify.com/", "https://open.spotify.com/embed/").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/watch?v=").replace("https://mobile.twitter", "https://twitter").replace("https://m.facebook", "https://facebook").replace("https://m.wikipedia", "https://wikipedia").replace("https://m.youtube", "https://youtube")
 

files/routes/posts.py

@@ -114,7 +114,7 @@ def post_id(pid, anything=None, v=None):
 
 	post = get_post(pid, v=v)
 
-	if not (v and v.admin_level > 1) and post.club and not (v and (v.paid_dues or v.id == post.author_id)) or post.private and not (v and v.id == post.author_id): abort(403)
+	if not (v and v.admin_level > 1) and (post.club and not (v and (v.paid_dues or v.id == post.author_id)) or post.private and not (v and v.id == post.author_id)): abort(403)
 
 	if v:
 		votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery()

files/routes/settings.py

@@ -851,6 +851,8 @@ def settings_profilecss(v):
 @validate_formkey
 def settings_block_user(v):
 
+	if v and v.admin_level: return {"error": "Admins can't block users."}, 403
+
 	user = get_user(request.values.get("username"), graceful=True)
 
 	if not user: return {"error": "That user doesn't exist."}, 404

files/templates/ban_modal.html

@@ -1,5 +1,5 @@
 
-<script src="/assets/js/ban_modal.js?v=1"></script>
+<script src="/assets/js/ban_modal.js?v=2"></script>
 
 <div class="modal fade" id="banModal" tabindex="-1" role="dialog" aria-labelledby="banModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">

files/templates/changelog.html

@@ -102,6 +102,6 @@
 </nav>
 {% endif %}
 
-<script src="/assets/js/changelog.js?v=55"></script>
+<script src="/assets/js/post_toast2.js?v=55"></script>
 
 {% endblock %}

files/templates/formatting.html

@@ -62,7 +62,12 @@ You can use Markdown formatting:
 			<td><lite-youtube videoid="3Hecr51ByE4" params="controls=0&modestbranding=1"></lite-youtube></td>
 		</tr>
 		<tr>
-			<td>Video Files</td>
+			<td>MP4 Files</td>
+			<td>https://files.catbox.moe/v4om92.mp4</td>
+			<td><video controls preload="none" class="embedvid"><source src="https://files.catbox.moe/v4om92.mp4" type="video/mp4"></video></td>
+		</tr>
+		<tr>
+			<td>WEBM Files</td>
 			<td>https://files.catbox.moe/v4om92.mp4</td>
 			<td><video controls preload="none" class="embedvid"><source src="https://files.catbox.moe/v4om92.mp4" type="video/mp4"></video></td>
 		</tr>
@@ -128,7 +133,7 @@ You can use Markdown formatting:
 		</tr>
 		<tr>
 			<td>Spoilers</td>
-			<td>&lt;s&gt; bussy > gussy &lt;/s&gt;</td>
+			<td>||bussy > gussy||</td>
 			<td><p class="spoiler">bussy > gussy</p></td>
 		</tr>
 		<tr>