X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=d5db8efc61ea8a5795c4405d3aafa7a72ab19db9;hb=74223530641d7581c7d8f572e98eff1a01946ebd;hp=60a6a0b41176e7cc22458c49afad63bba0899515;hpb=84ffe125e715c7475997473cf477480ecbcc5d23;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 60a6a0b..d5db8ef 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -1079,8 +1079,10 @@ function loadNotifications(notificationIds) {
 				oldNotification.replaceWith(notification.show());
 			} else {
 				$("#sone #notification-area").append(notification);
-				notification.slideDown();
-				setActivity();
+				if (value.id.substring(0, 5) != "local") {
+					notification.slideDown();
+					setActivity();
+				}
 			}
 		});
 	});
@@ -1211,7 +1213,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 	}
 	if (!isIndexPage() || (getPage(".pagination-index") > 1)) {
 		if (!isViewPostPage() || (getShownPostId() != postId)) {
-			if (!isViewSonePage() || ((getShownSoneId() != soneId) && (getShownSoneId() != recipientId))) {
+			if (!isViewSonePage() || ((getShownSoneId() != soneId) && (getShownSoneId() != recipientId)) || (getPage(".post-navigation") > 1)) {
 				return;
 			}
 		}
@@ -1224,7 +1226,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 			if (hasPost(data.post.id)) {
 				return;
 			}
-			if ((!isIndexPage() || (getPage(".pagination-index") > 1)) && !(isViewSonePage() && ((getShownSoneId() == data.post.sone) || (getShownSoneId() == data.post.recipient)))) {
+			if ((!isIndexPage() || (getPage(".pagination-index") > 1)) && !(isViewSonePage() && ((getShownSoneId() == data.post.sone) || (getShownSoneId() == data.post.recipient) || (getPage(".post-navigation") > 1)))) {
 				return;
 			}
 			var firstOlderPost = null;
@@ -1235,6 +1237,9 @@ function loadNewPost(postId, soneId, recipientId, time) {
 				}
 			});
 			newPost = $(data.post.html).addClass("hidden");
+			if ($(".post-author-local", newPost).text() == "true") {
+				newPost.removeClass("new");
+			}
 			if (firstOlderPost != null) {
 				newPost.insertBefore(firstOlderPost);
 			}
@@ -1268,6 +1273,14 @@ function loadNewReply(replyId, soneId, postId, postSoneId) {
 					}
 				});
 				newReply = $(data.reply.html).addClass("hidden");
+				if ($(".reply-author-local", newReply).text() == "true") {
+					newReply.removeClass("new");
+					(function(newReply) {
+						setTimeout(function() {
+							markReplyAsKnown(newReply, false);
+						}, 5000);
+					})(newReply);
+				}
 				if (firstNewerReply != null) {
 					newReply.insertBefore(firstNewerReply);
 				} else {
@@ -1308,7 +1321,7 @@ function markSoneAsKnown(soneElement, skipRequest) {
 function markPostAsKnown(postElements, skipRequest) {
 	$(postElements).each(function() {
 		postElement = this;
-		if ($(postElement).hasClass("new")) {
+		if ($(postElement).hasClass("new") || ((typeof skipRequest != "undefined") && !skipRequest)) {
 			(function(postElement) {
 				$(postElement).removeClass("new");
 				if ((typeof skipRequest == "undefined") || !skipRequest) {
@@ -1324,7 +1337,7 @@ function markPostAsKnown(postElements, skipRequest) {
 function markReplyAsKnown(replyElements, skipRequest) {
 	$(replyElements).each(function() {
 		replyElement = this;
-		if ($(replyElement).hasClass("new")) {
+		if ($(replyElement).hasClass("new") || ((typeof skipRequest != "undefined") && !skipRequest)) {
 			(function(replyElement) {
 				$(replyElement).removeClass("new");
 				if ((typeof skipRequest == "undefined") || !skipRequest) {