From 1a2ce0099394e6f8991de61c8861c4513cd6a5fa Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Tue, 31 Aug 2021 18:58:08 +0200
Subject: [PATCH] fdfd

---
 files/routes/users.py         | 7 ++++---
 files/templates/comments.html | 5 +++--
 files/templates/default.html  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/files/routes/users.py b/files/routes/users.py
index 92d062fdc7..aea4c2bee1 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -165,12 +165,13 @@ def message2(v, username):
 	return redirect(f"/@{username}")
 
 
-@app.post("/@<username>/reply/<id>")
+@app.post("/reply/<id>")
 @auth_required
 def messagereply(v, username, id):
 
-	message = request.form.get("message", "")[:1000].strip()
-	user = get_user(username)
+	message = request.form.get("message")[:1000].strip()
+	user = request.form.get("sentto")
+	id = request.form.get("parent_id")
 	message = message.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")
 
 	# check existing
diff --git a/files/templates/comments.html b/files/templates/comments.html
index f56ecabbf8..3aaadf914c 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -169,9 +169,10 @@
 					<a class="btn btn-primary" href="javascript:void(0)" onclick="document.getElementById('reply-to-message-{{c.id}}').classList.toggle('d-none')">Reply</a>
 					<pre></pre>
 	
-					<form class="d-none" id="reply-to-message-{{c.id}}" action="/@{{c.author.username}}/reply/{{c.id}}" method="post"  class="input-group" enctype="multipart/form-data">
+					<form class="d-none" 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}}"> 
-						<input type="hidden" name="parent_fullname" value="{{c.fullname}}"> 
+						<input type="hidden" name="parent_id" value="{{c.id}}">
+						<input type="hidden" name="sentto" value="{{c.author.username}}"> 
 						<textarea name="body" form="reply-to-t3_{{c.id}}" class="comment-box form-control rounded" id="reply-form-body-{{c.fullname}}" aria-label="With textarea" rows="3"></textarea> 
 						<div class="comment-format" id="comment-format-bar-{{c.id}}"> 
 							<label class="btn btn-secondary format d-inline-block m-0" for="gif-reply-btn-{{c.fullname}}">
diff --git a/files/templates/default.html b/files/templates/default.html
index fa03bb02f1..0933200a41 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -528,7 +528,7 @@
 			form.append('body', document.getElementById('reply-form-body-'+fullname).value);
 			form.append('file', document.getElementById('file-upload-reply-'+fullname).files[0]);
 			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/comment");
+			xhr.open("post", "/reply");
 			xhr.withCredentials=true;
 			xhr.onload=function(){
 				if (xhr.status==200) {