X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=d66690e63048f1d780616d90c13760fe7850a8b4;hb=fd88107b013522d7620f5297386472206f320e10;hp=ef88fd6389a98e4809d45384f6754346aa9f5365;hpb=1c39d47c0f0d91ce8c355cbb0a0ae7f244f16328;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index ef88fd6..d66690e 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CreatePostPage.java - Copyright © 2010 David Roden
+ * Sone - CreatePostPage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,11 +17,16 @@
 
 package net.pterodactylus.sone.web;
 
+import com.google.common.base.Optional;
+
+import net.pterodactylus.sone.data.LocalSone;
 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.sone.text.TextFilter;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
 
 /**
  * This page lets the user create a new {@link Post}.
@@ -50,26 +55,26 @@ public class CreatePostPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-		super.processTemplate(request, dataProvider);
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		if (request.getMethod() == Method.POST) {
 			String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
 			if (text.length() != 0) {
 				String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43);
 				String recipientId = request.getHttpRequest().getPartAsStringFailsafe("recipient", 43);
-				Sone currentSone = getCurrentSone(request.getToadletContext());
-				Sone sender = webInterface.getCore().getLocalSone(senderId, false);
-				if (sender == null) {
-					sender = currentSone;
+				Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
+				Optional<LocalSone> sender = webInterface.getCore().getLocalSone(senderId);
+				if (!sender.isPresent()) {
+					sender = getCurrentSone(request.getToadletContext());
 				}
-				Sone recipient = webInterface.getCore().getSone(recipientId, false);
-				webInterface.getCore().createPost(sender, recipient, System.currentTimeMillis(), text);
+				text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+				webInterface.getCore().createPost(sender.get(), recipient, text);
 				throw new RedirectException(returnPage);
 			}
-			dataProvider.set("errorTextEmpty", true);
+			templateContext.set("errorTextEmpty", true);
 		}
-		dataProvider.set("returnPage", returnPage);
+		templateContext.set("returnPage", returnPage);
 	}
 
 }