From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 13 Jan 2011 14:05:07 +0000 (+0100)
Subject: Add more information to new reply information and don’t load replies if obviously... 
X-Git-Tag: 0.3.7^2~5^2
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=edc855dd691b472f36007fc8492e0f70e3301c60

Add more information to new reply information and don’t load replies if obviously not necessary.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
index effbebe..172f237 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -101,7 +101,12 @@ public class GetStatusAjaxPage extends JsonPage {
 		Set<Reply> newReplies = webInterface.getNewReplies();
 		JsonArray jsonReplies = new JsonArray();
 		for (Reply reply : newReplies) {
-			jsonReplies.add(reply.getId());
+			JsonObject jsonReply = new JsonObject();
+			jsonReply.put("id", reply.getId());
+			jsonReply.put("sone", reply.getSone().getId());
+			jsonReply.put("post", reply.getPost().getId());
+			jsonReply.put("postSone", reply.getPost().getSone().getId());
+			jsonReplies.add(jsonReply);
 		}
 		return createSuccessJsonObject().put("sones", jsonSones).put("notifications", jsonNotifications).put("removedNotifications", jsonRemovedNotifications).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 70d124e..ca087fa 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -453,7 +453,7 @@ function ajaxifyPost(postElement) {
 			postReply(postId, text, function(success, error, replyId) {
 				if (success) {
 					$(inputField).val("");
-					loadNewReply(replyId);
+					loadNewReply(replyId, getCurrentSoneId(), postId);
 					markPostAsKnown(getPostElement(inputField));
 					$("#sone .post#" + postId + " .create-reply").addClass("hidden");
 				} else {
@@ -589,7 +589,7 @@ function getStatus() {
 			});
 			/* process new replies. */
 			$.each(data.newReplies, function(index, value) {
-				loadNewReply(value);
+				loadNewReply(value.id, value.sone, value.post, value.postSone);
 			});
 			/* do it again in 5 seconds. */
 			setTimeout(getStatus, 5000);
@@ -745,10 +745,13 @@ function loadNewPost(postId, soneId, recipientId) {
 	});
 }
 
-function loadNewReply(replyId) {
+function loadNewReply(replyId, soneId, postId, postSoneId) {
 	if (hasReply(replyId)) {
 		return;
 	}
+	if (!hasPost(postId)) {
+		return;
+	}
 	$.getJSON("getReply.ajax", { "reply": replyId }, function(data, textStatus) {
 		/* find post. */
 		if ((data != null) && data.success) {