X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=3e7622ad9658b36405b6561c02b85b3b7defe4a0;hb=0a4b6fc252003c71f4bdef09560e87982838d9c8;hp=1b7271b559452bae4c2d5fbdf004b95d546034f9;hpb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6;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 1b7271b..3e7622a 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,10 +17,18 @@ package net.pterodactylus.sone.web; +import static com.google.common.base.Optional.of; + +import net.pterodactylus.sone.data.Identified; 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}. @@ -45,23 +53,28 @@ public class CreatePostPage extends SoneTemplatePage { // TEMPLATEPATH METHODS // - /** - * {@inheritDoc} - */ @Override - protected void processTemplate(Request request, Template template) throws RedirectException { - super.processTemplate(request, template); - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64); + 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()); - webInterface.getCore().createPost(currentSone, System.currentTimeMillis(), text); + Optional sender = webInterface.getCore().getLocalSone(senderId); + if (sender == null) { + sender = of(currentSone); + } + Optional recipient = webInterface.getCore().getSone(recipientId); + text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text); + sender.get().newPostBuilder().to(recipient.transform(Identified.GET_ID)).withText(text).build(webInterface.getCore().postCreated()); throw new RedirectException(returnPage); } - template.set("errorTextEmpty", true); + templateContext.set("errorTextEmpty", true); } - template.set("returnPage", returnPage); + templateContext.set("returnPage", returnPage); } }