From c6d9f236eb2ba9376826f9ed9ff2a45df93b7cac Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 21 Aug 2021 14:30:52 +0200 Subject: [PATCH 01/19] df --- files/routes/posts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index ff8e173eb..8ec026c92 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -563,7 +563,7 @@ def submit_post(v): else: url = "" - if "i.imgur.com" in url: url = url.replace(".png", "_d.png").replace(".jpg", "_d.jpg").replace(".jpeg", "_d.jpeg") + "?maxwidth=8888" + if "i.imgur.com" in url: url = url.replace(".png", "_d.png").replace(".jpg", "_d.jpg").replace(".jpeg", "_d.jpeg") + "?maxwidth=9999" body = request.form.get("body", "") # check for duplicate From ebb34e29a355f11e38c9af3b587b9261adab7ce7 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 21 Aug 2021 14:30:54 +0200 Subject: [PATCH 02/19] df --- files/classes/submission.py | 2 +- files/helpers/sanitize.py | 135 +++++++++++++++------------------ files/templates/admins.html | 2 +- files/templates/settings2.html | 2 +- 4 files changed, 64 insertions(+), 77 deletions(-) diff --git a/files/classes/submission.py b/files/classes/submission.py index c31a521b8..21da28405 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -393,7 +393,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): @property def is_image(self): - if self.url: return self.url.lower().endswith('.jpg') or self.url.lower().endswith('.png') or self.url.lower().endswith('.gif') or self.url.lower().endswith('.jpeg') or self.url.lower().endswith('?maxwidth=9999') or self.url.lower().endswith('?maxwidth=8888') + if self.url: return self.url.lower().endswith('.jpg') or self.url.lower().endswith('.png') or self.url.lower().endswith('.gif') or self.url.lower().endswith('.jpeg') or self.url.lower().endswith('?maxwidth=9999') else: return False @property diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 827d24fe5..746cc6df9 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -59,8 +59,7 @@ _allowed_styles =[ # filter to make all links show domain on hover - -def a_modify(attrs, new=False): +def a_modify(attrs): raw_url=attrs.get((None, "href"), None) if raw_url: @@ -85,16 +84,14 @@ def a_modify(attrs, new=False): return attrs +def sanitize(sanitized): + sanitized = sanitized.replace("\ufeff", "").replace("m.youtube.com", "youtube.com") + for i in re.finditer('https://i.imgur.com/(.*?)\.(jpg|png|jpeg|)', sanitized): + sanitized = sanitized.replace(i.group(1), i.group(1) + "_d." + i.group(2)) - -_clean_wo_links = bleach.Cleaner(tags=_allowed_tags, - attributes=_allowed_attributes, - protocols=_allowed_protocols, - ) - -_clean_w_links = bleach.Cleaner(tags=_allowed_tags, + sanitized = bleach.Cleaner(tags=_allowed_tags, attributes=_allowed_attributes, protocols=_allowed_protocols, styles=_allowed_styles, @@ -104,74 +101,64 @@ _clean_w_links = bleach.Cleaner(tags=_allowed_tags, callbacks=[a_modify] ) ] - ) + ).clean(sanitized) + + #soupify + soup = BeautifulSoup(sanitized, features="html.parser") + + #img elements - embed + for tag in soup.find_all("img"): + + url = tag.get("src", "") + if not url: continue + + if "profile-pic-20" not in tag.get("class", ""): + #print(tag.get('class')) + # set classes and wrap in link + + tag["rel"] = "nofollow" + tag["style"] = "max-height: 100px; max-width: 100%;" + tag["class"] = "in-comment-image rounded-sm my-2" + + link = soup.new_tag("a") + link["href"] = tag["src"] + link["rel"] = "nofollow noopener" + link["target"] = "_blank" + + link["onclick"] = f"expandDesktopImage('{tag['src']}');" + link["data-toggle"] = "modal" + link["data-target"] = "#expandImageModal" + + tag.wrap(link) + + #disguised link preventer + for tag in soup.find_all("a"): + + if re.match("https?://\S+", str(tag.string)): + try: + tag.string = tag["href"] + except: + tag.string = "" + + #clean up tags in code + for tag in soup.find_all("code"): + tag.contents=[x.string for x in tag.contents if x.string] + + #whatever else happens with images, there are only two sets of classes allowed + for tag in soup.find_all("img"): + if 'profile-pic-20' not in tag.attrs.get("class",""): + tag.attrs['class']="in-comment-image rounded-sm my-2" + + #table format + for tag in soup.find_all("table"): + tag.attrs['class']="table table-striped" + + for tag in soup.find_all("thead"): + tag.attrs['class']="bg-primary text-white" -def sanitize(text, linkgen=False): + sanitized = str(soup) - text = text.replace("\ufeff", "").replace("m.youtube.com", "youtube.com") - - if linkgen: - sanitized = _clean_w_links.clean(text) - - #soupify - soup = BeautifulSoup(sanitized, features="html.parser") - - #img elements - embed - for tag in soup.find_all("img"): - - url = tag.get("src", "") - if not url: continue - - if "profile-pic-20" not in tag.get("class", ""): - #print(tag.get('class')) - # set classes and wrap in link - - tag["rel"] = "nofollow" - tag["style"] = "max-height: 100px; max-width: 100%;" - tag["class"] = "in-comment-image rounded-sm my-2" - - link = soup.new_tag("a") - link["href"] = tag["src"] - link["rel"] = "nofollow noopener" - link["target"] = "_blank" - - link["onclick"] = f"expandDesktopImage('{tag['src']}');" - link["data-toggle"] = "modal" - link["data-target"] = "#expandImageModal" - - tag.wrap(link) - - #disguised link preventer - for tag in soup.find_all("a"): - - if re.match("https?://\S+", str(tag.string)): - try: - tag.string = tag["href"] - except: - tag.string = "" - - #clean up tags in code - for tag in soup.find_all("code"): - tag.contents=[x.string for x in tag.contents if x.string] - - #whatever else happens with images, there are only two sets of classes allowed - for tag in soup.find_all("img"): - if 'profile-pic-20' not in tag.attrs.get("class",""): - tag.attrs['class']="in-comment-image rounded-sm my-2" - - #table format - for tag in soup.find_all("table"): - tag.attrs['class']="table table-striped" - - for tag in soup.find_all("thead"): - tag.attrs['class']="bg-primary text-white" - - - sanitized = str(soup) - - else: - sanitized = _clean_wo_links.clean(text) start = '<s>' end = '</s>' diff --git a/files/templates/admins.html b/files/templates/admins.html index 4c1fd7d5d..280d7d5b4 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -4,7 +4,7 @@ {% block content %} 

-
admins

+
Admins

 

 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 850fe2ca2..b2662ad13 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -98,7 +98,7 @@
 										Leaderboard
  • 
-										admins
+										Admins
 									
  • 
 										Moderation Log

From 8fcb223e538fe7a2c1f5478b67e4fa9ab241b0ea Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 14:44:02 +0200
Subject: [PATCH 03/19] dffd

---
 files/templates/comments.html           | 24 +++++++++++------------
 files/templates/submission.html         | 24 +++++++++++------------
 files/templates/submission_listing.html | 26 ++++++++++++-------------
 files/templates/user_listing.html       |  4 ++--
 4 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 08907459a..87a7b1886 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -138,6 +138,18 @@
 				· Edited {{c.edited_string}}
 				{% endif %}
 			
+			
+			{% if c.active_flags %}
+			
    
+				 Reported by:
+				
    
+				
      
+					{% for f in c.ordered_flags %}
+						
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
+					{% endfor %}
+				
    
+			
    
+			{% endif %}
 
 			{% if c.is_banned and c.ban_reason %}
 			
    Reason: {{c.ban_reason}}
    
@@ -192,18 +204,6 @@
 				
 			
 			{% endif %}
-
-			{% if c.active_flags %}
-			
    
-				 Reported by:
-				
    
-				
      
-					{% for f in c.ordered_flags %}
-						
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
-					{% endfor %}
-				
    
-			
    
-			{% endif %}
 		
 			
    
 				
      
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 191cd9206..edc5319c4 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -234,6 +234,18 @@
 						  {{p.views}} views
 					
    
 					
+					{% if p.active_flags %}
+					
    
+						 Reported by:
+						
    
+						
      
+							{% for f in p.ordered_flags %}
+								
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
+							{% endfor %}
+						
    
+					
    
+					{% endif %}
+				
 					{% if p.realurl(v) %}
 						
    {{title | safe}}
    					
 					{% else %}
@@ -494,18 +506,6 @@
 
 
 
-{% if p.active_flags %}
-	
    
-		 Reported by:
-		
    
-		
      
-			{% for f in p.ordered_flags %}
-				
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
-			{% endfor %}
-		
    
-	
    
-{% endif %}
-
 
    
 	
    
 		
    
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 35bf6d568..6b0f6e621 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -115,6 +115,18 @@
 				  {{p.views}} views
 			
    
 
+			{% if p.active_flags %}
+			
    
+				 Reported by:
+				
    
+				
      
+					{% for f in p.ordered_flags %}
+						
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
+					{% endfor %}
+				
    
+			
    
+			{% endif %}
+		
 			
    
 				{{p.realtitle(v) | safe}}
 			
    
@@ -374,20 +386,6 @@
 
 
    
 
-{% if p.active_flags %}
-	
    
-		 Reported by:
-		
    
-		
      
-			{% for f in p.ordered_flags %}
-				
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
-			{% endfor %}
-		
    
-	
    
-{% endif %}
-
-{% else %}
-
 {% if request.path.endswith('/admin/queue') %}
 
 
    	
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index 9224b579e..299cc8a98 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -21,8 +21,8 @@
 					{% endif %}
 				
    
 
-				{% if not hide_bios %}
-				
    {{u.bio_html | safe}}
    
+				{% if not hide_bios and u.bio_html %}
+					
    {{u.bio_html | safe}}
    
 				{% endif %}
 			
    
 		

From fb43a6b358f4e72ed48700072075ecc8db857216 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 14:46:08 +0200
Subject: [PATCH 04/19] fdfd

---
 files/templates/default.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/default.html b/files/templates/default.html
index 706fb34cb..9bce37061 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1034,7 +1034,7 @@
 
  
 
-
+
 
 {% include "header.html" %}
 

From a36cc8d982acbd63b967c3e9326cd0ea36192b74 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 14:51:19 +0200
Subject: [PATCH 06/19] fdfd

---
 files/routes/posts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index 8ec026c92..d350cdde1 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -610,7 +610,7 @@ def submit_post(v):
 			if t: embed = f"https://youtube.com/embed/{yt_id}?start={t}"
 			else: embed = f"https://youtube.com/embed/{yt_id}"
 
-	elif app.config['SERVER_NAME'] in domain and "/post/" in url:
+	elif app.config['SERVER_NAME'] in domain and "/post/" in url and "context" not in url:
 		id = url.split("/post/")[1]
 		if "/" in id: id = id.split("/")[0]
 		embed = id

From 08b4cd6e036762e9ad3b861efae803d6aa35519b Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 14:57:16 +0200
Subject: [PATCH 08/19] dffd

---
 files/helpers/alerts.py                 | 14 +++++++-------
 files/routes/admin.py                   |  4 ++--
 files/routes/comments.py                | 16 ++++++++--------
 files/routes/posts.py                   |  6 +++---
 files/routes/settings.py                |  2 +-
 files/routes/users.py                   |  2 +-
 files/templates/submission_listing.html | 20 +++++++++++---------
 7 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py
index ee7695127..8bcc7afc4 100644
--- a/files/helpers/alerts.py
+++ b/files/helpers/alerts.py
@@ -13,7 +13,7 @@ def send_notification(vid, user, text):
 	with CustomRenderer() as renderer:
 		text_html = renderer.render(mistletoe.Document(text))
 
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 	
 	new_comment = Comment(author_id=vid,
 						  parent_submission=None,
@@ -38,7 +38,7 @@ def send_pm(vid, user, text):
 
 	with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text))
 
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 
 	new_comment = Comment(author_id=vid,
 						  parent_submission=None,
@@ -61,7 +61,7 @@ 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 = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 	
 	new_comment = Comment(author_id=1046,
 						  parent_submission=None,
@@ -87,7 +87,7 @@ def send_unfollow_notif(vid, user, text):
 
 	with CustomRenderer() as renderer:
 		text_html = renderer.render(mistletoe.Document(text))
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 	
 	new_comment = Comment(author_id=1046,
 						  parent_submission=None,
@@ -113,7 +113,7 @@ def send_block_notif(vid, user, text):
 
 	with CustomRenderer() as renderer:
 		text_html = renderer.render(mistletoe.Document(text))
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 	
 	new_comment = Comment(author_id=1046,
 						  parent_submission=None,
@@ -139,7 +139,7 @@ def send_unblock_notif(vid, user, text):
 
 	with CustomRenderer() as renderer:
 		text_html = renderer.render(mistletoe.Document(text))
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 	
 	new_comment = Comment(author_id=1046,
 						  parent_submission=None,
@@ -165,7 +165,7 @@ def send_admin(vid, text):
 
 	with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(text))
 
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 
 	new_comment = Comment(author_id=vid,
 						  parent_submission=None,
diff --git a/files/routes/admin.py b/files/routes/admin.py
index f9ebdf057..7cccd265c 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -566,7 +566,7 @@ def admin_title_change(user_id, v):
 	new_name=request.form.get("title").strip()
 
 	user.customtitleplain=new_name
-	new_name = sanitize(new_name, linkgen=True)
+	new_name = sanitize(new_name)
 
 	user=g.db.query(User).with_for_update().options(lazyload('*')).filter_by(id=user.id).first()
 	user.customtitle=new_name
@@ -703,7 +703,7 @@ def ban_post(post_id, v):
 	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 = sanitize(ban_reason, linkgen=True)
+	ban_reason = sanitize(ban_reason)
 
 	post.ban_reason = ban_reason
 
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 3ca258478..6a58fd6ef 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -161,7 +161,7 @@ def api_comment(v):
 	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(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)
 
 	# Run safety filter
 	bans = filter_comment_html(body_html)
@@ -284,7 +284,7 @@ def api_comment(v):
 		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))
-		body_html = sanitize(body_md, linkgen=True)
+		body_html = sanitize(body_md)
 
 	c_aux = CommentAux(
 		id=c.id,
@@ -349,7 +349,7 @@ def api_comment(v):
 		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").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, linkgen=True)
+		body_html2 = sanitize(body_md)
 		c_aux = CommentAux(
 			id=c2.id,
 			body_html=body_html2,
@@ -379,7 +379,7 @@ def api_comment(v):
 	
 		body = "zoz"
 		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)
 		c_aux = CommentAux(
 			id=c2.id,
 			body_html=body_html2,
@@ -405,7 +405,7 @@ def api_comment(v):
 	
 		body = "zle"
 		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)
 		c_aux = CommentAux(
 			id=c3.id,
 			body_html=body_html2,
@@ -431,7 +431,7 @@ def api_comment(v):
 	
 		body = "zozzle"
 		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)
 		c_aux = CommentAux(
 			id=c4.id,
 			body_html=body_html2,
@@ -538,7 +538,7 @@ def edit_comment(cid, v):
 	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(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)
 
 	bans = filter_comment_html(body_html)
 
@@ -632,7 +632,7 @@ def edit_comment(cid, v):
 		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:
 			body_md = renderer.render(mistletoe.Document(body))
-		body_html = sanitize(body_md, linkgen=True)
+		body_html = sanitize(body_md)
 
 	c.body = body
 	c.body_html = body_html
diff --git a/files/routes/posts.py b/files/routes/posts.py
index d350cdde1..44ba6a660 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -240,7 +240,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)})')
 	with CustomRenderer() as renderer: body_md = renderer.render(mistletoe.Document(body))
-	body_html = sanitize(body_md, linkgen=True)
+	body_html = sanitize(body_md)
 
 	# Run safety filter
 	bans = filter_comment_html(body_html)
@@ -708,7 +708,7 @@ def submit_post(v):
 	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_html = sanitize(body_md, linkgen=True)
+	body_html = sanitize(body_md)
 
 	# Run safety filter
 	bans = filter_comment_html(body_html)
@@ -902,7 +902,7 @@ def submit_post(v):
 		body += f"Snapshots:\n\n* [reveddit.com](https://reveddit.com/{new_post.url})\n* [archive.org](https://web.archive.org/{new_post.url})\n* [archive.ph](https://archive.ph/?url={urllib.parse.quote(new_post.url)}&run=1) (click to archive)"
 		gevent.spawn(archiveorg, new_post.url)
 	with CustomRenderer(post_id=new_post.id) as renderer: body_md = renderer.render(mistletoe.Document(body))
-	body_html = sanitize(body_md, linkgen=True)
+	body_html = sanitize(body_md)
 	c_aux = CommentAux(
 		id=c.id,
 		body_html=body_html,
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 6055523eb..8e9a4b969 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -81,7 +81,7 @@ def settings_profile_post(v):
 		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")
 		with CustomRenderer() as renderer: bio_html = renderer.render(mistletoe.Document(bio))
-		bio_html = sanitize(bio_html, linkgen=True)
+		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 9d89cee0b..4c853d9f3 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -116,7 +116,7 @@ def messagereply(v, username, id):
 	if existing: return redirect('/notifications?messages=true')
 
 	with CustomRenderer() as renderer: text_html = renderer.render(mistletoe.Document(message))
-	text_html = sanitize(text_html, linkgen=True)
+	text_html = sanitize(text_html)
 	parent = get_comment(int(id), v=v)
 	new_comment = Comment(author_id=v.id,
 							parent_submission=None,
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 6b0f6e621..4eb2c19e9 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -116,15 +116,15 @@
 			
 
 			{% if p.active_flags %}
-			
    
-				 Reported by:
-				
    
-				
      
-					{% for f in p.ordered_flags %}
-						
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
-					{% endfor %}
-				
    
-			
    
+				
    
+					 Reported by:
+					
    
+					
      
+						{% for f in p.ordered_flags %}
+							
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
+						{% endfor %}
+					
    
+				
    
 			{% endif %}
 		
 			
    
@@ -386,6 +386,8 @@
 
 
 
+{% else %}
+
 {% if request.path.endswith('/admin/queue') %}
 
 
    	

From 6add0faef442e8865e74e19db620de7d3f8e41d7 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 14:58:11 +0200
Subject: [PATCH 09/19] fdfd

---
 files/helpers/sanitize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 746cc6df9..658008f10 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -59,7 +59,7 @@ _allowed_styles =[
 
 # filter to make all links show domain on hover
 
-def a_modify(attrs):
+def a_modify(attrs, whatever):
 
 	raw_url=attrs.get((None, "href"), None)
 	if raw_url:

From 2610a6eef3867405aa18b6e7f12d46e257bdd92a Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 17:08:34 +0200
Subject: [PATCH 10/19] force push

---
 files/templates/submission_listing.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 4eb2c19e9..35bf6d568 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -115,18 +115,6 @@
 				  {{p.views}} views
 			
    
 
-			{% if p.active_flags %}
-				
    
-					 Reported by:
-					
    
-					    
-				
    
-			{% endif %}
-		
 			
    
 				{{p.realtitle(v) | safe}}
 			
    
@@ -386,6 +374,18 @@
 
 
 
+{% if p.active_flags %}
+	
    
+		 Reported by:
+		
    
+		
      
+			{% for f in p.ordered_flags %}
+				
    • @{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %}
      • 
+			{% endfor %}
+		
    
+	
    
+{% endif %}
+
 {% else %}
 
 {% if request.path.endswith('/admin/queue') %}

From e825c3555d36b0e33e7100ffe0c0cae1a90bb84e Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 17:17:49 +0200
Subject: [PATCH 11/19] ddfdf

---
 files/templates/comments.html           | 5 ++++-
 files/templates/submission.html         | 5 ++++-
 files/templates/submission_listing.html | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 87a7b1886..2a6a89687 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -131,7 +131,10 @@
 				{% if c.is_blocking %} {% endif %}
 				{% if c.is_blocked %} {% endif %}
 
-				{{c.author.username}}{% if c.author.customtitle %}  {{c.author.customtitle | safe}}{% endif %}
+				{% if c.author.verified %}
+				 {% endif %}
+
+				{{c.author.username}}{% if c.author.customtitle %}  {{c.author.customtitle | safe}}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index edc5319c4..84d40d9e7 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -225,7 +225,10 @@
 						{% if p.over_18 %}+18{% endif %}
 						{% if p.private %}unlisted{% endif %}
 						{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
-						 {{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
+						 
+						{% if p.author.verified %}
+						 {% endif %}		
+						{{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
 						 {{p.age_string}}
 						({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
 						
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 35bf6d568..f48cb2af7 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -106,7 +106,10 @@
 				{% if p.is_blocked %}{% endif %}
 				{% if p.private %}unlisted{% endif %}
 				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
-				 {{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
+				 
+				{% if p.author.verified %}
+				 {% endif %}
+				{{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
 				 {{p.age_string}}
 				 
 				({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})

From 27b5fe2b30095c9aaf07ad8091482d694f4307ec Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 17:33:01 +0200
Subject: [PATCH 12/19] =?UTF-8?q?=D9=8A=D8=A8=D9=8A=D8=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/templates/submission.html         | 4 ++--
 files/templates/submission_listing.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 84d40d9e7..59cf1676e 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -225,9 +225,9 @@
 						{% if p.over_18 %}+18{% endif %}
 						{% if p.private %}unlisted{% endif %}
 						{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
-						 
 						{% if p.author.verified %}
-						 {% endif %}		
+						{% endif %}
+						 	
 						{{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
 						 {{p.age_string}}
 						({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index f48cb2af7..d24706bc8 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -106,9 +106,9 @@
 				{% if p.is_blocked %}{% endif %}
 				{% if p.private %}unlisted{% endif %}
 				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
-				 
 				{% if p.author.verified %}
-				 {% endif %}
+				{% endif %}
+				 
 				{{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
 				 {{p.age_string}}
 				 

From 5fc810e49a850d95fa5ba41927a37cae2897bbbc Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 18:07:07 +0200
Subject: [PATCH 13/19] fdfd

---
 files/templates/comments.html           | 2 +-
 files/templates/submission.html         | 1 -
 files/templates/submission_listing.html | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 2a6a89687..2b770a6e8 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -132,7 +132,7 @@
 				{% if c.is_blocked %} {% endif %}
 
 				{% if c.author.verified %}
-				 {% endif %}
+				{% endif %}
 
 				{{c.author.username}}{% if c.author.customtitle %}  {{c.author.customtitle | safe}}{% endif %}
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 59cf1676e..332c3b383 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -227,7 +227,6 @@
 						{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 						{% if p.author.verified %}
 						{% endif %}
-						 	
 						{{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
 						 {{p.age_string}}
 						({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index d24706bc8..5a1613588 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -108,7 +108,6 @@
 				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 				{% if p.author.verified %}
 				{% endif %}
-				 
 				{{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}
 				 {{p.age_string}}
 				 

From bb8dffcad96f94195704648645591631d16c4806 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 18:25:34 +0200
Subject: [PATCH 14/19] fgfg

---
 files/helpers/sanitize.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 658008f10..87bbe5bb4 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -88,8 +88,8 @@ def sanitize(sanitized):
 
 	sanitized = sanitized.replace("\ufeff", "").replace("m.youtube.com", "youtube.com")
 
-	for i in re.finditer('https://i.imgur.com/(.*?)\.(jpg|png|jpeg|)', sanitized):
-		sanitized = sanitized.replace(i.group(1), i.group(1) + "_d." + i.group(2))
+	for i in re.finditer('https://i.imgur.com/((.*?)\.(jpg|png|jpeg))', sanitized):
+		sanitized = sanitized.replace(i.group(1), i.group(2) + "_d." + i.group(3) + "?maxwidth=9999")
 
 	sanitized = bleach.Cleaner(tags=_allowed_tags,
 								attributes=_allowed_attributes,

From e5cfcd84054a3f71c3ceae83d60c66e1e478f608 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 18:27:23 +0200
Subject: [PATCH 15/19] dffd

---
 files/helpers/sanitize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 87bbe5bb4..a3558b8a7 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -88,7 +88,7 @@ def sanitize(sanitized):
 
 	sanitized = sanitized.replace("\ufeff", "").replace("m.youtube.com", "youtube.com")
 
-	for i in re.finditer('https://i.imgur.com/((.*?)\.(jpg|png|jpeg))', sanitized):
+	for i in re.finditer('https://i.imgur.com/(([^_]*?)\.(jpg|png|jpeg))', sanitized):
 		sanitized = sanitized.replace(i.group(1), i.group(2) + "_d." + i.group(3) + "?maxwidth=9999")
 
 	sanitized = bleach.Cleaner(tags=_allowed_tags,

From 694a30f73354fca61eaa1f3321de299191438c8c Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 19:48:25 +0200
Subject: [PATCH 16/19] fdfd

---
 files/templates/comments.html           |  8 ++++----
 files/templates/submission.html         | 12 ++++++------
 files/templates/submission_banned.html  | 10 +++++-----
 files/templates/submission_listing.html | 18 +++++++++---------
 files/templates/userpage.html           |  4 ++--
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 2b770a6e8..ea1a34044 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -29,7 +29,7 @@
 						
 
 
@@ -107,7 +107,7 @@
 	
 	
    
 
-		
    
+		
    
 
 			
  • Unban user
    • 
 					{% else %}
 						
  • Ban user
    • 
@@ -473,7 +473,7 @@
 
 					{% if v and (c.post and v.admin_level == 6) %}
 						{% if c.author_id != v.id %}
-								{% if c.author.is_banned %}
+								{% if c.author.is_suspended %}
 								
  • Unban user
    • 
 								{% else %}
 								
  • Ban user
    • 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 332c3b383..f36627b5c 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -159,7 +159,7 @@
 					{% endif %}
 
 					{% if v and v.admin_level == 6 and v.id!=p.author_id %}
-						{% if p.author.is_banned %}
+						{% if p.author.is_suspended %}
 							
 						{% else %}
 							
@@ -194,7 +194,7 @@
 
 	
    
 
-		
    
+		
    
 			
    
 
 				{% if p.thumb_url and not p.embed_url %}
@@ -291,7 +291,7 @@
 
 					
    
 
-					{% if v and v.id==p.author_id and not v.is_banned %}
+					{% if v and v.id==p.author_id and not v.is_suspended %}
 					
 
-	{% if not v and not p.is_banned %}
+	{% if not v and not p.is_suspended %}
 	
    
 		
 	
    
diff --git a/files/templates/submission_banned.html b/files/templates/submission_banned.html
index 572dc2a40..f7a27f368 100644
--- a/files/templates/submission_banned.html
+++ b/files/templates/submission_banned.html
@@ -11,7 +11,7 @@
 
 {% block title %}
 {{p.realtitle(v)}}
-{% if p.is_banned %}
+{% if p.is_suspended %}
 
 {% else %}
 
@@ -32,7 +32,7 @@
 
 {% endif %}
 {% if v.admin_level >=1 and v.admin_level > p.author.admin_level %}
-{% if p.is_banned %}
+{% if p.is_suspended %}
 
    
 
 
@@ -53,10 +53,10 @@
 										
    
 
 												
    
-														
    
-																
    {% if p.over_18 %}+18 {% endif %}{% if p.is_banned %}[Removed by admins]{% else %}[Deleted by user]{% endif %}
    
+														
    
+																
    {% if p.over_18 %}+18 {% endif %}{% if p.is_suspended %}[Removed by admins]{% else %}[Deleted by user]{% endif %}
    
 																
    {{p.realtitle(v)}}
    
-																
    {% if p.over_18 %}+18 {% endif %}{% if p.is_banned %}[Removed by admins]{% else %}[Deleted by user]{% endif %}
    
+																
    {% if p.over_18 %}+18 {% endif %}{% if p.is_suspended %}[Removed by admins]{% else %}[Deleted by user]{% endif %}
    
 
 														
    
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 5a1613588..30ee1aa8e 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -20,7 +20,7 @@
 {% endif %}
 
 
-
    
+
    
 
 	
    
 
@@ -33,7 +33,7 @@
 					
    
 					{% endif %}
 
-					{{score}}
+					{{score}}
 
 					{% if voted==-1 %}
 					
    
@@ -43,7 +43,7 @@
 
 				
    
 
-				{{score}}
+				{{score}}
 
 				
    
 
@@ -51,7 +51,7 @@
 
 				
    
 
-				{{score}}
+				{{score}}
 
 				
    
 
@@ -201,7 +201,7 @@
 							{% endif %}
 
 							{% if v.admin_level >=3 and v.id!=p.author_id %}
-								{% if p.author.is_banned %}
+								{% if p.author.is_suspended %}
 									
  • Unban user
    • 
 								{% else %}
@@ -248,7 +248,7 @@
 					
 					{% endif %}
 
-					{{score}}
+					{{score}}
 
 					{% if voted==-1 %}
 					
@@ -263,7 +263,7 @@
 					
 					
 
-					{{score}}
+					{{score}}
 
 					
 					
@@ -275,7 +275,7 @@
 						
 					
 
-					{{score}}
+					{{score}}
 
 					
 						
@@ -361,7 +361,7 @@
 					{% endif %}
 
 					{% if v and v.admin_level == 6 and v.id!=p.author_id %}
-						{% if p.author.is_banned %}
+						{% if p.author.is_suspended %}
 							
 						{% else %}
 							
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 575b7cfdb..34cc56708 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -238,7 +238,7 @@
 
 						
    
 						
    
-						{% if u.is_banned %}
+						{% if u.is_suspended %}
 							
 								
 								
    
@@ -457,7 +457,7 @@
 
 						
    
 						
    
-						{% if u.is_banned %}
+						{% if u.is_suspended %}
 							
 								
 								
    

From 26f4024b83d4827edc49b5e7ccca2121413dda72 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 19:56:19 +0200
Subject: [PATCH 17/19] dffd

---
 files/templates/userpage.html | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 34cc56708..de1149ad4 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -114,15 +114,13 @@
 									
 								
 								{% endif %}
+								{% if u.verified %}
+									
+								{% endif %}
 								{% if u.admin_level > 1 or (u.admin_level == 1 and (not v or v.admin_level < 2)) %}
-								
 									
-									{% if u.verified %}{% endif %}
-								
 								{% elif u.admin_level == 1 %}
-								
 									
-								
 								{% endif %}
 								{% if v and v.has_follower(u) %}
 									Follows you
@@ -357,15 +355,13 @@
 						
 					
 				{% endif %}
+				{% if u.verified %}
+					
+				{% endif %}
 				{% if u.admin_level > 1 or (u.admin_level == 1 and (not v or v.admin_level < 2)) %}
-				
 					
-					{% if u.verified %}{% endif %}
-				
 				{% elif u.admin_level == 1 %}
-				
 					
-				
 				{% endif %}
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					Follows you

From 5d5df151c12950be11124b4912637d9f22eb22c4 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 19:58:25 +0200
Subject: [PATCH 18/19] fdfd

---
 files/templates/userpage.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index de1149ad4..2b9fb123b 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -115,6 +115,7 @@
 								
 								{% endif %}
 								{% if u.verified %}
+									 
 									
 								{% endif %}
 								{% if u.admin_level > 1 or (u.admin_level == 1 and (not v or v.admin_level < 2)) %}

From fc9fb22f784e70f17848ae65b1dd1a691e2fe00e Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 21 Aug 2021 20:00:19 +0200
Subject: [PATCH 19/19] dffd

---
 files/templates/userpage.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 2b9fb123b..a45891de5 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -114,14 +114,15 @@
 									
 								
 								{% endif %}
-								{% if u.verified %}
-									 
-									
-								{% endif %}
+								{% if u.verified %}{% endif %}
 								{% if u.admin_level > 1 or (u.admin_level == 1 and (not v or v.admin_level < 2)) %}
+								
 									
+								
 								{% elif u.admin_level == 1 %}
+								
 									
+								
 								{% endif %}
 								{% if v and v.has_follower(u) %}
 									Follows you
@@ -356,13 +357,15 @@
 						
 					
 				{% endif %}
-				{% if u.verified %}
-					
-				{% endif %}
+				{% if u.verified %}{% endif %}
 				{% if u.admin_level > 1 or (u.admin_level == 1 and (not v or v.admin_level < 2)) %}
+				
 					
+				
 				{% elif u.admin_level == 1 %}
+				
 					
+				
 				{% endif %}
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					Follows you