X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetLikesAjaxPage.java;h=3f6c0d4a8f3bf317f29e9ef5884d82b918d25968;hp=293b4b0d4f35884cdcdbe489b540cae5d0e0bacd;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=5723a2bb28376b0972a63bae2124846116cf6ca5

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java
index 293b4b0..3f6c0d4 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetLikesAjaxPage.java - Copyright © 2010–2012 David Roden
+ * Sone - GetLikesAjaxPage.java - Copyright © 2010–2015 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,9 +17,9 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
+import static net.pterodactylus.sone.data.Sone.NICE_NAME_COMPARATOR;
+
 import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
@@ -28,8 +28,12 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonArray;
-import net.pterodactylus.util.json.JsonObject;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.base.Optional;
+import com.google.common.collect.FluentIterable;
 
 /**
  * AJAX page that retrieves the number of “likes” a {@link Post} has.
@@ -56,19 +60,25 @@ public class GetLikesAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String type = request.getHttpRequest().getParam("type", null);
 		String id = request.getHttpRequest().getParam(type, null);
 		if ((id == null) || (id.length() == 0)) {
 			return createErrorJsonObject("invalid-" + type + "-id");
 		}
 		if ("post".equals(type)) {
-			Post post = webInterface.getCore().getPost(id);
-			Set<Sone> sones = webInterface.getCore().getLikes(post);
+			Optional<Post> post = webInterface.getCore().getPost(id);
+			if (!post.isPresent()) {
+				return createErrorJsonObject("invalid-post-id");
+			}
+			Set<Sone> sones = webInterface.getCore().getLikes(post.get());
 			return createSuccessJsonObject().put("likes", sones.size()).put("sones", getSones(sones));
 		} else if ("reply".equals(type)) {
-			PostReply reply = webInterface.getCore().getReply(id);
-			Set<Sone> sones = webInterface.getCore().getLikes(reply);
+			Optional<PostReply> reply = webInterface.getCore().getPostReply(id);
+			if (!reply.isPresent()) {
+				return createErrorJsonObject("invalid-reply-id");
+			}
+			Set<Sone> sones = webInterface.getCore().getLikes(reply.get());
 			return createSuccessJsonObject().put("likes", sones.size()).put("sones", getSones(sones));
 		}
 		return createErrorJsonObject("invalid-type");
@@ -94,12 +104,10 @@ public class GetLikesAjaxPage extends JsonPage {
 	 *            The Sones to convert to an array
 	 * @return The Sones, sorted by name
 	 */
-	private static JsonArray getSones(Set<Sone> sones) {
-		JsonArray soneArray = new JsonArray();
-		List<Sone> sortedSones = new ArrayList<Sone>(sones);
-		Collections.sort(sortedSones, Sone.NICE_NAME_COMPARATOR);
-		for (Sone sone : sortedSones) {
-			soneArray.add(new JsonObject().put("id", sone.getId()).put("name", SoneAccessor.getNiceName(sone)));
+	private static JsonNode getSones(Set<Sone> sones) {
+		ArrayNode soneArray = new ArrayNode(instance);
+		for (Sone sone : FluentIterable.from(sones).toSortedList(NICE_NAME_COMPARATOR)) {
+			soneArray.add(new ObjectNode(instance).put("id", sone.getId()).put("name", SoneAccessor.getNiceName(sone)));
 		}
 		return soneArray;
 	}