X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateReplyPage.java;h=aae5e833eb40477bc0249f899e854e9c5e7e56de;hb=ecf753a31601e558b681daab0598009fe9eec99a;hp=d4a97758f191ef4dee4cb15b83bbb9c41321dedd;hpb=fa63b855e28c5fbf270bfdca1bb23fd048affae5;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
index d4a9775..aae5e83 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
@@ -20,8 +20,8 @@ package net.pterodactylus.sone.web;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * This page lets the user post a reply to a post.
@@ -50,23 +50,27 @@ public class CreateReplyPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-		super.processTemplate(request, dataProvider);
+	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
 		String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
 		String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		if (request.getMethod() == Method.POST) {
 			Post post = webInterface.getCore().getPost(postId);
 			if (text.length() > 0) {
-				Sone currentSone = getCurrentSone(request.getToadletContext());
-				webInterface.getCore().createReply(currentSone, post, text);
+				String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43);
+				Sone sender = webInterface.getCore().getLocalSone(senderId, false);
+				if (sender == null) {
+					sender = getCurrentSone(request.getToadletContext());
+				}
+				webInterface.getCore().createReply(sender, post, text);
 				throw new RedirectException(returnPage);
 			}
-			dataProvider.set("errorTextEmpty", true);
+			templateContext.set("errorTextEmpty", true);
 		}
-		dataProvider.set("postId", postId);
-		dataProvider.set("text", text);
-		dataProvider.set("returnPage", returnPage);
+		templateContext.set("postId", postId);
+		templateContext.set("text", text);
+		templateContext.set("returnPage", returnPage);
 	}
 
 }