diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index fe8f686bd..8aa73c469 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -10,7 +10,7 @@ from .const import * def send_notification(vid, user, text): text = text.replace('r/', 'r\/').replace('u/', 'u\/') - text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + text = text.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) @@ -59,7 +59,7 @@ def send_pm(vid, user, text): def send_follow_notif(vid, user, text): - text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + text = text.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) text_html = sanitize(text_html) @@ -84,7 +84,7 @@ def send_follow_notif(vid, user, text): def send_unfollow_notif(vid, user, text): - text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + text = text.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) @@ -110,7 +110,7 @@ def send_unfollow_notif(vid, user, text): def send_block_notif(vid, user, text): - text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + text = text.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) @@ -136,7 +136,7 @@ def send_block_notif(vid, user, text): def send_unblock_notif(vid, user, text): - text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + text = text.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) @@ -162,7 +162,7 @@ def send_unblock_notif(vid, user, text): def send_admin(vid, text): - text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + text = text.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) diff --git a/files/routes/admin.py b/files/routes/admin.py index cf608686c..95c2f7509 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -799,7 +799,7 @@ def ban_post(post_id, v): post.is_pinned = False ban_reason=request.form.get("reason", "") - ban_reason = ban_reason.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + ban_reason = ban_reason.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: ban_reason = renderer.render(mistletoe.Document(ban_reason)) ban_reason = sanitize(ban_reason) diff --git a/files/routes/comments.py b/files/routes/comments.py index e27a70441..d320c9e1e 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -156,7 +156,7 @@ def api_comment(v): if not body and not request.files.get('file'): return {"error":"You need to actually write something!"}, 400 for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF|9999))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html = sanitize(body_md) @@ -280,7 +280,7 @@ def api_comment(v): else: url = upload_imgur(file) body = request.form.get("body") + f"\n![]({url})" - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html = sanitize(body_md) @@ -375,7 +375,7 @@ def api_comment(v): g.db.flush() body = random.choice(LONGPOST_REPLIES) - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html2 = sanitize(body_md) c_aux = CommentAux( @@ -564,7 +564,7 @@ def edit_comment(cid, v): body = request.form.get("body", "")[:10000] for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF|9999))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer(post_id=c.post.id) as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html = sanitize(body_md) @@ -657,7 +657,7 @@ def edit_comment(cid, v): else: url = upload_imgur(file) body += f"\n![]({url})" - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer(post_id=c.parent_submission) as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html = sanitize(body_md) diff --git a/files/routes/posts.py b/files/routes/posts.py index 9b16322b4..dc41dadd9 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -237,7 +237,7 @@ def edit_post(pid, v): body = request.form.get("body", "") for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF|9999))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html = sanitize(body_md) @@ -748,7 +748,7 @@ def submit_post(v): # render text for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF|9999))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') - body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + body = body.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") with CustomRenderer() as renderer: body_md = renderer.render(mistletoe.Document(body)) body_html = sanitize(body_md) diff --git a/files/routes/settings.py b/files/routes/settings.py index f8859ac93..50d01c736 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -90,7 +90,7 @@ def settings_profile_post(v): bio = request.values.get("bio")[:1500] for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF|9999))', bio, re.MULTILINE): bio = bio.replace(i.group(1), f'![]({i.group(1)})') - bio = bio.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + bio = bio.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") # check for uploaded image if request.files.get('file') and request.headers.get("cf-ipcountry") != "T1": diff --git a/files/routes/users.py b/files/routes/users.py index 08846f094..7b43a39bb 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -212,7 +212,7 @@ def message2(v, username): if user.is_blocked: return {"error": "This user is blocking you."}, 403 message = request.form.get("message", "")[:1000].strip() - message = message.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + message = message.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") # check existing existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id, @@ -252,7 +252,7 @@ def messagereply(v): id = int(request.form.get("parent_id")) parent = get_comment(id, v=v) user = parent.author - message = message.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") + message = message.replace("\n\n", "\n").replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n") # check existing existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id,