X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=4da21779739268028f8272561816a709a8559099;hp=beba513305826fcd9ec053f84d3ba44fb5318619;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=e80ee9c75042771d91bdd7095ca225adc6c11e6c

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index beba513..4da2177 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebInterface.java - Copyright © 2010–2013 David Roden
+ * Sone - WebInterface.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
@@ -884,72 +884,46 @@ public class WebInterface {
 		newSoneNotification.remove(markSoneKnownEvent.sone());
 	}
 
-	/**
-	 * Notifies the web interface that a {@link Post} was marked as known.
-	 *
-	 * @param markPostKnownEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) {
-		newPostNotification.remove(markPostKnownEvent.post());
-		localPostNotification.remove(markPostKnownEvent.post());
-		if (!localSoneMentionedInNewPostOrReply(markPostKnownEvent.post())) {
-			mentionNotification.remove(markPostKnownEvent.post());
-		}
+		removePost(markPostKnownEvent.post());
 	}
 
-	/**
-	 * Notifies the web interface that a {@link PostReply} was marked as known.
-	 *
-	 * @param markPostReplyKnownEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
-		PostReply postReply = markPostReplyKnownEvent.postReply();
-		newReplyNotification.remove(postReply);
-		localReplyNotification.remove(postReply);
-		if (postReply.getPost().isPresent() && !localSoneMentionedInNewPostOrReply(postReply.getPost().get())) {
-			mentionNotification.remove(postReply.getPost().get());
-		}
+		removeReply(markPostReplyKnownEvent.postReply());
 	}
 
-	/**
-	 * Notifies the web interface that a {@link Sone} was removed.
-	 *
-	 * @param soneRemovedEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void soneRemoved(SoneRemovedEvent soneRemovedEvent) {
 		newSoneNotification.remove(soneRemovedEvent.sone());
+		for (Post post : soneRemovedEvent.sone().getPosts()) {
+			removePost(post);
+		}
+		for (PostReply postReply : soneRemovedEvent.sone().getReplies()) {
+			removeReply(postReply);
+		}
 	}
 
-	/**
-	 * Notifies the web interface that a {@link Post} was removed.
-	 *
-	 * @param postRemovedEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void postRemoved(PostRemovedEvent postRemovedEvent) {
-		newPostNotification.remove(postRemovedEvent.post());
-		localPostNotification.remove(postRemovedEvent.post());
-		if (!localSoneMentionedInNewPostOrReply(postRemovedEvent.post())) {
-			mentionNotification.remove(postRemovedEvent.post());
+		removePost(postRemovedEvent.post());
+	}
+
+	private void removePost(Post post) {
+		newPostNotification.remove(post);
+		localPostNotification.remove(post);
+		if (!localSoneMentionedInNewPostOrReply(post)) {
+			mentionNotification.remove(post);
 		}
 	}
 
-	/**
-	 * Notifies the web interface that a {@link PostReply} was removed.
-	 *
-	 * @param postReplyRemovedEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void replyRemoved(PostReplyRemovedEvent postReplyRemovedEvent) {
-		PostReply reply = postReplyRemovedEvent.postReply();
+		removeReply(postReplyRemovedEvent.postReply());
+	}
+
+	private void removeReply(PostReply reply) {
 		newReplyNotification.remove(reply);
 		localReplyNotification.remove(reply);
 		if (reply.getPost().isPresent() && !localSoneMentionedInNewPostOrReply(reply.getPost().get())) {