X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=3e7622ad9658b36405b6561c02b85b3b7defe4a0;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=22f6efae09bb0ae3fd950cd81ab150b5993fcf6b;hpb=38cb6c5ec82298ee351d0eb15ddd8331db273af2;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 22f6efa..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,6 +17,9 @@ 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.text.TextFilter; @@ -25,6 +28,8 @@ 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}. * @@ -48,9 +53,6 @@ public class CreatePostPage extends SoneTemplatePage { // TEMPLATEPATH METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -61,13 +63,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); + Optional recipient = webInterface.getCore().getSone(recipientId); text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text); - webInterface.getCore().createPost(sender, recipient, System.currentTimeMillis(), text); + sender.get().newPostBuilder().to(recipient.transform(Identified.GET_ID)).withText(text).build(webInterface.getCore().postCreated()); throw new RedirectException(returnPage); } templateContext.set("errorTextEmpty", true);