X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=1c58bd39ae069c25848a76b40473f4aab677b895;hb=f35aa413bce1d18c6f822719f7864ea6838cd043;hp=14bbcc4e05b5a3988d658c7cab20b1e317638911;hpb=455d843a2d2c785a317085e085d4265988b3c0da;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 14bbcc4..1c58bd3 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -43,7 +43,13 @@ 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.SoneInsertedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertingEvent;
+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;
@@ -899,25 +905,28 @@ public class WebInterface implements CoreListener {
 		newSoneNotification.remove(soneRemovedEvent.sone());
 	}
 
-	//
-	// CORELISTENER METHODS
-	//
-
 	/**
-	 * {@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()) {
@@ -932,10 +941,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
@@ -950,39 +963,52 @@ 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()));
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Sone} is being inserted.
+	 *
+	 * @param soneInsertingEvent
+	 *            The event
 	 */
-	@Override
-	public void soneInserting(Sone sone) {
-		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+	@Subscribe
+	public void soneInserting(SoneInsertingEvent soneInsertingEvent) {
+		TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.sone());
 		soneInsertNotification.set("soneStatus", "inserting");
-		if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+		if (soneInsertingEvent.sone().getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
 			notificationManager.addNotification(soneInsertNotification);
 		}
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Sone} was inserted.
+	 *
+	 * @param soneInsertedEvent
+	 *            The event
 	 */
-	@Override
-	public void soneInserted(Sone sone, long insertDuration) {
-		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+	@Subscribe
+	public void soneInserted(SoneInsertedEvent soneInsertedEvent) {
+		TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.sone());
 		soneInsertNotification.set("soneStatus", "inserted");
-		soneInsertNotification.set("insertDuration", insertDuration / 1000);
-		if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+		soneInsertNotification.set("insertDuration", soneInsertedEvent.insertDuration() / 1000);
+		if (soneInsertedEvent.sone().getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
 			notificationManager.addNotification(soneInsertNotification);
 		}
 	}
 
+	//
+	// CORELISTENER METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */