X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=d66690e63048f1d780616d90c13760fe7850a8b4;hb=fd88107b013522d7620f5297386472206f320e10;hp=e77e55a898fd142c4fd3658fd1ede592c5f1c271;hpb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;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 e77e55a..d66690e 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.web;
 
+import com.google.common.base.Optional;
+
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.text.TextFilter;
@@ -60,14 +63,13 @@ public class CreatePostPage extends SoneTemplatePage {
 			if (text.length() != 0) {
 				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);
-				if (sender == null) {
-					sender = currentSone;
+				Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
+				Optional<LocalSone> sender = webInterface.getCore().getLocalSone(senderId);
+				if (!sender.isPresent()) {
+					sender = getCurrentSone(request.getToadletContext());
 				}
-				Sone recipient = webInterface.getCore().getSone(recipientId);
 				text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
-				webInterface.getCore().createPost(sender, recipient, System.currentTimeMillis(), text);
+				webInterface.getCore().createPost(sender.get(), recipient, text);
 				throw new RedirectException(returnPage);
 			}
 			templateContext.set("errorTextEmpty", true);