X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FFollowSoneAjaxPage.java;h=ce0fd063b863889f09560cbc5b019e6230b7f51f;hp=0c835533fc084fe140f706e121a6b6dac480a0b0;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6

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 0c83553..ce0fd06 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–2012 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,6 +19,7 @@ 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;
 
 /**
@@ -35,26 +36,25 @@ public class FollowSoneAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public FollowSoneAjaxPage(WebInterface webInterface) {
-		super("ajax/followSone.ajax", webInterface);
+		super("followSone.ajax", webInterface);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonObject 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().hasSone(soneId)) {
+			return createErrorJsonObject("invalid-sone-id");
 		}
 		Sone currentSone = getCurrentSone(request.getToadletContext());
 		if (currentSone == null) {
-			return new JsonObject().put("success", false).put("error", "auth-required");
+			return createErrorJsonObject("auth-required");
 		}
-		currentSone.addFriend(sone);
-		webInterface.getCore().saveSone(currentSone);
-		return new JsonObject().put("success", true);
+		webInterface.getCore().followSone(currentSone, soneId);
+		webInterface.getCore().markSoneKnown(webInterface.getCore().getSone(soneId));
+		return createSuccessJsonObject();
 	}
 
 }