diff --git a/files/assets/images/emojis/tayaaaa.gif b/files/assets/images/emojis/tayaaaa.gif index e0a02d171..7c2adcd07 100644 Binary files a/files/assets/images/emojis/tayaaaa.gif and b/files/assets/images/emojis/tayaaaa.gif differ diff --git a/files/assets/images/emojis/taycat.gif b/files/assets/images/emojis/taycat.gif index a90117c0b..448d2755d 100644 Binary files a/files/assets/images/emojis/taycat.gif and b/files/assets/images/emojis/taycat.gif differ diff --git a/files/assets/images/emojis/taycelebrate.gif b/files/assets/images/emojis/taycelebrate.gif index e211e827f..36102b05b 100644 Binary files a/files/assets/images/emojis/taycelebrate.gif and b/files/assets/images/emojis/taycelebrate.gif differ diff --git a/files/assets/images/emojis/taychefkiss.gif b/files/assets/images/emojis/taychefkiss.gif index 2823c7845..e7d282465 100644 Binary files a/files/assets/images/emojis/taychefkiss.gif and b/files/assets/images/emojis/taychefkiss.gif differ diff --git a/files/assets/images/emojis/taychristmas.gif b/files/assets/images/emojis/taychristmas.gif index ff04f98f6..71a1f2e48 100644 Binary files a/files/assets/images/emojis/taychristmas.gif and b/files/assets/images/emojis/taychristmas.gif differ diff --git a/files/assets/images/emojis/tayclap.gif b/files/assets/images/emojis/tayclap.gif index fe2916cb4..afbdeab3a 100644 Binary files a/files/assets/images/emojis/tayclap.gif and b/files/assets/images/emojis/tayclap.gif differ diff --git a/files/assets/images/emojis/taycold.gif b/files/assets/images/emojis/taycold.gif index 223fa79ee..8656db6ba 100644 Binary files a/files/assets/images/emojis/taycold.gif and b/files/assets/images/emojis/taycold.gif differ diff --git a/files/assets/images/emojis/taycrown.gif b/files/assets/images/emojis/taycrown.gif index eae66a0a7..4c1d91e9d 100644 Binary files a/files/assets/images/emojis/taycrown.gif and b/files/assets/images/emojis/taycrown.gif differ diff --git a/files/assets/images/emojis/tayflex.gif b/files/assets/images/emojis/tayflex.gif index 67d40efcf..fd404c900 100644 Binary files a/files/assets/images/emojis/tayflex.gif and b/files/assets/images/emojis/tayflex.gif differ diff --git a/files/assets/images/emojis/tayflirt.gif b/files/assets/images/emojis/tayflirt.gif index 2d023d82e..e491c2558 100644 Binary files a/files/assets/images/emojis/tayflirt.gif and b/files/assets/images/emojis/tayflirt.gif differ diff --git a/files/assets/images/emojis/taygrimacing.gif b/files/assets/images/emojis/taygrimacing.gif index fd73eeb8b..779843d12 100644 Binary files a/files/assets/images/emojis/taygrimacing.gif and b/files/assets/images/emojis/taygrimacing.gif differ diff --git a/files/assets/images/emojis/tayhappy.gif b/files/assets/images/emojis/tayhappy.gif index 502656706..975c260c2 100644 Binary files a/files/assets/images/emojis/tayhappy.gif and b/files/assets/images/emojis/tayhappy.gif differ diff --git a/files/assets/images/emojis/tayheart.gif b/files/assets/images/emojis/tayheart.gif index 2d38e0e59..7a1e9e353 100644 Binary files a/files/assets/images/emojis/tayheart.gif and b/files/assets/images/emojis/tayheart.gif differ diff --git a/files/assets/images/emojis/tayhmm.gif b/files/assets/images/emojis/tayhmm.gif index 7ad49f7bf..0c2b63661 100644 Binary files a/files/assets/images/emojis/tayhmm.gif and b/files/assets/images/emojis/tayhmm.gif differ diff --git a/files/assets/images/emojis/tayhuh.gif b/files/assets/images/emojis/tayhuh.gif index 8d9a203ae..671494bb1 100644 Binary files a/files/assets/images/emojis/tayhuh.gif and b/files/assets/images/emojis/tayhuh.gif differ diff --git a/files/assets/images/emojis/tayhyperdab.gif b/files/assets/images/emojis/tayhyperdab.gif index 68508ffec..afddd2f0d 100644 Binary files a/files/assets/images/emojis/tayhyperdab.gif and b/files/assets/images/emojis/tayhyperdab.gif differ diff --git a/files/assets/images/emojis/tayjammin.gif b/files/assets/images/emojis/tayjammin.gif index 63edc172e..70626ed26 100644 Binary files a/files/assets/images/emojis/tayjammin.gif and b/files/assets/images/emojis/tayjammin.gif differ diff --git a/files/assets/images/emojis/taylaugh.gif b/files/assets/images/emojis/taylaugh.gif index 3dc6edc6f..4619eb0f7 100644 Binary files a/files/assets/images/emojis/taylaugh.gif and b/files/assets/images/emojis/taylaugh.gif differ diff --git a/files/assets/images/emojis/taymindblown.gif b/files/assets/images/emojis/taymindblown.gif index e3cf492b4..386a8e791 100644 Binary files a/files/assets/images/emojis/taymindblown.gif and b/files/assets/images/emojis/taymindblown.gif differ diff --git a/files/assets/images/emojis/tayno.gif b/files/assets/images/emojis/tayno.gif index 30a7893dd..a67c1fe96 100644 Binary files a/files/assets/images/emojis/tayno.gif and b/files/assets/images/emojis/tayno.gif differ diff --git a/files/assets/images/emojis/taynod.gif b/files/assets/images/emojis/taynod.gif index 8a1c9e1c2..3715fe3ac 100644 Binary files a/files/assets/images/emojis/taynod.gif and b/files/assets/images/emojis/taynod.gif differ diff --git a/files/assets/images/emojis/taypeace.gif b/files/assets/images/emojis/taypeace.gif index ae2e64801..1d3df8ae2 100644 Binary files a/files/assets/images/emojis/taypeace.gif and b/files/assets/images/emojis/taypeace.gif differ diff --git a/files/assets/images/emojis/taypray.gif b/files/assets/images/emojis/taypray.gif index 5455f7c3e..bed2aca21 100644 Binary files a/files/assets/images/emojis/taypray.gif and b/files/assets/images/emojis/taypray.gif differ diff --git a/files/assets/images/emojis/tayrun.gif b/files/assets/images/emojis/tayrun.gif index 1de9dbe97..62bb99a3a 100644 Binary files a/files/assets/images/emojis/tayrun.gif and b/files/assets/images/emojis/tayrun.gif differ diff --git a/files/assets/images/emojis/tayscrunch.gif b/files/assets/images/emojis/tayscrunch.gif index 9ff6a13d8..d0fbe95c4 100644 Binary files a/files/assets/images/emojis/tayscrunch.gif and b/files/assets/images/emojis/tayscrunch.gif differ diff --git a/files/assets/images/emojis/tayshake.gif b/files/assets/images/emojis/tayshake.gif index a529b2c52..90f72c8fd 100644 Binary files a/files/assets/images/emojis/tayshake.gif and b/files/assets/images/emojis/tayshake.gif differ diff --git a/files/assets/images/emojis/tayshrug.gif b/files/assets/images/emojis/tayshrug.gif index 267009b96..055d7f9c8 100644 Binary files a/files/assets/images/emojis/tayshrug.gif and b/files/assets/images/emojis/tayshrug.gif differ diff --git a/files/assets/images/emojis/taysilly.gif b/files/assets/images/emojis/taysilly.gif index 28a70358e..10f482014 100644 Binary files a/files/assets/images/emojis/taysilly.gif and b/files/assets/images/emojis/taysilly.gif differ diff --git a/files/assets/images/emojis/tayslide.gif b/files/assets/images/emojis/tayslide.gif index e553de7af..8985cedab 100644 Binary files a/files/assets/images/emojis/tayslide.gif and b/files/assets/images/emojis/tayslide.gif differ diff --git a/files/assets/images/emojis/taysmart.gif b/files/assets/images/emojis/taysmart.gif index 9b5582382..67e05d6c3 100644 Binary files a/files/assets/images/emojis/taysmart.gif and b/files/assets/images/emojis/taysmart.gif differ diff --git a/files/assets/images/emojis/taystop.gif b/files/assets/images/emojis/taystop.gif index 30443ad7d..ed7b8ee3f 100644 Binary files a/files/assets/images/emojis/taystop.gif and b/files/assets/images/emojis/taystop.gif differ diff --git a/files/assets/images/emojis/taytantrum.gif b/files/assets/images/emojis/taytantrum.gif index c837b362e..b708b6da8 100644 Binary files a/files/assets/images/emojis/taytantrum.gif and b/files/assets/images/emojis/taytantrum.gif differ diff --git a/files/assets/images/emojis/taytea.gif b/files/assets/images/emojis/taytea.gif index 5f2f0450c..6326854ae 100644 Binary files a/files/assets/images/emojis/taytea.gif and b/files/assets/images/emojis/taytea.gif differ diff --git a/files/assets/images/emojis/taythink.gif b/files/assets/images/emojis/taythink.gif index 1cd5e7f65..a69a6c976 100644 Binary files a/files/assets/images/emojis/taythink.gif and b/files/assets/images/emojis/taythink.gif differ diff --git a/files/assets/images/emojis/tayvibin.gif b/files/assets/images/emojis/tayvibin.gif index c669fa891..8363cf464 100644 Binary files a/files/assets/images/emojis/tayvibin.gif and b/files/assets/images/emojis/tayvibin.gif differ diff --git a/files/assets/images/emojis/taywhat.gif b/files/assets/images/emojis/taywhat.gif index 34bbfd60f..c8ac2ae3d 100644 Binary files a/files/assets/images/emojis/taywhat.gif and b/files/assets/images/emojis/taywhat.gif differ diff --git a/files/assets/images/emojis/taywine.gif b/files/assets/images/emojis/taywine.gif index f476f46ac..98099d8cb 100644 Binary files a/files/assets/images/emojis/taywine.gif and b/files/assets/images/emojis/taywine.gif differ diff --git a/files/assets/images/emojis/taywine2.gif b/files/assets/images/emojis/taywine2.gif index 11a4ee087..99fd8b479 100644 Binary files a/files/assets/images/emojis/taywine2.gif and b/files/assets/images/emojis/taywine2.gif differ diff --git a/files/assets/images/emojis/taywink.gif b/files/assets/images/emojis/taywink.gif index 9ff150844..8f0c16a3a 100644 Binary files a/files/assets/images/emojis/taywink.gif and b/files/assets/images/emojis/taywink.gif differ diff --git a/files/assets/images/emojis/tayyes.gif b/files/assets/images/emojis/tayyes.gif index 47a2ef058..b2e61e8b7 100644 Binary files a/files/assets/images/emojis/tayyes.gif and b/files/assets/images/emojis/tayyes.gif differ diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 8b55d1737..1a08b613d 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -20,8 +20,7 @@ def send_notification(vid, user, text, db=None): 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") - with CustomRenderer() as renderer: - text_html = renderer.render(mistletoe.Document(text)) + text_html = CustomRenderer().render(mistletoe.Document(text)) text_html = sanitize(text_html) @@ -44,33 +43,11 @@ def send_notification(vid, user, text, db=None): db.add(notif) -def send_pm(vid, user, text): - - with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) - - text_html = sanitize(text_html, True) - - new_comment = Comment(author_id=vid, - parent_submission=None, - level=1, - sentto=user.id - ) - g.db.add(new_comment) - - g.db.flush() - - new_aux = CommentAux(id=new_comment.id, body=text, body_html=text_html) - g.db.add(new_aux) - - notif = Notification(comment_id=new_comment.id, user_id=user.id) - g.db.add(notif) - - 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") - with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) + text_html = CustomRenderer().render(mistletoe.Document(text)) text_html = sanitize(text_html) new_comment = Comment(author_id=NOTIFICATIONS_ACCOUNT, @@ -95,8 +72,7 @@ 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") - with CustomRenderer() as renderer: - text_html = renderer.render(mistletoe.Document(text)) + text_html = CustomRenderer().render(mistletoe.Document(text)) text_html = sanitize(text_html) new_comment = Comment(author_id=NOTIFICATIONS_ACCOUNT, @@ -121,8 +97,7 @@ 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") - with CustomRenderer() as renderer: - text_html = renderer.render(mistletoe.Document(text)) + text_html = CustomRenderer().render(mistletoe.Document(text)) text_html = sanitize(text_html) new_comment = Comment(author_id=NOTIFICATIONS_ACCOUNT, @@ -147,8 +122,7 @@ 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") - with CustomRenderer() as renderer: - text_html = renderer.render(mistletoe.Document(text)) + text_html = CustomRenderer().render(mistletoe.Document(text)) text_html = sanitize(text_html) new_comment = Comment(author_id=NOTIFICATIONS_ACCOUNT, @@ -169,11 +143,36 @@ def send_unblock_notif(vid, user, text): unblocksender=vid) g.db.add(notif) + + +def send_pm(vid, user, text): + + text_html = mistletoe.Document(text) + + text_html = sanitize(text_html, True) + + new_comment = Comment(author_id=vid, + parent_submission=None, + level=1, + sentto=user.id + ) + g.db.add(new_comment) + + g.db.flush() + + new_aux = CommentAux(id=new_comment.id, body=text, body_html=text_html) + g.db.add(new_aux) + + notif = Notification(comment_id=new_comment.id, user_id=user.id) + g.db.add(notif) + + + 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") - with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text)) + text_html = mistletoe.Document(text) text_html = sanitize(text_html, True) diff --git a/files/routes/admin.py b/files/routes/admin.py index 1a252cc76..192ae0ede 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -920,8 +920,7 @@ def ban_post(post_id, v): 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") - with CustomRenderer() as renderer: - ban_reason = renderer.render(mistletoe.Document(ban_reason)) + ban_reason = CustomRenderer().render(mistletoe.Document(ban_reason)) ban_reason = sanitize(ban_reason) post.ban_reason = ban_reason diff --git a/files/routes/posts.py b/files/routes/posts.py index aba81197e..dc0bb0201 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -247,7 +247,7 @@ def edit_post(pid, v): if body != p.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)})') - with CustomRenderer() as renderer: body_md = renderer.render(mistletoe.Document(body)) + body_md = CustomRenderer().render(mistletoe.Document(body)) body_html = sanitize(body_md) # Run safety filter @@ -798,8 +798,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") - with CustomRenderer() as renderer: - body_md = renderer.render(mistletoe.Document(body)) + body_md = CustomRenderer().render(mistletoe.Document(body)) body_html = sanitize(body_md) # Run safety filter diff --git a/files/routes/settings.py b/files/routes/settings.py index a04d11cf4..b80270879 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -123,7 +123,7 @@ def settings_profile_post(v): # v=v, # error="You didn't change anything") - with CustomRenderer() as renderer: bio_html = renderer.render(mistletoe.Document(bio)) + bio_html = CustomRenderer().render(mistletoe.Document(bio)) bio_html = sanitize(bio_html) # Run safety filter bans = filter_comment_html(bio_html) diff --git a/files/routes/users.py b/files/routes/users.py index 9469e4a28..68e639e4d 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -256,7 +256,7 @@ def messagereply(v): if existing.parent_comment_id: return redirect(f'/notifications?messages=true#comment-{existing.parent_comment_id}') else: return redirect(f'/notifications?messages=true#comment-{existing.id}') - with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(message)) + text_html = CustomRenderer().render(mistletoe.Document(message)) text_html = sanitize(text_html, True) new_comment = Comment(author_id=v.id, parent_submission=None,