From 75da44fd989da833691509572839fc1921392958 Mon Sep 17 00:00:00 2001
From: TLSM <duolsm@outlook.com>
Date: Thu, 13 Jul 2023 01:40:23 -0400
Subject: [PATCH] Freshen branch, fix commenting

Handle a couple places with `t3_` that persisted from code movement.
on master after time of branch.

Then, fix commenting, which used inaccurate fullname parsing logic.
---
 files/routes/comments.py                                | 5 ++---
 files/templates/component/comment/replybox_comment.html | 4 ++--
 files/templates/component/comment/replybox_message.html | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/files/routes/comments.py b/files/routes/comments.py
index 399579c97..82a8f0b88 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -111,16 +111,15 @@ def api_comment(v):
 	parent_fullname = request.values.get("parent_fullname", "").strip()
 
 	if len(parent_fullname) < 4: abort(400)
-	id = parent_fullname[3:]
 	parent = None
 	parent_post = None
 	parent_comment_id = None
 
 	if parent_fullname.startswith("post_"):
-		parent = get_post(id, v=v)
+		parent = get_post(parent_fullname.split("post_")[1], v=v)
 		parent_post = parent
 	elif parent_fullname.startswith("comment_"):
-		parent = get_comment(id, v=v)
+		parent = get_comment(parent_fullname.split("comment_")[1], v=v)
 		parent_post = get_post(parent.parent_submission, v=v) if parent.parent_submission else None
 		parent_comment_id = parent.id
 	else: abort(400)
diff --git a/files/templates/component/comment/replybox_comment.html b/files/templates/component/comment/replybox_comment.html
index 6f9577636..9e5babedc 100644
--- a/files/templates/component/comment/replybox_comment.html
+++ b/files/templates/component/comment/replybox_comment.html
@@ -1,10 +1,10 @@
 <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" enctype="multipart/form-data"> 
+		<form id="reply-to-{{c.fullname}}" 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 autocomplete="off" id="reply-form-submission-{{c.fullname}}" type="hidden" name="submission" value="{{c.post.id}}"> 
-			<textarea required autocomplete="off" minlength="1" maxlength="{{COMMENT_BODY_LENGTH_MAXIMUM}}" 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> 
+			<textarea required autocomplete="off" minlength="1" maxlength="{{COMMENT_BODY_LENGTH_MAXIMUM}}" 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-{{c.fullname}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add your comment..." rows="3"></textarea>
 	
 			<div class="text-small font-weight-bold mt-1" id="charcount-{{c.id}}" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
 
diff --git a/files/templates/component/comment/replybox_message.html b/files/templates/component/comment/replybox_message.html
index c3efb6ceb..201a518b7 100644
--- a/files/templates/component/comment/replybox_message.html
+++ b/files/templates/component/comment/replybox_message.html
@@ -3,7 +3,7 @@
 	<div id="comment-form-space-{{c.id}}" class="comment-write collapsed child">		
 		<form id="reply-to-message-{{c.id}}" action="/reply" method="post" class="input-group" enctype="multipart/form-data">
 			<input type="hidden" name="formkey" value="{{v.formkey}}"> 
-			<textarea required autocomplete="off" minlength="1" maxlength="{{MESSAGE_BODY_LENGTH_MAXIMUM}}" name="body" form="reply-to-t3_{{c.id}}" data-id="{{c.id}}" class="comment-box form-control rounded" id="reply-form-body-{{c.id}}" aria-label="With textarea" rows="3" oninput="markdown('reply-form-body-{{c.id}}', 'message-reply-{{c.id}}')"></textarea> 
+			<textarea required autocomplete="off" minlength="1" maxlength="{{MESSAGE_BODY_LENGTH_MAXIMUM}}" name="body" form="reply-to-message-{{c.id}}" data-id="{{c.id}}" class="comment-box form-control rounded" id="reply-form-body-{{c.id}}" aria-label="With textarea" rows="3" oninput="markdown('reply-form-body-{{c.id}}', 'message-reply-{{c.id}}')"></textarea>
 			<div class="comment-format" id="comment-format-bar-{{c.id}}">
 				{% if c.sentto == MODMAIL_ID %}
 					<label class="btn btn-secondary m-0 mt-3" for="file-upload">