X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FFollowSoneAjaxPage.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FFollowSoneAjaxPage.java;h=071f8e95fc8a1617a7a7587a5ccbff782b6cc23a;hb=45803a1c678d6811f7bbf85d50c79844031be0f0;hp=c58f82d54261e84834cda2366a826774c5e44a65;hpb=33cc85447797301e299e7ac444fe53538f09a69d;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java index c58f82d..071f8e9 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java @@ -17,6 +17,8 @@ package net.pterodactylus.sone.web.ajax; +import com.google.common.base.Optional; + import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; @@ -45,7 +47,8 @@ public class FollowSoneAjaxPage extends JsonPage { @Override protected JsonObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); - if (!webInterface.getCore().hasSone(soneId)) { + Optional sone = webInterface.getCore().getSone(soneId); + if (!sone.isPresent()) { return createErrorJsonObject("invalid-sone-id"); } Sone currentSone = getCurrentSone(request.getToadletContext()); @@ -53,7 +56,7 @@ public class FollowSoneAjaxPage extends JsonPage { return createErrorJsonObject("auth-required"); } webInterface.getCore().followSone(currentSone, soneId); - webInterface.getCore().markSoneKnown(webInterface.getCore().getSone(soneId)); + webInterface.getCore().markSoneKnown(sone.get()); return createSuccessJsonObject(); }