X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=544805436c7ffd093c647769a1c536d8dbaacfbe;hp=1e6e6fba6d50dff3627fc2444baa34daa9ff6929;hb=438378deab1514f0f608d975ef65f5b7aea44ccb;hpb=5aaa1e1dc761fa0c8b6745b7b022c0a19d248c68

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 1e6e6fb..5448054 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebInterface.java - Copyright © 2010–2019 David Roden
+ * Sone - WebInterface.java - Copyright © 2010–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@ import static com.google.common.collect.FluentIterable.from;
 import static java.util.logging.Logger.getLogger;
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
@@ -85,7 +83,6 @@ import net.pterodactylus.sone.web.page.TemplateRenderer;
 import net.pterodactylus.sone.web.pages.*;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
-import net.pterodactylus.util.notify.TemplateNotification;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.web.RedirectPage;
@@ -156,9 +153,6 @@ public class WebInterface implements SessionProvider {
 	/** The invisible “local reply” notification. */
 	private final ListNotification<PostReply> localReplyNotification;
 
-	/** Notifications for sone inserts. */
-	private final Map<Sone, TemplateNotification> soneInsertNotifications = new HashMap<>();
-
 	@Inject
 	public WebInterface(SonePlugin sonePlugin, Loaders loaders, ListNotificationFilter listNotificationFilter,
 			PostVisibilityFilter postVisibilityFilter, ReplyVisibilityFilter replyVisibilityFilter,
@@ -343,16 +337,6 @@ public class WebInterface implements SessionProvider {
 		return from(allNewPosts).filter(postVisibilityFilter.isVisible(currentSone)).toSet();
 	}
 
-	/**
-	 * Returns the replies that have been announced as new in the
-	 * {@link #newReplyNotification}.
-	 *
-	 * @return The new replies
-	 */
-	public Set<PostReply> getNewReplies() {
-		return ImmutableSet.<PostReply> builder().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).build();
-	}
-
 	@Nonnull
 	public Collection<PostReply> getNewReplies(@Nullable Sone currentSone) {
 		Set<PostReply> allNewReplies = ImmutableSet.<PostReply>builder()
@@ -363,20 +347,6 @@ public class WebInterface implements SessionProvider {
 	}
 
 	//
-	// PRIVATE ACCESSORS
-	//
-
-	/**
-	 * Returns whether the first start notification is currently displayed.
-	 *
-	 * @return {@code true} if the first-start notification is currently
-	 *         displayed, {@code false} otherwise
-	 */
-	private boolean hasFirstStartNotification() {
-		return notificationManager.getNotification("first-start-notification") != null;
-	}
-
-	//
 	// ACTIONS
 	//
 
@@ -487,74 +457,6 @@ public class WebInterface implements SessionProvider {
 		pageToadletRegistry.registerToadlets();
 	}
 
-	/**
-	 * Returns the Sone insert notification for the given Sone. If no
-	 * notification for the given Sone exists, a new notification is created and
-	 * cached.
-	 *
-	 * @param sone
-	 *            The Sone to get the insert notification for
-	 * @return The Sone insert notification
-	 */
-	private TemplateNotification getSoneInsertNotification(Sone sone) {
-		synchronized (soneInsertNotifications) {
-			TemplateNotification templateNotification = soneInsertNotifications.get(sone);
-			if (templateNotification == null) {
-				templateNotification = new TemplateNotification(loaders.loadTemplate("/templates/notify/soneInsertNotification.html"));
-				templateNotification.set("insertSone", sone);
-				soneInsertNotifications.put(sone, templateNotification);
-			}
-			return templateNotification;
-		}
-	}
-
-	/**
-	 * Notifies the web interface that a {@link Sone} is being inserted.
-	 *
-	 * @param soneInsertingEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void soneInserting(SoneInsertingEvent soneInsertingEvent) {
-		TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.getSone());
-		soneInsertNotification.set("soneStatus", "inserting");
-		if (soneInsertingEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
-			notificationManager.addNotification(soneInsertNotification);
-		}
-	}
-
-	/**
-	 * Notifies the web interface that a {@link Sone} was inserted.
-	 *
-	 * @param soneInsertedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void soneInserted(SoneInsertedEvent soneInsertedEvent) {
-		TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.getSone());
-		soneInsertNotification.set("soneStatus", "inserted");
-		soneInsertNotification.set("insertDuration", soneInsertedEvent.getInsertDuration() / 1000);
-		if (soneInsertedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
-			notificationManager.addNotification(soneInsertNotification);
-		}
-	}
-
-	/**
-	 * Notifies the web interface that a {@link Sone} insert was aborted.
-	 *
-	 * @param soneInsertAbortedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void soneInsertAborted(SoneInsertAbortedEvent soneInsertAbortedEvent) {
-		TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.getSone());
-		soneInsertNotification.set("soneStatus", "insert-aborted");
-		soneInsertNotification.set("insert-error", soneInsertAbortedEvent.getCause());
-		if (soneInsertAbortedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
-			notificationManager.addNotification(soneInsertNotification);
-		}
-	}
-
 	@Subscribe
 	public void debugActivated(@Nonnull DebugActivatedEvent debugActivatedEvent) {
 		pageToadletRegistry.activateDebugMode();