X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUnfollowSoneAjaxPage.java;h=e5fc749ced54a24fe48dcb5c90d5a12de9b40cc8;hb=0aa389b2493e19484530698e2ce056372dc2a1e9;hp=26f1a1156dd085f87ccf272e1314a785052513ff;hpb=38cb6c5ec82298ee351d0eb15ddd8331db273af2;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 26f1a11..e5fc749 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
@@ -17,10 +17,10 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
 
 /**
  * AJAX page that lets a Sone unfollow another Sone.
@@ -43,17 +43,16 @@ public class UnfollowSoneAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(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());
+		LocalSone currentSone = getCurrentSone(request.getToadletContext()).get();
 		if (currentSone == null) {
 			return createErrorJsonObject("auth-required");
 		}
-		currentSone.removeFriend(soneId);
-		webInterface.getCore().touchConfiguration();
+		webInterface.getCore().unfollowSone(currentSone, soneId);
 		return createSuccessJsonObject();
 	}