X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=f32e08973a83f9468eee4e3c8ef77575d0b49023;hb=2f995a29d8731dc3b3d20e78fd9382be542292ff;hp=57eb18abf4c5a92bf6bc7ae5d8f7f3c8aa8b1b06;hpb=13e00a0611cd80e43f813171d8b6d84870afbcbc;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 57eb18a..f32e089 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,17 @@ package net.pterodactylus.sone.web; +import static com.google.common.base.Optional.of; + import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.web.page.Page.Request.Method; +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; + +import com.google.common.base.Optional; /** * This page lets the user create a new {@link Post}. @@ -50,7 +56,7 @@ public class CreatePostPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException { + 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) { @@ -59,12 +65,13 @@ public class CreatePostPage extends SoneTemplatePage { 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); + Optional sender = webInterface.getCore().getLocalSone(senderId); if (sender == null) { - sender = currentSone; + sender = of(currentSone); } - Sone recipient = webInterface.getCore().getSone(recipientId, false); - webInterface.getCore().createPost(sender, recipient, System.currentTimeMillis(), text); + Optional recipient = webInterface.getCore().getSone(recipientId); + text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text); + webInterface.getCore().createPost(sender.get(), recipient, System.currentTimeMillis(), text); throw new RedirectException(returnPage); } templateContext.set("errorTextEmpty", true);