X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=68ba585fc35c6f2b9cbb58315407c020a89621ff;hb=f3c7033028be33ed8b4bca8d67a2979a3cd7d18d;hp=436ed5f3a1065c9a839c19e418fa37f62a7a8240;hpb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 436ed5f..68ba585 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -37,6 +37,12 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.CoreListener;
+import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
+import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
+import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
+import net.pterodactylus.sone.core.event.NewPostFoundEvent;
+import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
+import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -103,7 +109,6 @@ import net.pterodactylus.sone.web.ajax.UntrustAjaxPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
-import net.pterodactylus.util.collection.SetBuilder;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
@@ -132,6 +137,8 @@ import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
 
 import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 
 import freenet.clients.http.SessionManager;
@@ -462,7 +469,7 @@ public class WebInterface implements CoreListener {
 	 * @return The new posts
 	 */
 	public Set<Post> getNewPosts() {
-		return new SetBuilder<Post>().addAll(newPostNotification.getElements()).addAll(localPostNotification.getElements()).get();
+		return ImmutableSet.<Post> builder().addAll(newPostNotification.getElements()).addAll(localPostNotification.getElements()).build();
 	}
 
 	/**
@@ -472,7 +479,7 @@ public class WebInterface implements CoreListener {
 	 * @return The new replies
 	 */
 	public Set<PostReply> getNewReplies() {
-		return new SetBuilder<PostReply>().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).get();
+		return ImmutableSet.<PostReply> builder().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).build();
 	}
 
 	/**
@@ -774,15 +781,15 @@ public class WebInterface implements CoreListener {
 	}
 
 	//
-	// CORELISTENER METHODS
+	// EVENT HANDLERS
 	//
 
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void newSoneFound(Sone sone) {
-		newSoneNotification.add(sone);
+	@Subscribe
+	public void newSoneFound(NewSoneFoundEvent newSoneFoundEvent) {
+		newSoneNotification.add(newSoneFoundEvent.sone());
 		if (!hasFirstStartNotification()) {
 			notificationManager.addNotification(newSoneNotification);
 		}
@@ -791,8 +798,9 @@ public class WebInterface implements CoreListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void newPostFound(Post post) {
+	@Subscribe
+	public void newPostFound(NewPostFoundEvent newPostFoundEvent) {
+		Post post = newPostFoundEvent.post();
 		boolean isLocal = post.getSone().isLocal();
 		if (isLocal) {
 			localPostNotification.add(post);
@@ -813,8 +821,9 @@ public class WebInterface implements CoreListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void newReplyFound(PostReply reply) {
+	@Subscribe
+	public void newReplyFound(NewPostReplyFoundEvent newPostReplyFoundEvent) {
+		PostReply reply = newPostReplyFoundEvent.postReply();
 		boolean isLocal = reply.getSone().isLocal();
 		if (isLocal) {
 			localReplyNotification.add(reply);
@@ -835,31 +844,35 @@ public class WebInterface implements CoreListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void markSoneKnown(Sone sone) {
-		newSoneNotification.remove(sone);
+	@Subscribe
+	public void markSoneKnown(MarkSoneKnownEvent markSoneKnownEvent) {
+		newSoneNotification.remove(markSoneKnownEvent.sone());
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void markPostKnown(Post post) {
-		newPostNotification.remove(post);
-		localPostNotification.remove(post);
-		mentionNotification.remove(post);
+	@Subscribe
+	public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) {
+		newPostNotification.remove(markPostKnownEvent.post());
+		localPostNotification.remove(markPostKnownEvent.post());
+		mentionNotification.remove(markPostKnownEvent.post());
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void markReplyKnown(PostReply reply) {
-		newReplyNotification.remove(reply);
-		localReplyNotification.remove(reply);
-		mentionNotification.remove(reply.getPost());
+	@Subscribe
+	public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
+		newReplyNotification.remove(markPostReplyKnownEvent.postReply());
+		localReplyNotification.remove(markPostReplyKnownEvent.postReply());
+		mentionNotification.remove(markPostReplyKnownEvent.postReply().getPost());
 	}
 
+	//
+	// CORELISTENER METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */