X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDismissNotificationAjaxPage.java;h=4661851160e16f4d501257e1e3c6d9bf112eca38;hp=a098e467106a40a71577350685c269984741603d;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=b7dd0087ea05cf16a769136fa57ce60f8a3c1ff3

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
index a098e46..4661851 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DismissNotificationAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - DismissNotificationAjaxPage.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
@@ -18,9 +18,11 @@
 package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.notify.Notification;
 
+import com.google.common.base.Optional;
+
 /**
  * AJAX page that lets the user dismiss a notification.
  *
@@ -35,24 +37,32 @@ public class DismissNotificationAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public DismissNotificationAjaxPage(WebInterface webInterface) {
-		super("ajax/dismissNotification.ajax", webInterface);
+		super("dismissNotification.ajax", webInterface);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String notificationId = request.getHttpRequest().getParam("notification");
-		Notification notification = webInterface.getCore().getNotifications().getNotification(notificationId);
-		if (notification == null) {
+		Optional<Notification> notification = webInterface.getNotification(notificationId);
+		if (!notification.isPresent()) {
 			return createErrorJsonObject("invalid-notification-id");
 		}
-		if (!notification.isDismissable()) {
+		if (!notification.get().isDismissable()) {
 			return createErrorJsonObject("not-dismissable");
 		}
-		webInterface.getCore().getNotifications().removeNotification(notification);
+		notification.get().dismiss();
 		return createSuccessJsonObject();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean requiresLogin() {
+		return false;
+	}
+
 }