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=1ef8773f71642d8dcbe54782da9f0b4e234798f3;hp=6d98b43de5095d4e62c24e0729dcdc105de5d9a2;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=62ebf3da00001abb841c92128c4fdb57d0795ee2

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 6d98b43..1ef8773 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–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,20 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import javax.annotation.Nonnull;
+
+import com.google.common.base.Optional;
+
 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 follow another Sone.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class FollowSoneAjaxPage extends JsonPage {
+public class FollowSoneAjaxPage extends LoggedInJsonPage {
 
 	/**
 	 * Creates a new “follow Sone” AJAX page.
@@ -35,25 +39,23 @@ public class FollowSoneAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public FollowSoneAjaxPage(WebInterface webInterface) {
-		super("ajax/followSone.ajax", webInterface);
+		super("followSone.ajax", webInterface);
 	}
 
 	/**
 	 * {@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)) {
-			return new JsonObject().put("success", false).put("error", "invalid-sone-id");
-		}
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		if (currentSone == null) {
-			return new JsonObject().put("success", false).put("error", "auth-required");
+		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+		if (!sone.isPresent()) {
+			return createErrorJsonObject("invalid-sone-id");
 		}
-		currentSone.addFriend(soneId);
-		webInterface.getCore().saveSone(currentSone);
-		return new JsonObject().put("success", true);
+		webInterface.getCore().followSone(currentSone, soneId);
+		webInterface.getCore().markSoneKnown(sone.get());
+		return createSuccessJsonObject();
 	}
 
 }