X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=d66690e63048f1d780616d90c13760fe7850a8b4;hp=0590f725e7756d6d27a5a6d657dc67112e2489a6;hb=fd88107b013522d7620f5297386472206f320e10;hpb=d063d7366c883a8f130de67af67a84eb6d725361

diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index 0590f72..d66690e 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@ -19,6 +19,7 @@ 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;
@@ -62,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()).get();
-				Sone sender = webInterface.getCore().getLocalSone(senderId);
-				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());
+				}
 				text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
-				webInterface.getCore().createPost(sender, recipient, text);
+				webInterface.getCore().createPost(sender.get(), recipient, text);
 				throw new RedirectException(returnPage);
 			}
 			templateContext.set("errorTextEmpty", true);