X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=21f6803af437a2cf507579da37601326b4429ee1;hb=261a9356258c9c60059989e1dd6ec96f4659ee61;hp=f49778b963f11b441383ec9252b9f58550a37311;hpb=32c303db51d7f3398839f0ae91c6c12e1e9a9e87;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index f49778b..21f6803 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -879,6 +879,90 @@ function ajaxifyNotification(notification) {
 	return notification;
 }
 
+/**
+ * Retrieves element IDs from notification elements.
+ *
+ * @param notification
+ *            The notification element
+ * @param selector
+ *            The selector of the element containing the ID as text
+ * @returns All extracted IDs
+ */
+function getElementIds(notification, selector) {
+	elementIds = [];
+	$(selector, notification).each(function() {
+		elementIds.push($(this).text());
+	});
+	return elementIds;
+}
+
+/**
+ * Compares the given notification elements and calls {@link #markSoneAsKnown()}
+ * for every ID that is contained in the old notification but not in the new.
+ *
+ * @param oldNotification
+ *            The old notification element
+ * @param newNotification
+ *            The new notification element
+ */
+function checkForRemovedSones(oldNotification, newNotification) {
+	if (getNotificationId(oldNotification) != "new-sone-notification") {
+		return;
+	}
+	oldIds = getElementIds(oldNotification, ".sone-id");
+	newIds = getElementIds(newNotification, ".sone-id");
+	$.each(oldIds, function(index, value) {
+		if ($.inArray(value, newIds) == -1) {
+			markSoneAsKnown(getSone(value), true);
+		}
+	});
+}
+
+/**
+ * Compares the given notification elements and calls {@link #markPostAsKnown()}
+ * for every ID that is contained in the old notification but not in the new.
+ *
+ * @param oldNotification
+ *            The old notification element
+ * @param newNotification
+ *            The new notification element
+ */
+function checkForRemovedPosts(oldNotification, newNotification) {
+	if (getNotificationId(oldNotification) != "new-post-notification") {
+		return;
+	}
+	oldIds = getElementIds(oldNotification, ".post-id");
+	newIds = getElementIds(newNotification, ".post-id");
+	$.each(oldIds, function(index, value) {
+		if ($.inArray(value, newIds) == -1) {
+			markPostAsKnown(getPost(value), true);
+		}
+	});
+}
+
+/**
+ * Compares the given notification elements and calls
+ * {@link #markReplyAsKnown()} for every ID that is contained in the old
+ * notification but not in the new.
+ *
+ * @param oldNotification
+ *            The old notification element
+ * @param newNotification
+ *            The new notification element
+ */
+function checkForRemovedReplies(oldNotification, newNotification) {
+	if (getNotificationId(oldNotification) != "new-replies-notification") {
+		return;
+	}
+	oldIds = getElementIds(oldNotification, ".reply-id");
+	newIds = getElementIds(newNotification, ".reply-id");
+	$.each(oldIds, function(index, value) {
+		if ($.inArray(value, newIds) == -1) {
+			markReplyAsKnown(getReply(value), true);
+		}
+	});
+}
+
 function getStatus() {
 	$.getJSON("getStatus.ajax", {"loadAllSones": isKnownSonesPage()}, function(data, textStatus) {
 		if ((data != null) && data.success) {
@@ -897,6 +981,22 @@ function getStatus() {
 					}
 				});
 				if (!foundNotification) {
+					if (notificationId == "new-sone-notification") {
+						$(".sone-id", this).each(function(index, element) {
+							soneId = $(this).text();
+							markSoneAsKnown(getSone(soneId), true);
+						});
+					} else if (notificationId == "new-post-notification") {
+						$(".post-id", this).each(function(index, element) {
+							postId = $(this).text();
+							markPostAsKnown(getPost(postId), true);
+						});
+					} else if (notificationId == "new-replies-notification") {
+						$(".reply-id", this).each(function(index, element) {
+							replyId = $(this).text();
+							markReplyAsKnown(getReply(replyId), true);
+						});
+					}
 					$(this).slideUp("normal", function() {
 						$(this).remove();
 					});
@@ -904,7 +1004,7 @@ function getStatus() {
 			});
 			/* process notifications. */
 			$.each(data.notifications, function(index, value) {
-				oldNotification = $("#sone #notification-area .notification#" + value.id);
+				oldNotification = getNotification(value.id);
 				notification = ajaxifyNotification(createNotification(value.id, value.text, value.dismissable)).hide();
 				if (oldNotification.length != 0) {
 					if ((oldNotification.find(".short-text").length > 0) && (notification.find(".short-text").length > 0)) {
@@ -912,6 +1012,9 @@ function getStatus() {
 						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);