Merge branch 'fcp-interface' into next

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
index ce2462c..0fc1236 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.json.JsonObject;
 
@@ -36,7 +37,7 @@ public class CreatePostAjaxPage extends JsonPage {
         *            The Sone web interface
         */
        public CreatePostAjaxPage(WebInterface webInterface) {
-               super("ajax/createPost.ajax", webInterface);
+               super("createPost.ajax", webInterface);
        }
 
        /**
@@ -50,12 +51,18 @@ public class CreatePostAjaxPage extends JsonPage {
                }
                String recipientId = request.getHttpRequest().getParam("recipient");
                Sone recipient = webInterface.getCore().getSone(recipientId, false);
+               String senderId = request.getHttpRequest().getParam("sender");
+               Sone sender = webInterface.getCore().getLocalSone(senderId, false);
+               if (sender == null) {
+                       sender = sone;
+               }
                String text = request.getHttpRequest().getParam("text");
                if ((text == null) || (text.trim().length() == 0)) {
                        return createErrorJsonObject("text-required");
                }
-               Post newPost = webInterface.getCore().createPost(sone, recipient, text);
-               return createSuccessJsonObject().put("postId", newPost.getId());
+               text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+               Post newPost = webInterface.getCore().createPost(sender, recipient, text);
+               return createSuccessJsonObject().put("postId", newPost.getId()).put("sone", sender.getId()).put("recipient", (newPost.getRecipient() != null) ? newPost.getRecipient().getId() : null);
        }
 
 }