From 6bdbd8117e1562e7eb5f70548854ffeb518b6b99 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 22:22:57 +0200
Subject: [PATCH] fdsdsf

---
 files/classes/submission.py             |  1 +
 files/routes/reporting.py               | 33 ++++++++++++-------------
 files/templates/comments.html           |  2 +-
 files/templates/report_post_modal.html  |  2 +-
 files/templates/submission.html         |  8 +++---
 files/templates/submission_listing.html |  3 ++-
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index 54af7298f..8932fa57a 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -50,6 +50,7 @@ class Submission(Base):
 	url = Column(String)
 	body = Column(String)
 	body_html = Column(String)
+	flair = Column(String)
 	ban_reason = Column(String)
 	embed_url = Column(String)
 
diff --git a/files/routes/reporting.py b/files/routes/reporting.py
index f0b24c48c..f38a84022 100644
--- a/files/routes/reporting.py
+++ b/files/routes/reporting.py
@@ -4,48 +4,47 @@ from flask import g
 from files.__main__ import app, limiter
 from os import path
 
-@app.post("/flag/post/<pid>")
+@app.post("/report/post/<pid>")
 @limiter.limit("1/second")
-@auth_desired
+@auth_required
 def api_flag_post(pid, v):
 
 	post = get_post(pid)
 
-	if v and not v.shadowbanned:
-		existing = g.db.query(Flag.id).filter_by(user_id=v.id, post_id=post.id).first()
-
-		if existing: return "", 409
-
+	if not v.shadowbanned:
 		reason = request.values.get("reason", "").strip()[:100]
 		if "<" in reason: return {"error": f"Reasons can't contain <"}
 
+		if not reason.startswith('!'):
+			existing = g.db.query(Flag.id).filter_by(user_id=v.id, post_id=post.id).first()
+			if existing: return "", 409
+
 		for i in re.finditer(':(.{1,30}?):', reason):
 			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
 				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{i.group(1)}:" title=":{i.group(1)}:" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 		if len(reason) > 350: return {"error": f"Too long."}
 
-		flag = Flag(post_id=post.id,
-					user_id=v.id,
-					reason=reason,
-					)
-					
-
-		g.db.add(flag)
+		if reason.startswith('!') and v.admin_level > 1:
+			post.flair = reason[1:]
+			g.db.add(post)
+		else:
+			flag = Flag(post_id=post.id, user_id=v.id, reason=reason)
+			g.db.add(flag)
 
 		g.db.commit()
 
 	return {"message": "Post reported!"}
 
 
-@app.post("/flag/comment/<cid>")
+@app.post("/report/comment/<cid>")
 @limiter.limit("1/second")
-@auth_desired
+@auth_required
 def api_flag_comment(cid, v):
 
 	comment = get_comment(cid)
 	
-	if v and not v.shadowbanned:
+	if not v.shadowbanned:
 		existing = g.db.query(CommentFlag.id).filter_by(
 			user_id=v.id, comment_id=comment.id).first()
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 5e5964f26..a209560b6 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -749,7 +749,7 @@
 
 {% if v %}
 	<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
-	<script src="/assets/js/comments_v.js?v=81"></script>
+	<script src="/assets/js/comments_v.js?v=82"></script>
 {% endif %}
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 33ed1350c..210208cc3 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -32,4 +32,4 @@
 	</div>
 </div>
 
-<script src="/assets/js/report_post_modal.js?v=54"></script>
\ No newline at end of file
+<script src="/assets/js/report_post_modal.js?v=55"></script>
\ No newline at end of file
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 42f5c565e..db2383840 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -401,12 +401,14 @@
 					{% endif %}
 					{% if p.realurl(v) %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
-							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:10px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
 						</a></h1>					
 					{% else %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3">
-							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:10px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
 						</h1>
 					{% endif %}
@@ -902,7 +904,7 @@
 
 {% if not p.comment_count %}
 	{% if v %}
-		<script src="/assets/js/comments_v.js?v=81"></script>
+		<script src="/assets/js/comments_v.js?v=82"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 160119639..e9bfb1863 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -198,7 +198,8 @@
 			</div>
 
 			<h5 class="card-title post-title text-left w-lg-75 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %} class="stretched-link">
-				{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:10px; line-height:2;">{{cc}}</span>{% endif %}
+				{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+				{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
 				{{p.realtitle(v) | safe}}
 			</a></h5>