Don’t show “web of trust is missing” notification the old way.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / WebInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 9dce6a7..a74c125 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -30,17 +30,20 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.core.CoreListener;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.L10nFilter;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.notify.NewPostNotification;
+import net.pterodactylus.sone.notify.NewReplyNotification;
+import net.pterodactylus.sone.notify.NewSoneNotification;
 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;
@@ -53,6 +56,7 @@ 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.GetNotificationsAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetReplyAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetSoneStatusPage;
 import net.pterodactylus.sone.web.ajax.GetTranslationPage;
@@ -63,7 +67,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;
@@ -87,11 +90,14 @@ import freenet.l10n.BaseL10n;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class WebInterface {
+public class WebInterface implements CoreListener {
 
        /** 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;
 
@@ -104,6 +110,15 @@ public class WebInterface {
        /** The template factory. */
        private DefaultTemplateFactory templateFactory;
 
+       /** The “new Sone” notification. */
+       private final NewSoneNotification newSoneNotification;
+
+       /** The “new post” notification. */
+       private final NewPostNotification newPostNotification;
+
+       /** The “new reply” notification. */
+       private final NewReplyNotification newReplyNotification;
+
        /**
         * Creates a new web interface.
         *
@@ -121,7 +136,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()));
@@ -134,6 +148,16 @@ public class WebInterface {
                templateFactory.addPlugin("paginate", new PaginationPlugin());
                templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
                templateFactory.addTemplateObject("formPassword", formPassword);
+
+               /* create notifications. */
+               Template newSoneNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newSoneNotification.html"));
+               newSoneNotification = new NewSoneNotification(newSoneNotificationTemplate);
+
+               Template newPostNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newPostNotification.html"));
+               newPostNotification = new NewPostNotification(newPostNotificationTemplate);
+
+               Template newReplyNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newReplyNotification.html"));
+               newReplyNotification = new NewReplyNotification(newReplyNotificationTemplate);
        }
 
        //
@@ -150,6 +174,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,14 +227,14 @@ public class WebInterface {
                /* notification templates. */
                Template startupNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/startupNotification.html"));
 
-               final TemplateNotification startupNotification = new TemplateNotification(startupNotificationTemplate);
-               getCore().getNotifications().addNotification(startupNotification);
+               final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
+               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");
        }
@@ -211,6 +244,7 @@ public class WebInterface {
         */
        public void stop() {
                unregisterToadlets();
+               Ticker.getInstance().stop();
        }
 
        //
@@ -238,7 +272,6 @@ public class WebInterface {
                Template unfollowSoneTemplate = templateFactory.createTemplate(createReader("/templates/unfollowSone.html"));
                Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html"));
                Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html"));
-               Template wotPluginMissingTemplate = templateFactory.createTemplate(createReader("/templates/wotPluginMissing.html"));
                Template dismissNotificationTemplate = templateFactory.createTemplate(createReader("/templates/dismissNotification.html"));
                Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
                Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html"));
@@ -266,12 +299,12 @@ public class WebInterface {
                pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
                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 SoneTemplatePage("wotPluginMissing.html", wotPluginMissingTemplate, "Page.WotPluginMissing.Title", this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationPage(dismissNotificationTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css")));
                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 GetNotificationsAjaxPage(this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationAjaxPage(this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new GetSoneStatusPage(this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyAjaxPage(this)));
@@ -323,6 +356,73 @@ public class WebInterface {
                }
        }
 
+       //
+       // CORELISTENER METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public void newSoneFound(Sone sone) {
+               newSoneNotification.addSone(sone);
+               notificationManager.addNotification(newSoneNotification);
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public void newPostFound(Post post) {
+               newPostNotification.addPost(post);
+               notificationManager.addNotification(newPostNotification);
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public void newReplyFound(Reply reply) {
+               if (reply.getPost().getSone() == null) {
+                       return;
+               }
+               newReplyNotification.addReply(reply);
+               notificationManager.addNotification(newReplyNotification);
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public void markSoneKnown(Sone sone) {
+               newSoneNotification.removeSone(sone);
+               if (newSoneNotification.isEmpty()) {
+                       newSoneNotification.dismiss();
+               }
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public void markPostKnown(Post post) {
+               newPostNotification.removePost(post);
+               if (newPostNotification.isEmpty()) {
+                       newPostNotification.dismiss();
+               }
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public void markReplyKnown(Reply reply) {
+               newReplyNotification.removeReply(reply);
+               if (newReplyNotification.isEmpty()) {
+                       newReplyNotification.dismiss();
+               }
+       }
+
        /**
         * Template provider implementation that uses
         * {@link WebInterface#createReader(String)} to load templates for