X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUnfollowSoneAjaxPage.java;h=1e87b1519c8c556278ba7b1eecf13562a2191ec2;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=509f629f4a8a36f863a06a05fd84b13be60959f8;hpb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6;p=Sone.git

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 509f629..1e87b15 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–2013 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
@@ -19,7 +19,7 @@ package net.pterodactylus.sone.web.ajax;
 
 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.
@@ -35,26 +35,24 @@ public class UnfollowSoneAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public UnfollowSoneAjaxPage(WebInterface webInterface) {
-		super("ajax/unfollowSone.ajax", webInterface);
+		super("unfollowSone.ajax", webInterface);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		Sone sone = webInterface.getCore().getSone(soneId);
-		if (sone == null) {
-			return new JsonObject().put("success", false).put("error", "invalid-sone-id");
+		if (!webInterface.getCore().getSone(soneId).isPresent()) {
+			return createErrorJsonObject("invalid-sone-id");
 		}
-		Sone currentSone = getCurrentSone(request.getToadletContext());
+		Sone currentSone = getCurrentSone(request.getToadletContext()).get();
 		if (currentSone == null) {
-			return new JsonObject().put("success", false).put("error", "auth-required");
+			return createErrorJsonObject("auth-required");
 		}
-		currentSone.removeFriend(sone);
-		webInterface.getCore().saveSone(currentSone);
-		return new JsonObject().put("success", true);
+		webInterface.getCore().unfollowSone(currentSone, soneId);
+		return createSuccessJsonObject();
 	}
 
 }