X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=07f147681d7640cc45b6ed19b649b45b7b16f864;hb=e6768e198b1644393e63947a0fc45f1c72ae474b;hp=4ed49df3184f83a1ddb83ab02999703fc5bf1e4d;hpb=0dc7811a459455dd2b670eb1924df27f65c36a24;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 4ed49df..07f1476 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -21,7 +21,6 @@ import static com.google.common.collect.FluentIterable.from;
 import static java.util.logging.Logger.getLogger;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -30,11 +29,11 @@ import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Named;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.ElementLoader;
@@ -175,15 +174,6 @@ public class WebInterface implements SessionProvider {
 	/** Notifications for sone inserts. */
 	private final Map<Sone, TemplateNotification> soneInsertNotifications = new HashMap<>();
 
-	/** Sone locked notification ticker objects. */
-	private final Map<Sone, ScheduledFuture<?>> lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap<Sone, ScheduledFuture<?>>());
-
-	/** The “Sone locked” notification. */
-	private final ListNotification<Sone> lockedSonesNotification;
-
-	/** The “new version” notification. */
-	private final TemplateNotification newVersionNotification;
-
 	/** The “inserting images” notification. */
 	private final ListNotification<Image> insertingImagesNotification;
 
@@ -205,7 +195,8 @@ public class WebInterface implements SessionProvider {
 			RenderFilter renderFilter,
 			LinkedElementRenderFilter linkedElementRenderFilter,
 			PageToadletRegistry pageToadletRegistry, MetricRegistry metricRegistry, Translation translation, L10nFilter l10nFilter,
-			NotificationManager notificationManager) {
+			NotificationManager notificationManager, @Named("newRemotePost") ListNotification<Post> newPostNotification,
+			@Named("localPost") ListNotification<Post> localPostNotification) {
 		this.sonePlugin = sonePlugin;
 		this.loaders = loaders;
 		this.listNotificationFilter = listNotificationFilter;
@@ -222,6 +213,8 @@ public class WebInterface implements SessionProvider {
 		this.l10nFilter = l10nFilter;
 		this.translation = translation;
 		this.notificationManager = notificationManager;
+		this.newPostNotification = newPostNotification;
+		this.localPostNotification = localPostNotification;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
 		soneTextParser = new SoneTextParser(getCore(), getCore());
 
@@ -230,12 +223,6 @@ public class WebInterface implements SessionProvider {
 		templateContextFactory.addTemplateObject("formPassword", formPassword);
 
 		/* create notifications. */
-		Template newPostNotificationTemplate = loaders.loadTemplate("/templates/notify/newPostNotification.html");
-		newPostNotification = new ListNotification<>("new-post-notification", "posts", newPostNotificationTemplate, false);
-
-		Template localPostNotificationTemplate = loaders.loadTemplate("/templates/notify/newPostNotification.html");
-		localPostNotification = new ListNotification<>("local-post-notification", "posts", localPostNotificationTemplate, false);
-
 		Template newReplyNotificationTemplate = loaders.loadTemplate("/templates/notify/newReplyNotification.html");
 		newReplyNotification = new ListNotification<>("new-reply-notification", "replies", newReplyNotificationTemplate, false);
 
@@ -245,12 +232,6 @@ public class WebInterface implements SessionProvider {
 		Template mentionNotificationTemplate = loaders.loadTemplate("/templates/notify/mentionNotification.html");
 		mentionNotification = new ListNotification<>("mention-notification", "posts", mentionNotificationTemplate, false);
 
-		Template lockedSonesTemplate = loaders.loadTemplate("/templates/notify/lockedSonesNotification.html");
-		lockedSonesNotification = new ListNotification<>("sones-locked-notification", "sones", lockedSonesTemplate);
-
-		Template newVersionTemplate = loaders.loadTemplate("/templates/notify/newVersionNotification.html");
-		newVersionNotification = new TemplateNotification("new-version-notification", newVersionTemplate);
-
 		Template insertingImagesTemplate = loaders.loadTemplate("/templates/notify/inserting-images-notification.html");
 		insertingImagesNotification = new ListNotification<>("inserting-images-notification", "images", insertingImagesTemplate);
 
@@ -396,16 +377,6 @@ public class WebInterface implements SessionProvider {
 		return formPassword;
 	}
 
-	/**
-	 * Returns the posts that have been announced as new in the
-	 * {@link #newPostNotification}.
-	 *
-	 * @return The new posts
-	 */
-	public Set<Post> getNewPosts() {
-		return ImmutableSet.<Post> builder().addAll(newPostNotification.getElements()).addAll(localPostNotification.getElements()).build();
-	}
-
 	@Nonnull
 	public Collection<Post> getNewPosts(@Nullable Sone currentSone) {
 		Set<Post> allNewPosts = ImmutableSet.<Post> builder()
@@ -693,13 +664,7 @@ public class WebInterface implements SessionProvider {
 	public void newPostFound(NewPostFoundEvent newPostFoundEvent) {
 		Post post = newPostFoundEvent.getPost();
 		boolean isLocal = post.getSone().isLocal();
-		if (isLocal) {
-			localPostNotification.add(post);
-		}
 		if (!hasFirstStartNotification()) {
-			if (isLocal) {
-				notificationManager.addNotification(localPostNotification);
-			}
 			if (!getMentionedSones(post.getText()).isEmpty() && !isLocal) {
 				mentionNotification.add(post);
 				notificationManager.addNotification(mentionNotification);
@@ -750,7 +715,6 @@ public class WebInterface implements SessionProvider {
 
 	private void removePost(Post post) {
 		newPostNotification.remove(post);
-		localPostNotification.remove(post);
 		if (!localSoneMentionedInNewPostOrReply(post)) {
 			mentionNotification.remove(post);
 		}
@@ -770,39 +734,6 @@ public class WebInterface implements SessionProvider {
 	}
 
 	/**
-	 * Notifies the web interface that a Sone was locked.
-	 *
-	 * @param soneLockedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void soneLocked(SoneLockedEvent soneLockedEvent) {
-		final Sone sone = soneLockedEvent.getSone();
-		ScheduledFuture<?> tickerObject = ticker.schedule(new Runnable() {
-
-			@Override
-			@SuppressWarnings("synthetic-access")
-			public void run() {
-				lockedSonesNotification.add(sone);
-				notificationManager.addNotification(lockedSonesNotification);
-			}
-		}, 5, TimeUnit.MINUTES);
-		lockedSonesTickerObjects.put(sone, tickerObject);
-	}
-
-	/**
-	 * Notifies the web interface that a Sone was unlocked.
-	 *
-	 * @param soneUnlockedEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void soneUnlocked(SoneUnlockedEvent soneUnlockedEvent) {
-		lockedSonesNotification.remove(soneUnlockedEvent.getSone());
-		lockedSonesTickerObjects.remove(soneUnlockedEvent.getSone()).cancel(false);
-	}
-
-	/**
 	 * Notifies the web interface that a {@link Sone} is being inserted.
 	 *
 	 * @param soneInsertingEvent
@@ -850,21 +781,6 @@ public class WebInterface implements SessionProvider {
 	}
 
 	/**
-	 * Notifies the web interface that a new Sone version was found.
-	 *
-	 * @param updateFoundEvent
-	 *            The event
-	 */
-	@Subscribe
-	public void updateFound(UpdateFoundEvent updateFoundEvent) {
-		newVersionNotification.set("latestVersion", updateFoundEvent.getVersion());
-		newVersionNotification.set("latestEdition", updateFoundEvent.getLatestEdition());
-		newVersionNotification.set("releaseTime", updateFoundEvent.getReleaseTime());
-		newVersionNotification.set("disruptive", updateFoundEvent.isDisruptive());
-		notificationManager.addNotification(newVersionNotification);
-	}
-
-	/**
 	 * Notifies the web interface that an image insert was started
 	 *
 	 * @param imageInsertStartedEvent