X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=8e21ea5b735bc8cf38696b24f83c2e7402fa9f15;hb=5cfe9916e6b52b68a403873e35683ce242be4793;hp=07f147681d7640cc45b6ed19b649b45b7b16f864;hpb=e6768e198b1644393e63947a0fc45f1c72ae474b;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 07f1476..8e21ea5 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -38,7 +38,6 @@ import javax.inject.Named;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.ElementLoader;
 import net.pterodactylus.sone.core.event.*;
-import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
@@ -174,15 +173,6 @@ public class WebInterface implements SessionProvider {
 	/** Notifications for sone inserts. */
 	private final Map<Sone, TemplateNotification> soneInsertNotifications = new HashMap<>();
 
-	/** The “inserting images” notification. */
-	private final ListNotification<Image> insertingImagesNotification;
-
-	/** The “inserted images” notification. */
-	private final ListNotification<Image> insertedImagesNotification;
-
-	/** The “image insert failed” notification. */
-	private final ListNotification<Image> imageInsertFailedNotification;
-
 	/** Scheduled executor for time-based notifications. */
 	private final ScheduledExecutorService ticker = Executors.newScheduledThreadPool(1);
 
@@ -231,15 +221,6 @@ public class WebInterface implements SessionProvider {
 
 		Template mentionNotificationTemplate = loaders.loadTemplate("/templates/notify/mentionNotification.html");
 		mentionNotification = new ListNotification<>("mention-notification", "posts", mentionNotificationTemplate, false);
-
-		Template insertingImagesTemplate = loaders.loadTemplate("/templates/notify/inserting-images-notification.html");
-		insertingImagesNotification = new ListNotification<>("inserting-images-notification", "images", insertingImagesTemplate);
-
-		Template insertedImagesTemplate = loaders.loadTemplate("/templates/notify/inserted-images-notification.html");
-		insertedImagesNotification = new ListNotification<>("inserted-images-notification", "images", insertedImagesTemplate);
-
-		Template imageInsertFailedTemplate = loaders.loadTemplate("/templates/notify/image-insert-failed-notification.html");
-		imageInsertFailedNotification = new ListNotification<>("image-insert-failed-notification", "images", imageInsertFailedTemplate);
 	}
 
 	//
@@ -405,37 +386,6 @@ public class WebInterface implements SessionProvider {
 		return from(allNewReplies).filter(replyVisibilityFilter.isVisible(currentSone)).toSet();
 	}
 
-	/**
-	 * Sets whether the current start of the plugin is the first start. It is
-	 * considered a first start if the configuration file does not exist.
-	 *
-	 * @param firstStart
-	 *            {@code true} if no configuration file existed when Sone was
-	 *            loaded, {@code false} otherwise
-	 */
-	public void setFirstStart(boolean firstStart) {
-		if (firstStart) {
-			Template firstStartNotificationTemplate = loaders.loadTemplate("/templates/notify/firstStartNotification.html");
-			Notification firstStartNotification = new TemplateNotification("first-start-notification", firstStartNotificationTemplate);
-			notificationManager.addNotification(firstStartNotification);
-		}
-	}
-
-	/**
-	 * Sets whether Sone was started with a fresh configuration file.
-	 *
-	 * @param newConfig
-	 *            {@code true} if Sone was started with a fresh configuration,
-	 *            {@code false} if the existing configuration could be read
-	 */
-	public void setNewConfig(boolean newConfig) {
-		if (newConfig && !hasFirstStartNotification()) {
-			Template configNotReadNotificationTemplate = loaders.loadTemplate("/templates/notify/configNotReadNotification.html");
-			Notification configNotReadNotification = new TemplateNotification("config-not-read-notification", configNotReadNotificationTemplate);
-			notificationManager.addNotification(configNotReadNotification);
-		}
-	}
-
 	//
 	// PRIVATE ACCESSORS
 	//
@@ -461,19 +411,6 @@ public class WebInterface implements SessionProvider {
 		registerToadlets();
 
 		/* notification templates. */
-		Template startupNotificationTemplate = loaders.loadTemplate("/templates/notify/startupNotification.html");
-
-		final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
-		notificationManager.addNotification(startupNotification);
-
-		ticker.schedule(new Runnable() {
-
-			@Override
-			public void run() {
-				startupNotification.dismiss();
-			}
-		}, 2, TimeUnit.MINUTES);
-
 		Template wotMissingNotificationTemplate = loaders.loadTemplate("/templates/notify/wotMissingNotification.html");
 		final TemplateNotification wotMissingNotification = new TemplateNotification("wot-missing-notification", wotMissingNotificationTemplate);
 		ticker.scheduleAtFixedRate(new Runnable() {
@@ -780,55 +717,6 @@ public class WebInterface implements SessionProvider {
 		}
 	}
 
-	/**
-	 * Notifies the web interface that an image insert was started
-	 *
-	 * @param imageInsertStartedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void imageInsertStarted(ImageInsertStartedEvent imageInsertStartedEvent) {
-		insertingImagesNotification.add(imageInsertStartedEvent.getImage());
-		notificationManager.addNotification(insertingImagesNotification);
-	}
-
-	/**
-	 * Notifies the web interface that an {@link Image} insert was aborted.
-	 *
-	 * @param imageInsertAbortedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void imageInsertAborted(ImageInsertAbortedEvent imageInsertAbortedEvent) {
-		insertingImagesNotification.remove(imageInsertAbortedEvent.getImage());
-	}
-
-	/**
-	 * Notifies the web interface that an {@link Image} insert is finished.
-	 *
-	 * @param imageInsertFinishedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
-		insertingImagesNotification.remove(imageInsertFinishedEvent.getImage());
-		insertedImagesNotification.add(imageInsertFinishedEvent.getImage());
-		notificationManager.addNotification(insertedImagesNotification);
-	}
-
-	/**
-	 * Notifies the web interface that an {@link Image} insert has failed.
-	 *
-	 * @param imageInsertFailedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void imageInsertFailed(ImageInsertFailedEvent imageInsertFailedEvent) {
-		insertingImagesNotification.remove(imageInsertFailedEvent.getImage());
-		imageInsertFailedNotification.add(imageInsertFailedEvent.getImage());
-		notificationManager.addNotification(imageInsertFailedNotification);
-	}
-
 	@Subscribe
 	public void debugActivated(@Nonnull DebugActivatedEvent debugActivatedEvent) {
 		pageToadletRegistry.activateDebugMode();