X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FFollowSoneAjaxPage.java;h=1af59f36461cbac95672ff340a8099f2b3625a6b;hb=2835d19c0c20dc13fab9371f8cd56984c9114dab;hp=5c3e5f44a687a5c64141c1360521cface38b8176;hpb=45f92ec63dbf8134d92ceed67294faa38117b195;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
index 5c3e5f4..1af59f3 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FollowSoneAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - FollowSoneAjaxPage.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
@@ -20,7 +20,8 @@ package net.pterodactylus.sone.web.ajax;
 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;
+
+import com.google.common.base.Optional;
 
 /**
  * AJAX page that lets a Sone follow another Sone.
@@ -39,21 +40,19 @@ public class FollowSoneAjaxPage extends JsonPage {
 		super("followSone.ajax", webInterface);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		if (!webInterface.getCore().hasSone(soneId)) {
+		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+		if (!sone.isPresent()) {
 			return createErrorJsonObject("invalid-sone-id");
 		}
 		Sone currentSone = getCurrentSone(request.getToadletContext());
 		if (currentSone == null) {
 			return createErrorJsonObject("auth-required");
 		}
-		currentSone.addFriend(soneId);
-		webInterface.getCore().touchConfiguration();
+		webInterface.getCore().followSone(currentSone, soneId);
+		webInterface.getCore().markSoneKnown(sone.get());
 		return createSuccessJsonObject();
 	}