X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=98cc99da34efebe921f421af5bdc96818011bc93;hb=042a6df867a153650600882cd0a5e5edbdffca1c;hp=a3f33525cbb83bf76c6b8d8b72ac9c061356bf78;hpb=2f21e4a2402f1c7a55175f223118521dbd2d27d8;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 a3f3352..98cc99d 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -129,7 +129,6 @@ import net.pterodactylus.sone.web.page.PageToadletFactory;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.notify.TemplateNotification;
-import net.pterodactylus.util.template.ClassPathTemplateProvider;
 import net.pterodactylus.util.template.CollectionSortFilter;
 import net.pterodactylus.util.template.ContainsFilter;
 import net.pterodactylus.util.template.DateFilter;
@@ -146,7 +145,6 @@ import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.template.TemplateProvider;
 import net.pterodactylus.util.template.XmlFilter;
 import net.pterodactylus.util.web.RedirectPage;
-import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
 
 import com.google.common.collect.Collections2;
@@ -286,7 +284,7 @@ public class WebInterface {
 		templateContextFactory.addFilter("mod", new ModFilter());
 		templateContextFactory.addFilter("paginate", new PaginationFilter());
 		templateContextFactory.addProvider(TemplateProvider.TEMPLATE_CONTEXT_PROVIDER);
-		templateContextFactory.addProvider(new ClassPathTemplateProvider(WebInterface.class, "/templates/"));
+		templateContextFactory.addProvider(loaders.getTemplateProvider());
 		templateContextFactory.addTemplateObject("webInterface", this);
 		templateContextFactory.addTemplateObject("formPassword", formPassword);
 
@@ -685,9 +683,9 @@ public class WebInterface {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyAlbumTitle.html", emptyAlbumTitleTemplate, "Page.EmptyAlbumTitle.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationPage(emptyTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("invalid.html", invalidTemplate, "Page.Invalid.Title", this)));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage<FreenetRequest>("css/", "/static/css/", "text/css")));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage<FreenetRequest>("javascript/", "/static/javascript/", "text/javascript")));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage<FreenetRequest>("images/", "/static/images/", "image/png")));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(loaders.<FreenetRequest>loadStaticPage("css/", "/static/css/", "text/css")));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(loaders.<FreenetRequest>loadStaticPage("javascript/", "/static/javascript/", "text/javascript")));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(loaders.<FreenetRequest>loadStaticPage("images/", "/static/images/", "image/png")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new TemplatePage<FreenetRequest>("OpenSearch.xml", "application/opensearchdescription+xml", templateContextFactory, openSearchTemplate)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetImagePage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
@@ -886,72 +884,46 @@ public class WebInterface {
 		newSoneNotification.remove(markSoneKnownEvent.sone());
 	}
 
-	/**
-	 * Notifies the web interface that a {@link Post} was marked as known.
-	 *
-	 * @param markPostKnownEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) {
-		newPostNotification.remove(markPostKnownEvent.post());
-		localPostNotification.remove(markPostKnownEvent.post());
-		if (!localSoneMentionedInNewPostOrReply(markPostKnownEvent.post())) {
-			mentionNotification.remove(markPostKnownEvent.post());
-		}
+		removePost(markPostKnownEvent.post());
 	}
 
-	/**
-	 * Notifies the web interface that a {@link PostReply} was marked as known.
-	 *
-	 * @param markPostReplyKnownEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
-		PostReply postReply = markPostReplyKnownEvent.postReply();
-		newReplyNotification.remove(postReply);
-		localReplyNotification.remove(postReply);
-		if (postReply.getPost().isPresent() && !localSoneMentionedInNewPostOrReply(postReply.getPost().get())) {
-			mentionNotification.remove(postReply.getPost().get());
-		}
+		removeReply(markPostReplyKnownEvent.postReply());
 	}
 
-	/**
-	 * Notifies the web interface that a {@link Sone} was removed.
-	 *
-	 * @param soneRemovedEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void soneRemoved(SoneRemovedEvent soneRemovedEvent) {
 		newSoneNotification.remove(soneRemovedEvent.sone());
+		for (Post post : soneRemovedEvent.sone().getPosts()) {
+			removePost(post);
+		}
+		for (PostReply postReply : soneRemovedEvent.sone().getReplies()) {
+			removeReply(postReply);
+		}
 	}
 
-	/**
-	 * Notifies the web interface that a {@link Post} was removed.
-	 *
-	 * @param postRemovedEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void postRemoved(PostRemovedEvent postRemovedEvent) {
-		newPostNotification.remove(postRemovedEvent.post());
-		localPostNotification.remove(postRemovedEvent.post());
-		if (!localSoneMentionedInNewPostOrReply(postRemovedEvent.post())) {
-			mentionNotification.remove(postRemovedEvent.post());
+		removePost(postRemovedEvent.post());
+	}
+
+	private void removePost(Post post) {
+		newPostNotification.remove(post);
+		localPostNotification.remove(post);
+		if (!localSoneMentionedInNewPostOrReply(post)) {
+			mentionNotification.remove(post);
 		}
 	}
 
-	/**
-	 * Notifies the web interface that a {@link PostReply} was removed.
-	 *
-	 * @param postReplyRemovedEvent
-	 *            The event
-	 */
 	@Subscribe
 	public void replyRemoved(PostReplyRemovedEvent postReplyRemovedEvent) {
-		PostReply reply = postReplyRemovedEvent.postReply();
+		removeReply(postReplyRemovedEvent.postReply());
+	}
+
+	private void removeReply(PostReply reply) {
 		newReplyNotification.remove(reply);
 		localReplyNotification.remove(reply);
 		if (reply.getPost().isPresent() && !localSoneMentionedInNewPostOrReply(reply.getPost().get())) {