Don’t check for Sones but for their IDs.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / UnfollowSonePage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
index 60f6355..396e263 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -34,7 +35,7 @@ public class UnfollowSonePage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public UnfollowSonePage(Template template, WebInterface webInterface) {
-               super("unfollowSone.html", template, "Page.UnfollowSone.Title", webInterface);
+               super("unfollowSone.html", template, "Page.UnfollowSone.Title", webInterface, true);
        }
 
        //
@@ -47,25 +48,14 @@ public class UnfollowSonePage extends SoneTemplatePage {
        @Override
        protected void processTemplate(Request request, Template template) throws RedirectException {
                super.processTemplate(request, template);
-               String soneId = request.getHttpRequest().getParam("sone");
-               Sone currentSone = getCurrentSone(request.getToadletContext());
-               Sone sone = webInterface.core().getSone(soneId);
-               if (!sone.equals(currentSone)) {
-                       currentSone.removeFriend(sone);
+               if (request.getMethod() == Method.POST) {
+                       String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
+                       String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
+                       Sone currentSone = getCurrentSone(request.getToadletContext());
+                       currentSone.removeFriend(soneId);
+                       webInterface.getCore().saveSone(currentSone);
+                       throw new RedirectException(returnPage);
                }
-               throw new RedirectException("viewSone.html?sone=" + soneId);
-       }
-
-       //
-       // SONETEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return true;
        }
 
 }