X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetNotificationAjaxPage.java;h=8bfe47273a76a497ebbf484d10736506274b6042;hb=1bc78b582ac59f2438002997f5780db4dcee0a2a;hp=650a9ae442eeba787c748e0d82336dfbd04dad2d;hpb=c5e641893a2656ebf2c2c8c369fe75eaf3061b52;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
index 650a9ae..8bfe472 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
@@ -19,7 +19,6 @@ package net.pterodactylus.sone.web.ajax;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
@@ -79,14 +78,15 @@ public class GetNotificationAjaxPage extends JsonPage {
 	protected JsonObject createJsonObject(Request request) {
 		String[] notificationIds = request.getHttpRequest().getParam("notifications").split(",");
 		JsonObject jsonNotifications = new JsonObject();
-		Sone currentSone = webInterface.getCurrentSone(request.getToadletContext(), false);
+		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
 		for (String notificationId : notificationIds) {
 			Notification notification = webInterface.getNotifications().getNotification(notificationId);
-			ListNotificationFilters.filterNotifications(new ArrayList<Notification>(), currentSone);
 			if ("new-post-notification".equals(notificationId)) {
-				notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone);
+				notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone, false);
 			} else if ("new-reply-notification".equals(notificationId)) {
 				notification = ListNotificationFilters.filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
+			} else if ("mention-notification".equals(notificationId)) {
+				notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone, false);
 			}
 			if (notification == null) {
 				// TODO - show error
@@ -117,6 +117,7 @@ public class GetNotificationAjaxPage extends JsonPage {
 		try {
 			if (notification instanceof TemplateNotification) {
 				TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext().mergeContext(((TemplateNotification) notification).getTemplateContext());
+				templateContext.set("core", webInterface.getCore());
 				templateContext.set("currentSone", webInterface.getCurrentSone(request.getToadletContext(), false));
 				templateContext.set("localSones", webInterface.getCore().getLocalSones());
 				templateContext.set("request", request);