X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUnfollowSoneAjaxPage.java;h=28ffbf2ad50fc46426900c50a455855198ddf2af;hp=803464c93ecd41aab6312aded4fd911e7ce78362;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=419098bcd6215125408b29e60bd888e60979d37b diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java index 803464c..28ffbf2 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java @@ -1,5 +1,5 @@ /* - * Sone - UnfollowSoneAjaxPage.java - Copyright © 2010–2015 David Roden + * Sone - UnfollowSoneAjaxPage.java - Copyright © 2010–2016 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ package net.pterodactylus.sone.web.ajax; +import javax.annotation.Nonnull; + import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; @@ -26,7 +28,7 @@ import net.pterodactylus.sone.web.page.FreenetRequest; * * @author David ‘Bombe’ Roden */ -public class UnfollowSoneAjaxPage extends JsonPage { +public class UnfollowSoneAjaxPage extends LoggedInJsonPage { /** * Creates a new “unfollow Sone” AJAX page. @@ -41,16 +43,13 @@ public class UnfollowSoneAjaxPage extends JsonPage { /** * {@inheritDoc} */ + @Nonnull @Override - protected JsonReturnObject createJsonObject(FreenetRequest request) { + protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); if (!webInterface.getCore().getSone(soneId).isPresent()) { return createErrorJsonObject("invalid-sone-id"); } - Sone currentSone = getCurrentSone(request.getToadletContext()); - if (currentSone == null) { - return createErrorJsonObject("auth-required"); - } webInterface.getCore().unfollowSone(currentSone, soneId); return createSuccessJsonObject(); }