Merge branch 'release-0.9.6'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / CreatePostPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index d2bd5da..ed478de 100644 (file)
--- 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–2016 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,15 @@
 
 package net.pterodactylus.sone.web;
 
+import com.google.common.base.Optional;
+
 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;
 
 /**
  * This page lets the user create a new {@link Post}.
@@ -38,7 +43,7 @@ public class CreatePostPage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public CreatePostPage(Template template, WebInterface webInterface) {
-               super("createPost.html", template, "Page.CreatePost.Title", webInterface);
+               super("createPost.html", template, "Page.CreatePost.Title", webInterface, true);
        }
 
        //
@@ -49,30 +54,26 @@ public class CreatePostPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, Template template) throws RedirectException {
-               super.processTemplate(request, template);
+       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+               String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
                if (request.getMethod() == Method.POST) {
                        String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
-                       String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
                        if (text.length() != 0) {
+                               String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43);
+                               String recipientId = request.getHttpRequest().getPartAsStringFailsafe("recipient", 43);
                                Sone currentSone = getCurrentSone(request.getToadletContext());
-                               webInterface.core().createPost(currentSone, System.currentTimeMillis(), text);
+                               Sone sender = webInterface.getCore().getLocalSone(senderId);
+                               if (sender == null) {
+                                       sender = currentSone;
+                               }
+                               Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
+                               text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+                               webInterface.getCore().createPost(sender, recipient, text);
                                throw new RedirectException(returnPage);
                        }
-                       template.set("errorTextEmpty", true);
+                       templateContext.set("errorTextEmpty", true);
                }
-       }
-
-       //
-       // SONETEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return true;
+               templateContext.set("returnPage", returnPage);
        }
 
 }