skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gfgff

Browse source
This commit is contained in:
Aevann1 2021-07-31 10:47:10 +02:00
parent f475386461
commit a0ca03fc0c
6 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drama/helpers/alerts.py
View file

@ -9,7 +9,7 @@ from .sanitize import *
def send_notification(vid, user, text): def send_notification(vid, user, text):
text = text.replace('r/', 'r\/').replace('u/', 'u\/') 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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
text_html = renderer.render(mistletoe.Document(text)) text_html = renderer.render(mistletoe.Document(text))
@ -60,10 +60,9 @@ def send_pm(vid, user, text):
def send_follow_notif(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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text))
text_html = renderer.render(mistletoe.Document(text))
text_html = sanitize(text_html, linkgen=True) text_html = sanitize(text_html, linkgen=True)
new_comment = Comment(author_id=1046, new_comment = Comment(author_id=1046,
@ -87,7 +86,7 @@ def send_follow_notif(vid, user, text):
def send_unfollow_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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
text_html = renderer.render(mistletoe.Document(text)) text_html = renderer.render(mistletoe.Document(text))
@ -114,7 +113,7 @@ def send_unfollow_notif(vid, user, text):
def send_block_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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
text_html = renderer.render(mistletoe.Document(text)) text_html = renderer.render(mistletoe.Document(text))
@ -141,7 +140,7 @@ def send_block_notif(vid, user, text):
def send_unblock_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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
text_html = renderer.render(mistletoe.Document(text)) text_html = renderer.render(mistletoe.Document(text))
@ -168,7 +167,7 @@ def send_unblock_notif(vid, user, text):
def send_admin(vid, 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") 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")
with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text))

2
drama/routes/admin.py
View file

@ -745,7 +745,7 @@ def ban_post(post_id, v):
post.is_pinned = False post.is_pinned = False
ban_reason=request.form.get("reason", "") 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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
ban_reason = renderer.render(mistletoe.Document(ban_reason)) ban_reason = renderer.render(mistletoe.Document(ban_reason))
ban_reason = sanitize(ban_reason, linkgen=True) ban_reason = sanitize(ban_reason, linkgen=True)

12
drama/routes/comments.py
View file

@ -194,7 +194,7 @@ def api_comment(v):
if not body and not request.files.get('file'): return jsonify({"error":"You need to actually write something!"}), 400 if not body and not request.files.get('file'): return jsonify({"error":"You need to actually write something!"}), 400
for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', 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") 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")
with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body)) with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body))
body_html = sanitize(body_md, linkgen=True) body_html = sanitize(body_md, linkgen=True)
@ -321,7 +321,7 @@ def api_comment(v):
url = upload_file(file) url = upload_file(file)
body = request.form.get("body") + f"\n![]({url})" 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") 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")
with CustomRenderer(post_id=parent_id) as renderer: with CustomRenderer(post_id=parent_id) as renderer:
body_md = renderer.render(mistletoe.Document(body)) body_md = renderer.render(mistletoe.Document(body))
body_html = sanitize(body_md, linkgen=True) body_html = sanitize(body_md, linkgen=True)
@ -360,7 +360,7 @@ def api_comment(v):
included. \n\n*This is an automated message; if you need help, included. \n\n*This is an automated message; if you need help,
you can message us [here](/contact).*""" you can message us [here](/contact).*"""
#body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n") #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")
with CustomRenderer(post_id=parent_id) as renderer: with CustomRenderer(post_id=parent_id) as renderer:
body_md = renderer.render(mistletoe.Document(body)) body_md = renderer.render(mistletoe.Document(body))
@ -387,7 +387,7 @@ def api_comment(v):
g.db.flush() g.db.flush()
body = random.choice(choices) body = random.choice(choices)
body = body.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n") 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")
with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body)) with CustomRenderer(post_id=parent_id) as renderer: body_md = renderer.render(mistletoe.Document(body))
body_html2 = sanitize(body_md, linkgen=True) body_html2 = sanitize(body_md, linkgen=True)
c_aux = CommentAux( c_aux = CommentAux(
@ -574,7 +574,7 @@ def edit_comment(cid, v):
body = request.form.get("body", "")[0:10000] body = request.form.get("body", "")[0:10000]
for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', 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") 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")
with CustomRenderer(post_id=c.post.id) as renderer: body_md = renderer.render(mistletoe.Document(body)) with CustomRenderer(post_id=c.post.id) as renderer: body_md = renderer.render(mistletoe.Document(body))
body_html = sanitize(body_md, linkgen=True) body_html = sanitize(body_md, linkgen=True)
@ -668,7 +668,7 @@ def edit_comment(cid, v):
url = upload_file(file) url = upload_file(file)
body += f"\n![]({url})" 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") 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")
with CustomRenderer(post_id=c.parent_submission) as renderer: with CustomRenderer(post_id=c.parent_submission) as renderer:
body_md = renderer.render(mistletoe.Document(body)) body_md = renderer.render(mistletoe.Document(body))
body_html = sanitize(body_md, linkgen=True) body_html = sanitize(body_md, linkgen=True)

2
drama/routes/posts.py
View file

@ -229,7 +229,6 @@ def edit_post(pid, v):
body = request.form.get("body", "") body = request.form.get("body", "")
for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', 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")
with CustomRenderer() as renderer: body_md = renderer.render(mistletoe.Document(body)) with CustomRenderer() as renderer: body_md = renderer.render(mistletoe.Document(body))
body_html = sanitize(body_md, linkgen=True) body_html = sanitize(body_md, linkgen=True)
@ -708,7 +707,6 @@ def submit_post(v):
# render text # render text
for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', body, re.MULTILINE): body = body.replace(i.group(1), f'![]({i.group(1)})') for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
body_md = renderer.render(mistletoe.Document(body)) body_md = renderer.render(mistletoe.Document(body))
body_html = sanitize(body_md, linkgen=True) body_html = sanitize(body_md, linkgen=True)

2
drama/routes/settings.py
View file

@ -70,7 +70,7 @@ def settings_profile_post(v):
error="You didn't change anything") error="You didn't change anything")
for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', bio, re.MULTILINE): bio = bio.replace(i.group(1), f'![]({i.group(1)})') for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|PNG|JPG|JPEG|GIF))', 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") 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")
with CustomRenderer() as renderer: with CustomRenderer() as renderer:
bio_html = renderer.render(mistletoe.Document(bio)) bio_html = renderer.render(mistletoe.Document(bio))
bio_html = sanitize(bio_html, linkgen=True) bio_html = sanitize(bio_html, linkgen=True)

4
drama/routes/users.py
View file

@ -69,7 +69,7 @@ def messagereply(v, username, id):
message = request.form.get("message", "")[:1000].strip() message = request.form.get("message", "")[:1000].strip()
user = get_user(username) user = get_user(username)
message = message.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n") 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")
# check existing # check existing
existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id, existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id,
@ -131,7 +131,7 @@ def message2(v, username):
if user.is_blocked: return {"error": "This user is blocking you."}, 403 if user.is_blocked: return {"error": "This user is blocking you."}, 403
message = request.form.get("message", "")[:1000].strip() 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") 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")
# check existing # check existing
existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id, existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id,