X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=0e62f77042b3d565e050f8de01ab68f79e009f5b;hb=6ceda699ed09af534cfb6c4dd1dc95c476d135b7;hp=73436c760121c04ad97cb8bfc544e4adb9c075f8;hpb=47ed7eaf00c35889781831d33d04e9f91c9ad266;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 73436c7..0e62f77 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -178,11 +178,8 @@ public class WebInterface implements CoreListener {
 	/** The “you have been mentioned” notification. */
 	private final ListNotification<Post> mentionNotification;
 
-	/** The “rescuing Sone” notification. */
-	private final ListNotification<Sone> rescuingSonesNotification;
-
-	/** The “Sone rescued” notification. */
-	private final ListNotification<Sone> sonesRescuedNotification;
+	/** Notifications for sone inserts. */
+	private final Map<Sone, TemplateNotification> soneInsertNotifications = new HashMap<Sone, TemplateNotification>();
 
 	/** Sone locked notification ticker objects. */
 	private final Map<Sone, Object> lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap<Sone, Object>());
@@ -255,12 +252,6 @@ public class WebInterface implements CoreListener {
 		Template mentionNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/mentionNotification.html"));
 		mentionNotification = new ListNotification<Post>("mention-notification", "posts", mentionNotificationTemplate, false);
 
-		Template rescuingSonesTemplate = TemplateParser.parse(createReader("/templates/notify/rescuingSonesNotification.html"));
-		rescuingSonesNotification = new ListNotification<Sone>("sones-being-rescued-notification", "sones", rescuingSonesTemplate);
-
-		Template sonesRescuedTemplate = TemplateParser.parse(createReader("/templates/notify/sonesRescuedNotification.html"));
-		sonesRescuedNotification = new ListNotification<Sone>("sones-rescued-notification", "sones", sonesRescuedTemplate);
-
 		Template lockedSonesTemplate = TemplateParser.parse(createReader("/templates/notify/lockedSonesNotification.html"));
 		lockedSonesNotification = new ListNotification<Sone>("sones-locked-notification", "sones", lockedSonesTemplate);
 
@@ -568,6 +559,7 @@ public class WebInterface implements CoreListener {
 		Template deleteSoneTemplate = TemplateParser.parse(createReader("/templates/deleteSone.html"));
 		Template noPermissionTemplate = TemplateParser.parse(createReader("/templates/noPermission.html"));
 		Template optionsTemplate = TemplateParser.parse(createReader("/templates/options.html"));
+		Template rescueTemplate = TemplateParser.parse(createReader("/templates/rescue.html"));
 		Template aboutTemplate = TemplateParser.parse(createReader("/templates/about.html"));
 		Template invalidTemplate = TemplateParser.parse(createReader("/templates/invalid.html"));
 		Template postTemplate = TemplateParser.parse(createReader("/templates/include/viewPost.html"));
@@ -606,6 +598,7 @@ public class WebInterface implements CoreListener {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(emptyTemplate, this), "Logout"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new RescuePage(rescueTemplate, this), "Rescue"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationPage(emptyTemplate, this)));
@@ -705,28 +698,30 @@ public class WebInterface implements CoreListener {
 		return Filters.filteredSet(mentionedSones, Sone.LOCAL_SONE_FILTER);
 	}
 
-	//
-	// CORELISTENER METHODS
-	//
-
 	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void rescuingSone(Sone sone) {
-		rescuingSonesNotification.add(sone);
-		notificationManager.addNotification(rescuingSonesNotification);
+	 * 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(TemplateParser.parse(createReader("/templates/notify/soneInsertNotification.html")));
+				templateNotification.set("insertSone", sone);
+				soneInsertNotifications.put(sone, templateNotification);
+			}
+			return templateNotification;
+		}
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void rescuedSone(Sone sone) {
-		rescuingSonesNotification.remove(sone);
-		sonesRescuedNotification.add(sone);
-		notificationManager.addNotification(sonesRescuedNotification);
-	}
+	//
+	// CORELISTENER METHODS
+	//
 
 	/**
 	 * {@inheritDoc}
@@ -766,9 +761,6 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newReplyFound(Reply reply) {
-		if (reply.getPost().getSone() == null) {
-			return;
-		}
 		boolean isLocal = getCore().isLocalSone(reply.getSone());
 		if (isLocal) {
 			localReplyNotification.add(reply);
@@ -871,6 +863,35 @@ public class WebInterface implements CoreListener {
 	 * {@inheritDoc}
 	 */
 	@Override
+	public void soneInserting(Sone sone) {
+		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+		soneInsertNotification.set("soneStatus", "inserting");
+		notificationManager.addNotification(soneInsertNotification);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void soneInserted(Sone sone, long insertDuration) {
+		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+		soneInsertNotification.set("soneStatus", "inserted");
+		soneInsertNotification.set("insertDuration", insertDuration / 1000);
+		notificationManager.addNotification(soneInsertNotification);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void soneInsertAborted(Sone sone, Throwable cause) {
+		notificationManager.addNotification(getSoneInsertNotification(sone).set("soneStatus", "insert-aborted").set("insert-error", cause));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
 	public void updateFound(Version version, long releaseTime, long latestEdition) {
 		newVersionNotification.getTemplateContext().set("latestVersion", version);
 		newVersionNotification.getTemplateContext().set("latestEdition", latestEdition);