X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=388e64f028f3f0025f27731fb9306e80825d384b;hb=c8f518f638aa16cf37145561b709d28252de213a;hp=83a942adfb9a9ca2d7e2dbad91f75eea2be09bea;hpb=7bfcfb4933112345a2d7c5710993ab0109b53c57;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 83a942a..388e64f 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -33,8 +33,19 @@ import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.freenet.L10nFilter; import net.pterodactylus.sone.main.SonePlugin; +import net.pterodactylus.sone.template.GetPagePlugin; import net.pterodactylus.sone.template.PostAccessor; +import net.pterodactylus.sone.template.RequestChangeFilter; import net.pterodactylus.sone.template.SoneAccessor; +import net.pterodactylus.sone.template.SubstringFilter; +import net.pterodactylus.sone.web.ajax.BlockSoneAjaxPage; +import net.pterodactylus.sone.web.ajax.DeletePostAjaxPage; +import net.pterodactylus.sone.web.ajax.DeleteReplyAjaxPage; +import net.pterodactylus.sone.web.ajax.FollowSoneAjaxPage; +import net.pterodactylus.sone.web.ajax.GetSoneStatusPage; +import net.pterodactylus.sone.web.ajax.GetTranslationPage; +import net.pterodactylus.sone.web.ajax.UnblockSoneAjaxPage; +import net.pterodactylus.sone.web.ajax.UnfollowSoneAjaxPage; import net.pterodactylus.sone.web.page.PageToadlet; import net.pterodactylus.sone.web.page.PageToadletFactory; import net.pterodactylus.sone.web.page.StaticPage; @@ -42,12 +53,15 @@ import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.service.AbstractService; import net.pterodactylus.util.template.DateFilter; import net.pterodactylus.util.template.DefaultTemplateFactory; +import net.pterodactylus.util.template.PaginationPlugin; import net.pterodactylus.util.template.ReflectionAccessor; import net.pterodactylus.util.template.Template; -import freenet.clients.http.LinkEnabledCallback; +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 freenet.clients.http.SessionManager; import freenet.clients.http.ToadletContainer; -import freenet.clients.http.ToadletContext; import freenet.l10n.BaseL10n; /** @@ -67,6 +81,9 @@ public class WebInterface extends AbstractService { /** The registered toadlets. */ private final List pageToadlets = new ArrayList(); + /** The form password. */ + private final String formPassword; + /** * Creates a new web interface. * @@ -74,8 +91,9 @@ public class WebInterface extends AbstractService { * The Sone plugin */ public WebInterface(SonePlugin sonePlugin) { - super("Sone Web Interface"); + super("Sone Web Interface", false); this.sonePlugin = sonePlugin; + formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword(); } // @@ -114,6 +132,15 @@ public class WebInterface extends AbstractService { } } + /** + * Returns the node’s form password. + * + * @return The form password + */ + public String formPassword() { + return formPassword; + } + // // SERVICE METHODS // @@ -144,70 +171,77 @@ public class WebInterface extends AbstractService { private void registerToadlets() { DefaultTemplateFactory templateFactory = new DefaultTemplateFactory(); templateFactory.addAccessor(Object.class, new ReflectionAccessor()); - templateFactory.addAccessor(Sone.class, new SoneAccessor()); + templateFactory.addAccessor(Sone.class, new SoneAccessor(core())); templateFactory.addAccessor(Post.class, new PostAccessor(core())); templateFactory.addFilter("date", new DateFilter()); templateFactory.addFilter("l10n", new L10nFilter(l10n())); - - String formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword(); + templateFactory.addFilter("substring", new SubstringFilter()); + templateFactory.addFilter("xml", new XmlFilter()); + templateFactory.addFilter("change", new RequestChangeFilter()); + 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")); - loginTemplate.set("formPassword", formPassword); - Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html")); - indexTemplate.set("formPassword", formPassword); - Template addSoneTemplate = templateFactory.createTemplate(createReader("/templates/addSone.html")); - addSoneTemplate.set("formPassword", formPassword); - + Template loadSoneTemplate = templateFactory.createTemplate(createReader("/templates/loadSone.html")); Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html")); - knownSonesTemplate.set("formPassword", formPassword); - Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html")); - createSoneTemplate.set("formPassword", formPassword); - Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html")); - createPostTemplate.set("formPassword", formPassword); - Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html")); - createReplyTemplate.set("formPassword", formPassword); - Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html")); - editProfileTemplate.set("formPassword", formPassword); - + Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml")); Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html")); - viewSoneTemplate.set("formPassword", formPassword); - + Template blockSoneTemplate = templateFactory.createTemplate(createReader("/templates/blockSone.html")); + Template unblockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblockSone.html")); Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html")); - viewPostTemplate.set("formPassword", formPassword); - + Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/likePost.html")); + Template unlikePostTemplate = templateFactory.createTemplate(createReader("/templates/unlikePost.html")); + Template deletePostTemplate = templateFactory.createTemplate(createReader("/templates/deletePost.html")); + Template deleteReplyTemplate = templateFactory.createTemplate(createReader("/templates/deleteReply.html")); Template followSoneTemplate = templateFactory.createTemplate(createReader("/templates/followSone.html")); - followSoneTemplate.set("formPassword", formPassword); - + Template unfollowSoneTemplate = templateFactory.createTemplate(createReader("/templates/unfollowSone.html")); Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html")); - deleteSoneTemplate.set("formPassword", formPassword); - Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html")); - Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.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 AddSonePage(addSoneTemplate, this), "AddSone")); + 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 LikePostPage(likePostTemplate, this))); + pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikePostPage(unlikePostTemplate, this))); + pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this))); + pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyPage(deleteReplyTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this))); + pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSonePage(unfollowSoneTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteSonePage(deleteSoneTemplate, this), "DeleteSone")); pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login")); pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout")); pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", 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 GetSoneStatusPage(this))); + 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))); ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer(); toadletContainer.getPageMaker().addNavigationCategory("/Sone/index.html", "Navigation.Menu.Name", "Navigation.Menu.Tooltip", sonePlugin); @@ -249,21 +283,46 @@ public class WebInterface extends AbstractService { } /** - * {@link LinkEnabledCallback} implementation that always returns - * {@code true} when {@link LinkEnabledCallback#isEnabled(ToadletContext)} - * is called. + * Template provider implementation that uses + * {@link WebInterface#createReader(String)} to load templates for + * inclusion. * * @author David ‘Bombe’ Roden */ - public class AlwaysEnabledCallback implements LinkEnabledCallback { + private class ClassPathTemplateProvider implements TemplateProvider { + + /** The template factory. */ + private final TemplateFactory templateFactory; + + /** + * Creates a new template provider that locates templates on the + * classpath. + * + * @param templateFactory + * The template factory to create the templates + */ + public ClassPathTemplateProvider(TemplateFactory templateFactory) { + this.templateFactory = templateFactory; + } /** * {@inheritDoc} */ @Override - public boolean isEnabled(ToadletContext toadletContext) { - return true; + @SuppressWarnings("synthetic-access") + public Template getTemplate(String templateName) { + Reader templateReader = createReader("/templates/" + templateName); + if (templateReader == null) { + return null; + } + Template template = templateFactory.createTemplate(templateReader); + try { + template.parse(); + } catch (TemplateException te1) { + logger.log(Level.WARNING, "Could not parse template “" + templateName + "” for inclusion!", te1); + } + return template; } - } + } }