X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=3d67e2dffe141bf313e177c8235967bb68960601;hb=9a49215476e139cf20ed4b5b85bcdbb4d8d71704;hp=b443ce7a0578fe2b42726f7a6c6380d8b50acf73;hpb=3d0dbd535f8efee946c17454a22bd24d954946d6;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 b443ce7..3d67e2d 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -35,6 +35,7 @@ import net.pterodactylus.sone.freenet.L10nFilter;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.sone.template.PostAccessor;
 import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.sone.template.SubstringFilter;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
 import net.pterodactylus.sone.web.page.StaticPage;
@@ -147,58 +148,33 @@ 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()));
+		templateFactory.addFilter("substring", new SubstringFilter());
 		templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
-
-		String formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
+		templateFactory.addTemplateObject("formPassword", sonePlugin.pluginRespirator().getToadletContainer().getFormPassword());
 
 		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 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"));
-		backupProfileTemplate.set("formPassword", formPassword);
-
 		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 deletePostTemplate = templateFactory.createTemplate(createReader("/templates/deletePost.html"));
-		deletePostTemplate.set("formPassword", formPassword);
-
+		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/");
@@ -211,9 +187,13 @@ public class WebInterface extends AbstractService {
 		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 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"));