X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateReplyPage.java;h=3ec13f6bfe6f6982b63d62ff4a7dbad320835525;hb=5bcc4f8e8d920408cf0c940ba67f6a1ebf9c4228;hp=55903d88ee2f8ee94afa3d7051f5969519c58926;hpb=a2bc0e269c0ad1a587764eaf9121b02890996319;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java index 55903d8..3ec13f6 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java @@ -19,8 +19,8 @@ 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; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; @@ -66,12 +66,12 @@ public class CreateReplyPage extends SoneTemplatePage { } if (text.length() > 0) { String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43); - Sone sender = webInterface.getCore().getLocalSone(senderId); - if (sender == null) { + Optional sender = webInterface.getCore().getLocalSone(senderId); + if (!sender.isPresent()) { sender = getCurrentSone(request.getToadletContext()); } text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text); - webInterface.getCore().createReply(sender, post.get(), text); + webInterface.getCore().createReply(sender.get(), post.get(), text); throw new RedirectException(returnPage); } templateContext.set("errorTextEmpty", true);