Add possibility to block and unblock Sones.

diff --git a/src/main/java/net/pterodactylus/sone/web/BlockSonePage.java b/src/main/java/net/pterodactylus/sone/web/BlockSonePage.java
new file mode 100644 (file)
index 0000000..afac535
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/web/BlockSonePage.java
@@ -0,0 +1,72 @@
+/*
+ * Sone - BlockSonePage.java - Copyright © 2010 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.web;
+
+import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.template.Template;
+
+/**
+ * This page lets the user block a Sone for propagation.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class BlockSonePage extends SoneTemplatePage {
+
+       /**
+        * Creates a new “block Sone” page.
+        *
+        * @param template
+        *            The template to render
+        * @param webInterface
+        *            The Sone web interface
+        */
+       public BlockSonePage(Template template, WebInterface webInterface) {
+               super("blockSone.html", template, "Page.BlockSone.Title", webInterface);
+       }
+
+       //
+       // TEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void processTemplate(Request request, Template template) throws RedirectException {
+               super.processTemplate(request, template);
+               String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36);
+               if (request.getMethod() == Method.POST) {
+                       getCurrentSone(request.getToadletContext()).addBlockedSoneId(soneId);
+               }
+               throw new RedirectException("viewSone.html?sone=" + soneId);
+       }
+
+       //
+       // SONETEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean requiresLogin() {
+               // TODO Auto-generated method stub
+               return super.requiresLogin();
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java
new file mode 100644 (file)
index 0000000..6cce4d9
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java
@@ -0,0 +1,72 @@
+/*
+ * Sone - BlockSonePage.java - Copyright © 2010 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.web;
+
+import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.template.Template;
+
+/**
+ * This page lets the user unblock a Sone for propagation.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class UnblockSonePage extends SoneTemplatePage {
+
+       /**
+        * Creates a new “unblock Sone” page.
+        *
+        * @param template
+        *            The template to render
+        * @param webInterface
+        *            The Sone web interface
+        */
+       public UnblockSonePage(Template template, WebInterface webInterface) {
+               super("unblockSone.html", template, "Page.UnblockSone.Title", webInterface);
+       }
+
+       //
+       // TEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void processTemplate(Request request, Template template) throws RedirectException {
+               super.processTemplate(request, template);
+               String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36);
+               if (request.getMethod() == Method.POST) {
+                       getCurrentSone(request.getToadletContext()).removeBlockedSoneId(soneId);
+               }
+               throw new RedirectException("viewSone.html?sone=" + soneId);
+       }
+
+       //
+       // SONETEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean requiresLogin() {
+               // TODO Auto-generated method stub
+               return super.requiresLogin();
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index b443ce7..9305215 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -185,6 +185,12 @@ public class WebInterface extends AbstractService {
                Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
                viewSoneTemplate.set("formPassword", formPassword);
 
+               Template blockSoneTemplate = templateFactory.createTemplate(createReader("/templates/blockSone.html"));
+               blockSoneTemplate.set("formPassword", formPassword);
+
+               Template unblockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblockSone.html"));
+               unblockSoneTemplate.set("formPassword", formPassword);
+
                Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
                viewPostTemplate.set("formPassword", formPassword);
 
@@ -211,6 +217,8 @@ public class WebInterface extends AbstractService {
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this)));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new BlockSonePage(blockSoneTemplate, this)));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSonePage(unblockSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this)));

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index adf9c7e..fc9075a 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -105,6 +105,10 @@ Page.ViewSone.FollowSone.Text=Follow this Sone
 Page.ViewSone.Following.Title=This Sone follows
 Page.ViewSone.Following.FollowingNone.Text=Apparently, this Sone does not yet follow any other Sone.
 
+Page.BlockSone.Title=Block Sone - Sone
+
+Page.UnblockSone.Title=Block Sone - Sone
+
 Page.ViewPost.Title=View Post - Sone
 Page.ViewPost.Page.Title=View Post by {sone}
 Page.ViewPost.Button.PostReply=Post Reply!

diff --git a/src/main/resources/templates/blockSone.html b/src/main/resources/templates/blockSone.html
new file mode 100644 (file)
index 0000000..196af72
--- /dev/null
+++ b/src/main/resources/templates/blockSone.html
@@ -0,0 +1,3 @@
+<%include include/head.html>
+
+<%include include/tail.html>

diff --git a/src/main/resources/templates/knownSones.html b/src/main/resources/templates/knownSones.html
index f188f56..aaf452b 100644 (file)
--- a/src/main/resources/templates/knownSones.html
+++ b/src/main/resources/templates/knownSones.html
@@ -4,7 +4,15 @@
 
        <div id="known-sones">
                <%foreach knownSones sone>
-                       <div><a href="viewSone.html?sone=<% sone.id>"><% sone.niceName|html></a> (<% sone.requestUri|html>)</div>
+                       <div>
+                               <div class="profile-link"><a href="viewSone.html?sone=<% sone.id>"><% sone.niceName|html></a></div>
+                               <div>(<% sone.requestUri|html>)</div>
+                               <%if sone.isBlocked>
+                                       <div class="unblock-link"><a href="unblockSone.html?sone=<% sone.id>">unblock</a></div>
+                               <%else>
+                                       <div class="block-link"><a href="blockSone.html?sone=<% sone.id>">block</a></div>
+                               <%/if>
+                       </div>
                <%foreachelse>
                        <div><%= Page.KnownSones.Text.NoKnownSones|l10n|html></div>
                <%/foreach>

diff --git a/src/main/resources/templates/unblockSone.html b/src/main/resources/templates/unblockSone.html
new file mode 100644 (file)
index 0000000..196af72
--- /dev/null
+++ b/src/main/resources/templates/unblockSone.html
@@ -0,0 +1,3 @@
+<%include include/head.html>
+
+<%include include/tail.html>