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=d82ab1ded064061c54a0cd25d01b3ea5bc628c7a;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=1bc78b582ac59f2438002997f5780db4dcee0a2a
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 d82ab1d..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 David âBombeâ Roden
*/
-public class FollowSoneAjaxPage extends JsonPage {
+public class FollowSoneAjaxPage extends LoggedInJsonPage {
/**
* Creates a new âfollow Soneâ AJAX page.
@@ -41,18 +45,16 @@ public class FollowSoneAjaxPage extends JsonPage {
/**
* {@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)) {
+ Optional 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();
}