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=e9650aaf99c924f6478b4e0dcb8d4909a5b61baa;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=01d2e31e5687276b5104edc27c3416d4cd9b89b8 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 e9650aa..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 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,16 +17,18 @@ 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.util.json.JsonObject; +import net.pterodactylus.sone.web.page.FreenetRequest; /** * AJAX page that lets a Sone unfollow another Sone. * * @author David ‘Bombe’ Roden */ -public class UnfollowSoneAjaxPage extends JsonPage { +public class UnfollowSoneAjaxPage extends LoggedInJsonPage { /** * Creates a new “unfollow Sone” AJAX page. @@ -35,26 +37,21 @@ public class UnfollowSoneAjaxPage extends JsonPage { * The Sone web interface */ public UnfollowSoneAjaxPage(WebInterface webInterface) { - super("ajax/unfollowSone.ajax", webInterface); + super("unfollowSone.ajax", webInterface); } /** * {@inheritDoc} */ + @Nonnull @Override - protected JsonObject createJsonObject(Request request) { + protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); - Sone sone = webInterface.core().getSone(soneId); - if (sone == null) { - return new JsonObject().put("success", false).put("error", "invalid-sone-id"); - } - Sone currentSone = getCurrentSone(request.getToadletContext()); - if (currentSone == null) { - return new JsonObject().put("success", false).put("error", "auth-required"); + if (!webInterface.getCore().getSone(soneId).isPresent()) { + return createErrorJsonObject("invalid-sone-id"); } - currentSone.removeFriend(sone); - webInterface.core().saveSone(currentSone); - return new JsonObject().put("success", true); + webInterface.getCore().unfollowSone(currentSone, soneId); + return createSuccessJsonObject(); } }