From e5ab485f1097c17f5309256d34c81e6fbb7a3d61 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 27 Nov 2021 01:45:11 +0200
Subject: [PATCH] dfsfds

---
 files/assets/js/comments_v.js       | 24 ++++++++++++++++++++++++
 files/assets/js/submit.js           |  2 +-
 files/templates/comment_failed.html |  2 +-
 files/templates/comments.html       | 16 +++++++++++-----
 files/templates/submission.html     | 16 +++++++++++-----
 files/templates/submit.html         |  9 +++++----
 6 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js
index cac8a3217..0f9cd0379 100644
--- a/files/assets/js/comments_v.js
+++ b/files/assets/js/comments_v.js
@@ -268,4 +268,28 @@ function markdown(first, second) {
 	}
 	
 	document.getElementById(second).innerHTML = marked(input)
+}
+
+function charLimit(form, text) {
+
+	var input = document.getElementById(form);
+
+	var text = document.getElementById(text);
+
+	var length = input.value.length;
+
+	var maxLength = input.getAttribute("maxlength");
+
+	if (length >= maxLength) {
+		text.style.color = "#E53E3E";
+	}
+	else if (length >= maxLength * .72){
+		text.style.color = "#FFC107";
+	}
+	else {
+		text.style.color = "#A0AEC0";
+	}
+
+	text.innerText = length + ' / ' + maxLength;
+
 }
\ No newline at end of file
diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js
index 0515f062a..90ad0d4e0 100644
--- a/files/assets/js/submit.js
+++ b/files/assets/js/submit.js
@@ -74,7 +74,7 @@ function charLimit(form, text) {
 		text.style.color = "#A0AEC0";
 	}
 
-	text.innerText = maxLength - length;
+	text.innerText = length + ' / ' + maxLength;
 
 }
 
diff --git a/files/templates/comment_failed.html b/files/templates/comment_failed.html
index 7305fca1a..604f404fd 100644
--- a/files/templates/comment_failed.html
+++ b/files/templates/comment_failed.html
@@ -26,7 +26,7 @@
 				{% if parent_fullname %}<input type="hidden" name="parent_fullname" value="{{parent_fullname}}">{% endif %}
 				{% if parent_submission %}<input type="hidden" name="submission" value="{{parent_submission}}">{% endif %}
 
-				<textarea name="body" form="reply" class="comment-box form-control rounded" id="reply-form" aria-label="With textarea" placeholder="Add your comment..." maxlength="10000" rows="10">{{body}}</textarea> 
+				<textarea name="body" form="reply" class="comment-box form-control rounded" id="reply-form" aria-label="With textarea" placeholder="Add your comment..." {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" rows="10">{{body}}</textarea> 
 
 				<div class="comment-format"> 
 					<small class="format pl-0"><i class="fas fa-bold" aria-hidden="true" onclick="makeReplyBold()" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Bold"></i></small> 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index ddca700f1..5ceaba5bd 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -27,7 +27,7 @@
 {% if v %}
 	{% include "award_modal.html" %}
 	<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
-	<script src="/assets/js/comments_v.js?v=70"></script>
+	<script src="/assets/js/comments_v.js?v=73"></script>
 {% endif %}
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
@@ -374,9 +374,12 @@
 
 				{% if v and v.id==c.author_id %}
 				<div id="comment-edit-{{c.id}}" class="d-none comment-write collapsed child">
-					<form id="comment-edit-form-{{c.id}}" action="/edit_comment/{{c.id}}" method="post" class="input-group" enctype="multipart/form-data"> 
+					<form id="comment-edit-form-{{c.id}}" action="/edit_comment/{{c.id}}" method="post" enctype="multipart/form-data"> 
 						<input type="hidden" name="formkey" value="{{v.formkey}}">
-						<textarea maxlength="10000" oninput="markdown('comment-edit-body-{{c.id}}', 'preview-edit-{{c.id}}')" id="comment-edit-body-{{c.id}}" data-id="{{c.id}}" name="body" form="comment-edit-form-{{c.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add your comment..." rows="3">{{c.body}}</textarea> 
+						<textarea {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" oninput="markdown('comment-edit-body-{{c.id}}', 'preview-edit-{{c.id}}');charLimit('comment-edit-body-{{c.id}}','charcount-edit-{{c.id}}')" id="comment-edit-body-{{c.id}}" data-id="{{c.id}}" name="body" form="comment-edit-form-{{c.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add your comment..." rows="3">{{c.body}}</textarea> 
+						
+						<div class="text-small font-weight-bold" id="charcount-edit-{{c.id}}" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
+
 						<div class="comment-format"> 
 							<a class="btn btn-secondary format d-inline-block m-0" href="javascript:void(0)"><i class="fas fa-bold" onclick="makeBold('comment-edit-body-{{c.id}}')" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i></a>
 							&nbsp;
@@ -537,11 +540,14 @@
 
 		<div id="reply-to-{{c.id}}" class="d-none">
 			<div id="comment-form-space-{{c.fullname}}" class="comment-write collapsed child">
-				<form id="reply-to-t3_{{c.id}}" action="/comment" method="post" class="input-group" enctype="multipart/form-data"> 
+				<form id="reply-to-t3_{{c.id}}" action="/comment" method="post" enctype="multipart/form-data"> 
 					<input type="hidden" name="formkey" value="{{v.formkey}}"> 
 					<input type="hidden" name="parent_fullname" value="{{c.fullname}}"> 
 					<input id="reply-form-submission-{{c.fullname}}" type="hidden" name="submission" value="{{c.post.id}}"> 
-					<textarea maxlength="10000" oninput="markdown('reply-form-body-{{c.fullname}}', 'reply-edit-{{c.id}}')" id="reply-form-body-{{c.fullname}}" data-fullname="{{c.fullname}}" name="body" form="reply-to-t3_{{c.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add your comment..." rows="3"></textarea> 
+					<textarea {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" oninput="markdown('reply-form-body-{{c.fullname}}', 'reply-edit-{{c.id}}');charLimit('reply-form-body-{{c.fullname}}','charcount-{{c.id}}')" id="reply-form-body-{{c.fullname}}" data-fullname="{{c.fullname}}" name="body" form="reply-to-t3_{{c.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add your comment..." rows="3"></textarea> 
+					
+					<div class="text-small font-weight-bold" id="charcount-{{c.id}}" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
+
 					<div class="comment-format" id="comment-format-bar-{{c.id}}"> 
 						<a class="btn btn-secondary format d-inline-block m-0" href="javascript:void(0)"><i class="fas fa-bold" onclick="makeBold('reply-form-body-{{c.fullname}}')" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i></a>
 						&nbsp;
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0613a3028..4924937c8 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -146,7 +146,7 @@
 	</script>
 
 	{% if v %}
-		<script src="/assets/js/comments_v.js?v=70"></script>
+		<script src="/assets/js/comments_v.js?v=73"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
@@ -557,11 +557,14 @@
 
 					{% if v and (v.id==p.author_id or v.admin_level > 2) and not v.is_suspended %}
 						<div id="edit-post-body-{{p.id}}" class="d-none comment-write collapsed child">
-							<form id="post-edit-form-{{p.id}}" class="d-flex flex-column input-group" action="/edit_post/{{p.id}}" method="post">
+							<form id="post-edit-form-{{p.id}}" class="d-flex flex-column" action="/edit_post/{{p.id}}" method="post">
 								<input type="hidden" name="formkey" value="{{v.formkey}}">
 								<input type="hidden" name="current_page" value="{{request.path}}">
 								<input name="title" required placeholder="title" value="{{p.title}}" >
-								<textarea name="body" maxlength="10000" oninput="markdown('post-edit-box-{{p.id}}', 'post-edit-{{p.id}}')" id="post-edit-box-{{p.id}}" form="post-edit-form-{{p.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add text to your post..." rows="10">{{p.body}}</textarea> 
+								<textarea name="body" {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" oninput="markdown('post-edit-box-{{p.id}}', 'post-edit-{{p.id}}');charLimit('post-edit-box-{{p.id}}','charcount-post-edit')" id="post-edit-box-{{p.id}}" form="post-edit-form-{{p.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add text to your post..." rows="10">{{p.body}}</textarea> 
+								
+								<div class="text-small font-weight-bold" id="charcount-post-edit" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
+
 								<div class="comment-format"> 
 									<small class="format pl-0"><i class="fas fa-bold" aria-hidden="true" onclick="makeBold('post-edit-box-{{p.id}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Bold"></i></small> 
 									<a class="format" href="javascript:void(0)"><i class="fas fa-italic" aria-hidden="true" onclick="makeItalics('post-edit-box-{{p.id}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Italicize"></i></a> 
@@ -806,13 +809,16 @@
 		</div>
 
 	<div id="comment-form-space-{{p.fullname}}" class="comment-write mb-3">
-		<form id="reply-to-{{p.fullname}}" class="input-group" action="/comment" method="post">
+		<form id="reply-to-{{p.fullname}}" action="/comment" method="post">
 			<input type="hidden" name="formkey" value="{{v.formkey}}">
 			<input type="hidden" name="parent_fullname" value="t2_{{p.id}}">
 			<input id="reply-form-submission-{{p.fullname}}" type="hidden" name="submission" value="{{p.id}}">
 			{% if v %}
-			<textarea maxlength="10000" oninput="markdown('reply-form-body-{{p.fullname}}', 'form-preview-{{p.id}}')" id="reply-form-body-{{p.fullname}}" data-fullname="{{p.fullname}}" class="comment-box form-control rounded" id="comment-form" name="body" form="reply-to-{{p.fullname}}" aria-label="With textarea" placeholder="Add your comment..." rows="3"></textarea>
+			<textarea {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" oninput="markdown('reply-form-body-{{p.fullname}}', 'form-preview-{{p.id}}');charLimit('reply-form-body-{{p.fullname}}','charcount-reply')" id="reply-form-body-{{p.fullname}}" data-fullname="{{p.fullname}}" class="comment-box form-control rounded" id="comment-form" name="body" form="reply-to-{{p.fullname}}" aria-label="With textarea" placeholder="Add your comment..." rows="3"></textarea>
 			{% endif %}
+
+			<div class="text-small font-weight-bold" id="charcount-reply" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
+
 			<div class="comment-format">
 				<a class="btn btn-secondary format d-inline-block m-0" href="javascript:void(0)"><i class="fas fa-bold" onclick="makeBold('reply-form-body-{{p.fullname}}')" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i></a>
 				&nbsp;
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 32a5215db..3d75c9a6e 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -4,7 +4,7 @@
 		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
 
-		<script src="/assets/js/submit.js?v=68"></script>
+		<script src="/assets/js/submit.js?v=72"></script>
 
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -96,14 +96,15 @@
 												<label for="body" class="mt-3">Text<i class="fas fa-info-circle text-gray-400 ml-1" data-bs-toggle="tooltip" data-bs-placement="top" title="" data-bs-original-title="Uses markdown. Limited to 10000 characters."></i></label>
 
 												<div>
-													<textarea form="submitform" id="post-text" class="form-control rounded" aria-label="With textarea" placeholder="Optional if you have a link or an image." rows="7" name="body" oninput="markdown();charLimit('post-text','character-count-submit-text-form');checkForRequired()" maxlength="10000" required></textarea>
+													<textarea form="submitform" id="post-text" class="form-control rounded" aria-label="With textarea" placeholder="Optional if you have a link or an image." rows="7" name="body" oninput="markdown();charLimit('post-text','character-count-submit-text-form');checkForRequired()" {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" required></textarea>
 
 													<div class="btn btn-secondary" onclick="document.getElementById('preview').classList.toggle('d-none');" style="float: right;">
 														Toggle preview
 													</div>
-													<div id="preview" class="my-3"></div>
 
-													<span class="position-absolute text-small font-weight-bold" id="character-count-submit-text-form" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></span>
+													<div class="text-small font-weight-bold" id="character-count-submit-text-form" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
+
+													<div id="preview" class="my-3"></div>
 												</div>
 
 												<p></p>