X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=e27124661b0b7d52c26e611091815cf8105bae91;hb=cfcacd4a1983a0f24a99eb6c94af9e2314a2001b;hp=591afa022e039890d5ded16e4a53866c12a1b694;hpb=67c3d6cf09d8e7784d6cc5e0c4116b12fe15dd00;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 591afa0..e271246 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -1091,7 +1091,7 @@ function ajaxifyNotification(notification) {
  * Returns the notification hash. This hash is used in {@link #getStatus()} to
  * determine whether the notifications changed and need to be reloaded.
  */
-public getNotificationHash() {
+function getNotificationHash() {
 	return $("#sone #notification-area #notification-hash").text();
 }
 
@@ -1101,7 +1101,7 @@ public getNotificationHash() {
  * @param notificationHash
  *            The new notification hash
  */
-public setNotificationHash(notificationHash) {
+function setNotificationHash(notificationHash) {
 	$("#sone #notification-area #notification-hash").text(notificationHash);
 }
 
@@ -1200,6 +1200,33 @@ function getStatus() {
 			if (!notLoggedIn) {
 				showOfflineMarker(!online);
 			}
+			if (data.notificationHash != getNotificationHash()) {
+				console.log("Old hash: ", getNotificationHash(), ", new hash: ", data.notificationHash);
+				requestNotifications();
+			}
+			/* process new posts. */
+			$.each(data.newPosts, function(index, value) {
+				loadNewPost(value.id, value.sone, value.recipient, value.time);
+			});
+			/* process new replies. */
+			$.each(data.newReplies, function(index, value) {
+				loadNewReply(value.id, value.sone, value.post, value.postSone);
+			});
+			/* do it again in 5 seconds. */
+			setTimeout(getStatus, 5000);
+		} else {
+			/* data.success was false, wait 30 seconds. */
+			setTimeout(getStatus, 30000);
+		}
+	}, function() {
+		statusRequestQueued = false;
+		ajaxError();
+	});
+}
+
+function requestNotifications() {
+	ajaxGet("getNotifications.ajax", {}, function(data, textStatus) {
+		if (data && data.success) {
 			/* search for removed notifications. */
 			$("#sone #notification-area .notification").each(function() {
 				notificationId = $(this).attr("id");
@@ -1237,69 +1264,29 @@ function getStatus() {
 				}
 			});
 			/* process notifications. */
-			notificationIds = [];
 			$.each(data.notifications, function(index, value) {
 				oldNotification = getNotification(value.id);
-				if ((oldNotification.length == 0) || (value.lastUpdatedTime > getNotificationLastUpdatedTime(oldNotification))) {
-					notificationIds.push(value.id);
+				notification = ajaxifyNotification(createNotification(value.id, value.lastUpdatedTime, value.text, value.dismissable)).hide();
+				if (oldNotification.length != 0) {
+					if ((oldNotification.find(".short-text").length > 0) && (notification.find(".short-text").length > 0)) {
+						opened = oldNotification.is(":visible") && oldNotification.find(".short-text").hasClass("hidden");
+						notification.find(".short-text").toggleClass("hidden", opened);
+						notification.find(".text").toggleClass("hidden", !opened);
+					}
+					checkForRemovedSones(oldNotification, notification);
+					checkForRemovedPosts(oldNotification, notification);
+					checkForRemovedReplies(oldNotification, notification);
+					oldNotification.replaceWith(notification.show());
+				} else {
+					$("#sone #notification-area").append(notification);
+					if (value.id.substring(0, 5) != "local") {
+						notification.slideDown();
+						setActivity();
+					}
 				}
 			});
-			if (notificationIds.length > 0) {
-				loadNotifications(notificationIds);
-			}
-			/* process new posts. */
-			$.each(data.newPosts, function(index, value) {
-				loadNewPost(value.id, value.sone, value.recipient, value.time);
-			});
-			/* process new replies. */
-			$.each(data.newReplies, function(index, value) {
-				loadNewReply(value.id, value.sone, value.post, value.postSone);
-			});
-			/* do it again in 5 seconds. */
-			setTimeout(getStatus, 5000);
-		} else {
-			/* data.success was false, wait 30 seconds. */
-			setTimeout(getStatus, 30000);
+			setNotificationHash(data.notificationHash);
 		}
-	}, function() {
-		statusRequestQueued = false;
-		ajaxError();
-	});
-}
-
-/**
- * Requests multiple notifications from Sone and displays them.
- *
- * @param notificationIds
- *            Array of IDs of the notifications to load
- */
-function loadNotifications(notificationIds) {
-	ajaxGet("getNotification.ajax", {"notifications": notificationIds.join(",")}, function(data, textStatus) {
-		if (!data || !data.success) {
-			// TODO - show error
-			return;
-		}
-		$.each(data.notifications, function(index, value) {
-			oldNotification = getNotification(value.id);
-			notification = ajaxifyNotification(createNotification(value.id, value.lastUpdatedTime, value.text, value.dismissable)).hide();
-			if (oldNotification.length != 0) {
-				if ((oldNotification.find(".short-text").length > 0) && (notification.find(".short-text").length > 0)) {
-					opened = oldNotification.is(":visible") && oldNotification.find(".short-text").hasClass("hidden");
-					notification.find(".short-text").toggleClass("hidden", opened);
-					notification.find(".text").toggleClass("hidden", !opened);
-				}
-				checkForRemovedSones(oldNotification, notification);
-				checkForRemovedPosts(oldNotification, notification);
-				checkForRemovedReplies(oldNotification, notification);
-				oldNotification.replaceWith(notification.show());
-			} else {
-				$("#sone #notification-area").append(notification);
-				if (value.id.substring(0, 5) != "local") {
-					notification.slideDown();
-					setActivity();
-				}
-			}
-		});
 	});
 }
 
@@ -1529,6 +1516,7 @@ function markSoneAsKnown(soneElement, skipRequest) {
 		$(soneElement).removeClass("new");
 		if ((typeof skipRequest == "undefined") || !skipRequest) {
 			ajaxGet("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "sone", "id": getSoneId(soneElement)});
+			requestNotifications();
 		}
 	}
 }
@@ -1541,6 +1529,7 @@ function markPostAsKnown(postElements, skipRequest) {
 				$(postElement).removeClass("new");
 				if ((typeof skipRequest == "undefined") || !skipRequest) {
 					ajaxGet("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "post", "id": getPostId(postElement)});
+					requestNotifications();
 				}
 			})(postElement);
 		}
@@ -1557,6 +1546,7 @@ function markReplyAsKnown(replyElements, skipRequest) {
 				$(replyElement).removeClass("new");
 				if ((typeof skipRequest == "undefined") || !skipRequest) {
 					ajaxGet("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "reply", "id": getReplyId(replyElement)});
+					requestNotifications();
 				}
 			})(replyElement);
 		}