X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=f8b9c5ab78c42a6e9bb3d49767875a748ffe9cfa;hp=a007222435a0541d634670d202b050a7cfb5c2bf;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;hpb=0206f400c986a38cd91978059e98838c02af0b99

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index a007222..f8b9c5a 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -138,9 +138,9 @@ import net.pterodactylus.util.web.RedirectPage;
 import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
 import freenet.clients.http.SessionManager;
+import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContainer;
 import freenet.clients.http.ToadletContext;
-import freenet.clients.http.SessionManager.Session;
 import freenet.l10n.BaseL10n;
 import freenet.support.api.HTTPRequest;
 
@@ -243,7 +243,7 @@ public class WebInterface implements CoreListener {
 		templateContextFactory.addFilter("html", new HtmlFilter());
 		templateContextFactory.addFilter("replace", new ReplaceFilter());
 		templateContextFactory.addFilter("store", new StoreFilter());
-		templateContextFactory.addFilter("l10n", new L10nFilter(getL10n()));
+		templateContextFactory.addFilter("l10n", new L10nFilter(this));
 		templateContextFactory.addFilter("substring", new SubstringFilter());
 		templateContextFactory.addFilter("xml", new XmlFilter());
 		templateContextFactory.addFilter("change", new RequestChangeFilter());
@@ -583,6 +583,7 @@ public class WebInterface implements CoreListener {
 		Template emptyTemplate = TemplateParser.parse(new StringReader(""));
 		Template loginTemplate = TemplateParser.parse(createReader("/templates/login.html"));
 		Template indexTemplate = TemplateParser.parse(createReader("/templates/index.html"));
+		Template newTemplate = TemplateParser.parse(createReader("/templates/new.html"));
 		Template knownSonesTemplate = TemplateParser.parse(createReader("/templates/knownSones.html"));
 		Template createSoneTemplate = TemplateParser.parse(createReader("/templates/createSone.html"));
 		Template createPostTemplate = TemplateParser.parse(createReader("/templates/createPost.html"));
@@ -613,6 +614,7 @@ public class WebInterface implements CoreListener {
 		PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new RedirectPage<FreenetRequest>("", "index.html")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new NewPage(newTemplate, this), "New"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
@@ -747,7 +749,7 @@ public class WebInterface implements CoreListener {
 				}
 			}
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, "Could not parse post text: " + text, ioe1);
+			logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1);
 		}
 		return Filters.filteredSet(mentionedSones, Sone.LOCAL_SONE_FILTER);
 	}
@@ -888,7 +890,7 @@ public class WebInterface implements CoreListener {
 		if (!getMentionedSones(reply.getText()).isEmpty()) {
 			boolean isMentioned = false;
 			for (PostReply existingReply : getCore().getReplies(reply.getPost())) {
-				isMentioned |= getCore().isNewReply(reply.getId()) && !getMentionedSones(existingReply.getText()).isEmpty();
+				isMentioned |= !reply.isKnown() && !getMentionedSones(existingReply.getText()).isEmpty();
 			}
 			if (!isMentioned) {
 				mentionNotification.remove(reply.getPost());
@@ -1041,7 +1043,7 @@ public class WebInterface implements CoreListener {
 			try {
 				return templateCache.get(templateName);
 			} catch (CacheException ce1) {
-				logger.log(Level.WARNING, "Could not get template for " + templateName + "!", ce1);
+				logger.log(Level.WARNING, String.format("Could not get template for %s!", templateName), ce1);
 				return null;
 			}
 		}
@@ -1064,7 +1066,7 @@ public class WebInterface implements CoreListener {
 			try {
 				template = TemplateParser.parse(templateReader);
 			} catch (TemplateException te1) {
-				logger.log(Level.WARNING, "Could not parse template “" + templateName + "” for inclusion!", te1);
+				logger.log(Level.WARNING, String.format("Could not parse template “%s” for inclusion!", templateName), te1);
 			}
 			return template;
 		}