X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=1c429e7afc6b932c25e6838736dcd712f5d5fc55;hb=e686b1315ba475258af1b1d487b6d257932c173e;hp=1d38e85415bcc9ef798e21f4411da9beace211ad;hpb=75771a85377be48674caeedca8253c9c3dbdf818;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 1d38e85..1c429e7 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -40,7 +40,6 @@ import net.pterodactylus.sone.template.CollectionAccessor;
 import net.pterodactylus.sone.template.CssClassNameFilter;
 import net.pterodactylus.sone.template.GetPagePlugin;
 import net.pterodactylus.sone.template.IdentityAccessor;
-import net.pterodactylus.sone.template.NotificationAccessor;
 import net.pterodactylus.sone.template.NotificationManagerAccessor;
 import net.pterodactylus.sone.template.PostAccessor;
 import net.pterodactylus.sone.template.ReplyAccessor;
@@ -50,6 +49,7 @@ import net.pterodactylus.sone.template.SubstringFilter;
 import net.pterodactylus.sone.web.ajax.CreateReplyAjaxPage;
 import net.pterodactylus.sone.web.ajax.DeletePostAjaxPage;
 import net.pterodactylus.sone.web.ajax.DeleteReplyAjaxPage;
+import net.pterodactylus.sone.web.ajax.DismissNotificationAjaxPage;
 import net.pterodactylus.sone.web.ajax.FollowSoneAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetLikesAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetReplyAjaxPage;
@@ -62,7 +62,6 @@ import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
 import net.pterodactylus.sone.web.page.StaticPage;
 import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.notify.TemplateNotification;
 import net.pterodactylus.util.template.DateFilter;
@@ -91,6 +90,9 @@ public class WebInterface {
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(WebInterface.class);
 
+	/** The notification manager. */
+	private final NotificationManager notificationManager = new NotificationManager();
+
 	/** The Sone plugin. */
 	private final SonePlugin sonePlugin;
 
@@ -120,7 +122,6 @@ public class WebInterface {
 		templateFactory.addAccessor(Post.class, new PostAccessor(getCore()));
 		templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore()));
 		templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));
-		templateFactory.addAccessor(Notification.class, new NotificationAccessor());
 		templateFactory.addAccessor(NotificationManager.class, new NotificationManagerAccessor());
 		templateFactory.addFilter("date", new DateFilter());
 		templateFactory.addFilter("l10n", new L10nFilter(getL10n()));
@@ -149,6 +150,15 @@ public class WebInterface {
 	}
 
 	/**
+	 * Returns the notification manager.
+	 *
+	 * @return The notification manager
+	 */
+	public NotificationManager getNotifications() {
+		return notificationManager;
+	}
+
+	/**
 	 * Returns the l10n helper of the node.
 	 *
 	 * @return The node’s l10n helper
@@ -194,13 +204,13 @@ public class WebInterface {
 		Template startupNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/startupNotification.html"));
 
 		final TemplateNotification startupNotification = new TemplateNotification(startupNotificationTemplate);
-		getCore().getNotifications().addNotification(startupNotification);
+		notificationManager.addNotification(startupNotification);
 
 		Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() {
 
 			@Override
 			public void run() {
-				getCore().getNotifications().removeNotification(startupNotification);
+				startupNotification.dismiss();
 			}
 		}, "Sone Startup Notification Remover");
 	}
@@ -271,6 +281,7 @@ public class WebInterface {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("javascript/", "/static/javascript/", "text/javascript")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("images/", "/static/images/", "image/png")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationAjaxPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetSoneStatusPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyAjaxPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetReplyAjaxPage(this, replyTemplate)));