X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=5e0a1684267b749d5228f006daf0dcd41fc08f77;hb=5494e5cde35c064b80ebc55f29da22a3348b9fef;hp=4c436c27719d5d5e094c9351e9c44ce1ebcc0cc7;hpb=ee1fdebf3f0d213c8ba451bd3a9649259d6637a5;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 4c436c2..5e0a168 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -30,16 +30,21 @@ 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.NotificationManagerAccessor; import net.pterodactylus.sone.template.PostAccessor; import net.pterodactylus.sone.template.ReplyAccessor; import net.pterodactylus.sone.template.RequestChangeFilter; @@ -48,8 +53,11 @@ 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.GetNotificationsAjaxPage; +import net.pterodactylus.sone.web.ajax.GetReplyAjaxPage; import net.pterodactylus.sone.web.ajax.GetSoneStatusPage; import net.pterodactylus.sone.web.ajax.GetTranslationPage; import net.pterodactylus.sone.web.ajax.LikeAjaxPage; @@ -59,6 +67,8 @@ 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.NotificationManager; +import net.pterodactylus.util.notify.TemplateNotification; import net.pterodactylus.util.template.DateFilter; import net.pterodactylus.util.template.DefaultTemplateFactory; import net.pterodactylus.util.template.MatchFilter; @@ -69,6 +79,7 @@ import net.pterodactylus.util.template.TemplateException; import net.pterodactylus.util.template.TemplateFactory; import net.pterodactylus.util.template.TemplateProvider; import net.pterodactylus.util.template.XmlFilter; +import net.pterodactylus.util.thread.Ticker; import freenet.clients.http.SessionManager; import freenet.clients.http.ToadletContainer; import freenet.l10n.BaseL10n; @@ -79,11 +90,14 @@ import freenet.l10n.BaseL10n; * * @author David ‘Bombe’ Roden */ -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; @@ -93,6 +107,18 @@ public class WebInterface { /** The form password. */ private final String formPassword; + /** 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. * @@ -102,6 +128,36 @@ public class WebInterface { public WebInterface(SonePlugin sonePlugin) { this.sonePlugin = sonePlugin; formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword(); + + templateFactory = new DefaultTemplateFactory(); + templateFactory.addAccessor(Object.class, new ReflectionAccessor()); + templateFactory.addAccessor(Collection.class, new CollectionAccessor()); + templateFactory.addAccessor(Sone.class, new SoneAccessor(getCore())); + templateFactory.addAccessor(Post.class, new PostAccessor(getCore())); + templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore())); + templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore())); + templateFactory.addAccessor(NotificationManager.class, new NotificationManagerAccessor()); + templateFactory.addFilter("date", new DateFilter()); + templateFactory.addFilter("l10n", new L10nFilter(getL10n())); + templateFactory.addFilter("substring", new SubstringFilter()); + templateFactory.addFilter("xml", new XmlFilter()); + templateFactory.addFilter("change", new RequestChangeFilter()); + templateFactory.addFilter("match", new MatchFilter()); + templateFactory.addFilter("css", new CssClassNameFilter()); + templateFactory.addPlugin("getpage", new GetPagePlugin()); + 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); } // @@ -118,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 @@ -158,6 +223,20 @@ public class WebInterface { */ public void start() { registerToadlets(); + + /* notification templates. */ + Template startupNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/startupNotification.html")); + + final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate); + notificationManager.addNotification(startupNotification); + + Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() { + + @Override + public void run() { + startupNotification.dismiss(); + } + }, "Sone Startup Notification Remover"); } /** @@ -165,6 +244,7 @@ public class WebInterface { */ public void stop() { unregisterToadlets(); + Ticker.getInstance().stop(); } // @@ -175,25 +255,6 @@ public class WebInterface { * Register all toadlets. */ private void registerToadlets() { - DefaultTemplateFactory templateFactory = new DefaultTemplateFactory(); - templateFactory.addAccessor(Object.class, new ReflectionAccessor()); - templateFactory.addAccessor(Collection.class, new CollectionAccessor()); - templateFactory.addAccessor(Sone.class, new SoneAccessor(getCore())); - templateFactory.addAccessor(Post.class, new PostAccessor(getCore())); - templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore())); - templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore())); - templateFactory.addFilter("date", new DateFilter()); - templateFactory.addFilter("l10n", new L10nFilter(getL10n())); - templateFactory.addFilter("substring", new SubstringFilter()); - templateFactory.addFilter("xml", new XmlFilter()); - templateFactory.addFilter("change", new RequestChangeFilter()); - templateFactory.addFilter("match", new MatchFilter()); - templateFactory.addFilter("css", new CssClassNameFilter()); - templateFactory.addPlugin("getpage", new GetPagePlugin()); - templateFactory.addPlugin("paginate", new PaginationPlugin()); - templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory)); - templateFactory.addTemplateObject("formPassword", formPassword); - Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html")); Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html")); Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html")); @@ -212,9 +273,11 @@ public class WebInterface { 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")); Template aboutTemplate = templateFactory.createTemplate(createReader("/templates/about.html")); + Template replyTemplate = templateFactory.createTemplate(createReader("/templates/include/viewReply.html")); PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/"); pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index")); @@ -238,12 +301,16 @@ public class WebInterface { 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))); + pageToadlets.add(pageToadletFactory.createPageToadlet(new GetReplyAjaxPage(this, replyTemplate))); pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostAjaxPage(this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyAjaxPage(this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSoneAjaxPage(this))); @@ -291,6 +358,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 @@ -301,6 +435,7 @@ public class WebInterface { private class ClassPathTemplateProvider implements TemplateProvider { /** The template factory. */ + @SuppressWarnings("hiding") private final TemplateFactory templateFactory; /**