X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=7c16c0991e003dba88f4a18a91a6a60f7fe21726;hb=8b6ea0e3f05c3b9f3041158f3bc54ed00828b207;hp=9e5e0ebbdcf3d693c92a6635358286d0aadfa054;hpb=de3f83202862d1b12505eff4da668a736a355b72;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 9e5e0eb..7c16c09 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -45,8 +45,12 @@ 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.SoneInsertAbortedEvent;
+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;
@@ -959,57 +963,69 @@ public class WebInterface implements CoreListener {
 		lockedSonesTickerObjects.put(sone, tickerObject);
 	}
 
-	//
-	// CORELISTENER METHODS
-	//
-
 	/**
-	 * {@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);
 		}
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that a {@link Sone} insert was aborted.
+	 *
+	 * @param soneInsertAbortedEvent
+	 *            The event
 	 */
-	@Override
-	public void soneInsertAborted(Sone sone, Throwable cause) {
-		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+	@Subscribe
+	public void soneInsertAborted(SoneInsertAbortedEvent soneInsertAbortedEvent) {
+		TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.sone());
 		soneInsertNotification.set("soneStatus", "insert-aborted");
-		soneInsertNotification.set("insert-error", cause);
-		if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+		soneInsertNotification.set("insert-error", soneInsertAbortedEvent.cause());
+		if (soneInsertAbortedEvent.sone().getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
 			notificationManager.addNotification(soneInsertNotification);
 		}
 	}
 
+	//
+	// CORELISTENER METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */