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=c2379e89175a3ce49dc0e773871f79f22fc525d8;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=6db033602e7c17efc40a4a19efe705d67832fc1a

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 c2379e8..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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class UnfollowSoneAjaxPage extends JsonPage {
+public class UnfollowSoneAjaxPage extends LoggedInJsonPage {
 
 	/**
 	 * Creates a new “unfollow Sone” AJAX page.
@@ -41,18 +43,14 @@ public class UnfollowSoneAjaxPage extends JsonPage {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Nonnull
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		if (!webInterface.getCore().hasSone(soneId)) {
+		if (!webInterface.getCore().getSone(soneId).isPresent()) {
 			return createErrorJsonObject("invalid-sone-id");
 		}
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		if (currentSone == null) {
-			return createErrorJsonObject("auth-required");
-		}
-		currentSone.removeFriend(soneId);
-		webInterface.getCore().saveSone(currentSone);
+		webInterface.getCore().unfollowSone(currentSone, soneId);
 		return createSuccessJsonObject();
 	}