X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=203a87d828f51cf44271969b827dc5fb068e0021;hb=f9b5addb5d0e7a080e9f314cf6712143f5e26060;hp=8c74865bb386d036658f1dd5bb899784ce81ca3b;hpb=3ccb94d05fd21ab7f388bab9081d97f2157c13c8;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index 8c74865..203a87d 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneTemplatePage.java - Copyright © 2010–2012 David Roden
+ * Sone - SoneTemplatePage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.web;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,21 +28,19 @@ import java.util.Map;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.notify.ListNotificationFilters;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.FreenetTemplatePage;
 import net.pterodactylus.util.notify.Notification;
-import net.pterodactylus.util.object.HashCode;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContext;
 import freenet.support.api.HTTPRequest;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
 /**
  * Base page for the Sone web interface.
  *
@@ -66,21 +65,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 *            The path of the page
 	 * @param template
 	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public SoneTemplatePage(String path, Template template, WebInterface webInterface) {
-		this(path, template, null, webInterface, false);
-	}
-
-	/**
-	 * Creates a new template page for Sone that does not require the user to be
-	 * logged in.
-	 *
-	 * @param path
-	 *            The path of the page
-	 * @param template
-	 *            The template to render
 	 * @param pageTitleKey
 	 *            The l10n key of the page title
 	 * @param webInterface
@@ -259,15 +243,15 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 		templateContext.set("currentSone", currentSone);
 		templateContext.set("localSones", webInterface.getCore().getLocalSones());
 		templateContext.set("request", request);
-		templateContext.set("currentVersion", SonePlugin.VERSION);
+		templateContext.set("currentVersion", SonePlugin.getPluginVersion());
 		templateContext.set("hasLatestVersion", webInterface.getCore().getUpdateChecker().hasLatestVersion());
 		templateContext.set("latestEdition", webInterface.getCore().getUpdateChecker().getLatestEdition());
 		templateContext.set("latestVersion", webInterface.getCore().getUpdateChecker().getLatestVersion());
 		templateContext.set("latestVersionTime", webInterface.getCore().getUpdateChecker().getLatestVersionDate());
-		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
+		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications(currentSone));
 		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
 		templateContext.set("notifications", notifications);
-		templateContext.set("notificationHash", HashCode.hashCode(notifications));
+		templateContext.set("notificationHash", notifications.hashCode());
 	}
 
 	/**