X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=96b42b024f03e366ea9b3ff5e9438254b0e1ca62;hb=ba4c1d2a5995657d48dce310ea854fa1f164a481;hp=98b2f46f6f4bfe58032f6febf14e112689497b65;hpb=68eb3683d2dda01e06c03d7e77d38b99be2b748f;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 98b2f46..96b42b0 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -37,7 +37,17 @@ 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.core.event.PostRemovedEvent;
+import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneLockedEvent;
+import net.pterodactylus.sone.core.event.SoneRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -780,7 +790,10 @@ public class WebInterface implements CoreListener {
 	//
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a new {@link Sone} was found.
+	 *
+	 * @param newSoneFoundEvent
+	 *            The event
 	 */
 	@Subscribe
 	public void newSoneFound(NewSoneFoundEvent newSoneFoundEvent) {
@@ -790,15 +803,15 @@ public class WebInterface implements CoreListener {
 		}
 	}
 
-	//
-	// CORELISTENER METHODS
-	//
-
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a new {@link Post} was found.
+	 *
+	 * @param newPostFoundEvent
+	 *            The event
 	 */
-	@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);
@@ -817,10 +830,14 @@ public class WebInterface implements CoreListener {
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a new {@link PostReply} was found.
+	 *
+	 * @param newPostReplyFoundEvent
+	 *            The event
 	 */
-	@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);
@@ -839,56 +856,75 @@ public class WebInterface implements CoreListener {
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Sone} was marked as known.
+	 *
+	 * @param markSoneKnownEvent
+	 *            The event
 	 */
-	@Override
-	public void markSoneKnown(Sone sone) {
-		newSoneNotification.remove(sone);
+	@Subscribe
+	public void markSoneKnown(MarkSoneKnownEvent markSoneKnownEvent) {
+		newSoneNotification.remove(markSoneKnownEvent.sone());
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Post} was marked as known.
+	 *
+	 * @param markPostKnownEvent
+	 *            The event
 	 */
-	@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}
+	 * Notifies the web interface that a {@link PostReply} was marked as known.
+	 *
+	 * @param markPostReplyKnownEvent
+	 *            The event
 	 */
-	@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());
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Sone} was removed.
+	 *
+	 * @param soneRemovedEvent
+	 *            The event
 	 */
-	@Override
-	public void soneRemoved(Sone sone) {
-		newSoneNotification.remove(sone);
+	@Subscribe
+	public void soneRemoved(SoneRemovedEvent soneRemovedEvent) {
+		newSoneNotification.remove(soneRemovedEvent.sone());
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Post} was removed.
+	 *
+	 * @param postRemovedEvent
+	 *            The event
 	 */
-	@Override
-	public void postRemoved(Post post) {
-		newPostNotification.remove(post);
-		localPostNotification.remove(post);
-		mentionNotification.remove(post);
+	@Subscribe
+	public void postRemoved(PostRemovedEvent postRemovedEvent) {
+		newPostNotification.remove(postRemovedEvent.post());
+		localPostNotification.remove(postRemovedEvent.post());
+		mentionNotification.remove(postRemovedEvent.post());
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link PostReply} was removed.
+	 *
+	 * @param postReplyRemovedEvent
+	 *            The event
 	 */
-	@Override
-	public void replyRemoved(PostReply reply) {
+	@Subscribe
+	public void replyRemoved(PostReplyRemovedEvent postReplyRemovedEvent) {
+		PostReply reply = postReplyRemovedEvent.postReply();
 		newReplyNotification.remove(reply);
 		localReplyNotification.remove(reply);
 		if (!getMentionedSones(reply.getText()).isEmpty()) {
@@ -903,10 +939,14 @@ public class WebInterface implements CoreListener {
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a Sone was locked.
+	 *
+	 * @param soneLockedEvent
+	 *            The event
 	 */
-	@Override
-	public void soneLocked(final Sone sone) {
+	@Subscribe
+	public void soneLocked(SoneLockedEvent soneLockedEvent) {
+		final Sone sone = soneLockedEvent.sone();
 		Object tickerObject = Ticker.getInstance().registerEvent(System.currentTimeMillis() + (5 * 60) * 1000, new Runnable() {
 
 			@Override
@@ -921,14 +961,21 @@ public class WebInterface implements CoreListener {
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a Sone was unlocked.
+	 *
+	 * @param soneUnlockedEvent
+	 *            The event
 	 */
-	@Override
-	public void soneUnlocked(Sone sone) {
-		lockedSonesNotification.remove(sone);
-		Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(sone));
+	@Subscribe
+	public void soneUnlocked(SoneUnlockedEvent soneUnlockedEvent) {
+		lockedSonesNotification.remove(soneUnlockedEvent.sone());
+		Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()));
 	}
 
+	//
+	// CORELISTENER METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */