X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=bd12d5b1fbc80300d2a36b725ea4d5744d858fba;hb=40e29fa1abc0d1da75831d69d4cc9f52601a4045;hp=c27b530f4f3c63e44a5310ffdecb707862762e8f;hpb=12dcccc5668bf645f88886d3a8ef25497622043d;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 c27b530..bd12d5b 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -33,31 +34,36 @@ 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.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; import net.pterodactylus.sone.template.SoneAccessor; import net.pterodactylus.sone.template.SubstringFilter; -import net.pterodactylus.sone.web.ajax.BlacklistSoneAjaxPage; -import net.pterodactylus.sone.web.ajax.BlockSoneAjaxPage; +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; import net.pterodactylus.sone.web.ajax.GetSoneStatusPage; import net.pterodactylus.sone.web.ajax.GetTranslationPage; import net.pterodactylus.sone.web.ajax.LikeAjaxPage; -import net.pterodactylus.sone.web.ajax.UnblacklistSoneAjaxPage; -import net.pterodactylus.sone.web.ajax.UnblockSoneAjaxPage; import net.pterodactylus.sone.web.ajax.UnfollowSoneAjaxPage; import net.pterodactylus.sone.web.ajax.UnlikeAjaxPage; 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.service.AbstractService; +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; @@ -68,6 +74,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; @@ -78,7 +85,7 @@ import freenet.l10n.BaseL10n; * * @author David ‘Bombe’ Roden */ -public class WebInterface extends AbstractService { +public class WebInterface { /** The logger. */ private static final Logger logger = Logging.getLogger(WebInterface.class); @@ -92,6 +99,9 @@ public class WebInterface extends AbstractService { /** The form password. */ private final String formPassword; + /** The template factory. */ + private DefaultTemplateFactory templateFactory; + /** * Creates a new web interface. * @@ -99,9 +109,28 @@ public class WebInterface extends AbstractService { * The Sone plugin */ public WebInterface(SonePlugin sonePlugin) { - super("Sone Web Interface", false); 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); } // @@ -113,7 +142,7 @@ public class WebInterface extends AbstractService { * * @return The Sone core */ - public Core core() { + public Core getCore() { return sonePlugin.core(); } @@ -122,7 +151,7 @@ public class WebInterface extends AbstractService { * * @return The node’s l10n helper */ - public BaseL10n l10n() { + public BaseL10n getL10n() { return sonePlugin.l10n().getBase(); } @@ -131,7 +160,7 @@ public class WebInterface extends AbstractService { * * @return The node’s session manager */ - public SessionManager sessionManager() { + public SessionManager getSessionManager() { try { return sonePlugin.pluginRespirator().getSessionManager(new URI("/")); } catch (URISyntaxException use1) { @@ -145,27 +174,39 @@ public class WebInterface extends AbstractService { * * @return The form password */ - public String formPassword() { + public String getFormPassword() { return formPassword; } // - // SERVICE METHODS + // ACTIONS // /** - * {@inheritDoc} + * Starts the web interface and registers all toadlets. */ - @Override - protected void serviceStart() { + public void start() { registerToadlets(); + + /* notification templates. */ + Template startupNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/startupNotification.html")); + + final TemplateNotification startupNotification = new TemplateNotification(startupNotificationTemplate); + getCore().getNotifications().addNotification(startupNotification); + + Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() { + + @Override + public void run() { + getCore().getNotifications().removeNotification(startupNotification); + } + }, "Sone Startup Notification Remover"); } /** - * {@inheritDoc} + * Stops the web interface and unregisters all toadlets. */ - @Override - protected void serviceStop() { + public void stop() { unregisterToadlets(); } @@ -177,36 +218,14 @@ public class WebInterface extends AbstractService { * Register all toadlets. */ private void registerToadlets() { - DefaultTemplateFactory templateFactory = new DefaultTemplateFactory(); - templateFactory.addAccessor(Object.class, new ReflectionAccessor()); - templateFactory.addAccessor(Sone.class, new SoneAccessor(core())); - templateFactory.addAccessor(Post.class, new PostAccessor(core())); - templateFactory.addAccessor(Reply.class, new ReplyAccessor(core())); - templateFactory.addFilter("date", new DateFilter()); - templateFactory.addFilter("l10n", new L10nFilter(l10n())); - templateFactory.addFilter("substring", new SubstringFilter()); - templateFactory.addFilter("xml", new XmlFilter()); - templateFactory.addFilter("change", new RequestChangeFilter()); - templateFactory.addFilter("match", new MatchFilter()); - 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 addSoneTemplate = templateFactory.createTemplate(createReader("/templates/addSone.html")); - Template loadSoneTemplate = templateFactory.createTemplate(createReader("/templates/loadSone.html")); Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html")); Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html")); - Template importSoneTemplate = templateFactory.createTemplate(createReader("/templates/importSone.html")); Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html")); Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html")); Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html")); - Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml")); Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html")); - Template blockSoneTemplate = templateFactory.createTemplate(createReader("/templates/blockSone.html")); - Template unblockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblockSone.html")); Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html")); Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html")); Template unlikePostTemplate = templateFactory.createTemplate(createReader("/templates/unlike.html")); @@ -216,27 +235,21 @@ public class WebInterface extends AbstractService { 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")); - Template blacklistTemplate = templateFactory.createTemplate(createReader("/templates/blacklist.html")); - Template blacklistSoneTemplate = templateFactory.createTemplate(createReader("/templates/blacklistSone.html")); - Template unblacklistSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblacklistSone.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")); pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone")); - pageToadlets.add(pageToadletFactory.createPageToadlet(new ImportSonePage(importSoneTemplate, this), "ImportSone")); - pageToadlets.add(pageToadletFactory.createPageToadlet(new LoadSonePage(loadSoneTemplate, this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new AddSonePage(addSoneTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones")); pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile")); - pageToadlets.add(pageToadletFactory.createPageToadlet(new BackupProfilePage(backupProfileTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new BlockSonePage(blockSoneTemplate, this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSonePage(unblockSoneTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new LikePage(likePostTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikePage(unlikePostTemplate, this))); @@ -248,24 +261,22 @@ public class WebInterface extends AbstractService { pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login")); pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout")); pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options")); - pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistPage(blacklistTemplate, this), "Blacklist")); - pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistSonePage(blacklistSoneTemplate, this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblacklistSonePage(unblacklistSoneTemplate, this))); 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 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))); pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSoneAjaxPage(this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new BlockSoneAjaxPage(this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSoneAjaxPage(this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistSoneAjaxPage(this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblacklistSoneAjaxPage(this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new LikeAjaxPage(this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikeAjaxPage(this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new GetLikesAjaxPage(this))); @@ -319,6 +330,7 @@ public class WebInterface extends AbstractService { private class ClassPathTemplateProvider implements TemplateProvider { /** The template factory. */ + @SuppressWarnings("hiding") private final TemplateFactory templateFactory; /** @@ -352,4 +364,5 @@ public class WebInterface extends AbstractService { } } + }