X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=4fb885d806869308e6aa5d4b0da3ab8b85bb381a;hb=a9aafa22d72dd596f4686cda7fe2f17074235394;hp=27fa081dc2d039978fb4db287952e5c1202e7c91;hpb=dc3d0d58fd47e520c723aa7d258c2f7ae09e1ee7;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
index 27fa081..4fb885d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -84,15 +84,11 @@ public abstract class JsonPage implements Page {
 	 *         session
 	 */
 	protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
-		try {
-			Session session = webInterface.getSessionManager().useSession(toadletContenxt);
-			if (create && (session == null)) {
-				session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
-			}
-			return session;
-		} catch (freenet.clients.http.RedirectException re1) {
-			return null;
+		Session session = webInterface.getSessionManager().useSession(toadletContenxt);
+		if (create && (session == null)) {
+			session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 		}
+		return session;
 	}
 
 	/**
@@ -112,12 +108,7 @@ public abstract class JsonPage implements Page {
 		if (soneId == null) {
 			return null;
 		}
-		for (Sone sone : webInterface.getCore().getSones()) {
-			if (sone.getId().equals(soneId)) {
-				return sone;
-			}
-		}
-		return null;
+		return webInterface.getCore().getLocalSone(soneId, false);
 	}
 
 	//
@@ -150,6 +141,15 @@ public abstract class JsonPage implements Page {
 	//
 
 	/**
+	 * Creates a success reply.
+	 *
+	 * @return A reply signaling success
+	 */
+	protected JsonObject createSuccessJsonObject() {
+		return new JsonObject().put("success", true);
+	}
+
+	/**
 	 * Creates an error reply.
 	 *
 	 * @param error