X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FNotificationManagerAccessor.java;h=c4468ea6a04e614465648a5f520b6028cdc3aaa5;hb=b03677923ba4734e7596af7f1eb605b31d874e6a;hp=1c27b29285b9c44338e0cfde4d501ec759daa53a;hpb=04f0ab3da4f5416975aaf468939f4b731cc6db5b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/NotificationManagerAccessor.java b/src/main/java/net/pterodactylus/sone/template/NotificationManagerAccessor.java
index 1c27b29..c4468ea 100644
--- a/src/main/java/net/pterodactylus/sone/template/NotificationManagerAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/NotificationManagerAccessor.java
@@ -21,10 +21,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * Adds additional properties to a {@link NotificationManager}.
@@ -44,18 +46,14 @@ public class NotificationManagerAccessor extends ReflectionAccessor {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
+	public Object get(TemplateContext templateContext, Object object, String member) {
 		NotificationManager notificationManager = (NotificationManager) object;
 		if ("all".equals(member)) {
-			List<Notification> notifications = new ArrayList<Notification>(notificationManager.getNotifications());
+			List<Notification> notifications = ListNotificationFilters.filterNotifications(new ArrayList<Notification>(notificationManager.getNotifications()), (Sone) templateContext.get("currentSone"));
 			Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
 			return notifications;
-		} else if ("new".equals(member)) {
-			List<Notification> notifications = new ArrayList<Notification>(notificationManager.getChangedNotifications());
-			Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
-			return notifications;
 		}
-		return super.get(dataProvider, object, member);
+		return super.get(templateContext, object, member);
 	}
 
 }