/** The Sone downloader. */
private SoneDownloader soneDownloader;
- /** The Sone blacklist. */
- private final Set<Sone> blacklistedSones = Collections.synchronizedSet(new HashSet<Sone>());
-
/** The local Sones. */
private final Set<Sone> localSones = Collections.synchronizedSet(new HashSet<Sone>());
* @return The local Sones
*/
public Set<Sone> getSones() {
- return Filters.filteredSet(localSones, new Filter<Sone>() {
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("synthetic-access")
- public boolean filterObject(Sone sone) {
- return !blacklistedSones.contains(sone);
- }
- });
+ return Collections.unmodifiableSet(localSones);
}
/**
* @return All known sones
*/
public Collection<Sone> getKnownSones() {
- return Filters.filteredCollection(soneCache.values(), new Filter<Sone>() {
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("synthetic-access")
- public boolean filterObject(Sone sone) {
- return !blacklistedSones.contains(sone);
- }
- });
+ return Collections.unmodifiableCollection(soneCache.values());
}
/**
* @return All remote Sones
*/
public Collection<Sone> getRemoteSones() {
- return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
-
- @Override
- @SuppressWarnings("synthetic-access")
- public boolean filterObject(Sone sone) {
- return !blacklistedSones.contains(sone) && !localSones.contains(sone);
- }
- });
- }
-
- /**
- * Returns all blacklisted Sones.
- *
- * @return All blacklisted Sones
- */
- public Collection<Sone> getBlacklistedSones() {
- return Collections.unmodifiableCollection(blacklistedSones);
- }
-
- /**
- * Checks whether the given Sone is blacklisted.
- *
- * @param sone
- * The Sone to check
- * @return {@code true} if this Sone is blacklisted, {@code false} otherwise
- */
- public boolean isBlacklistedSone(Sone sone) {
- return blacklistedSones.contains(sone);
+ return Collections.unmodifiableCollection(getKnownSones());
}
/**
}
/**
- * Blackslists the given Sone.
- *
- * @param sone
- * The Sone to blacklist
- */
- public void blacklistSone(Sone sone) {
- if (blacklistedSones.add(sone)) {
- soneDownloader.removeSone(sone);
- if (localSones.remove(sone)) {
- SoneInserter soneInserter = soneInserters.remove(sone);
- soneInserter.stop();
- }
- }
- }
-
- /**
- * Unblacklists the given Sone.
- *
- * @param sone
- * The Sone to unblacklist
- */
- public void unblacklistSone(Sone sone) {
- if (blacklistedSones.remove(sone)) {
- if (sone.getInsertUri() != null) {
- addLocalSone(sone);
- } else {
- addSone(sone);
- }
- }
- }
-
- /**
* Creates a new Sone at a random location.
*
* @param name
sone.addFriend(friendSone);
}
- /* load blocked Sone IDs. */
- int blockedSoneCounter = 0;
- while (true) {
- String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++;
- String blockedSoneId = configuration.getStringValue(blockedSonePrefix + "/ID").getValue(null);
- if (blockedSoneId == null) {
- break;
- }
- sone.addBlockedSoneId(blockedSoneId);
- }
-
/* load liked post IDs. */
int likedPostIdCounter = 0;
while (true) {
} while (true);
logger.log(Level.INFO, "Loaded %d Sones.", getSones().size());
- /* load all known Sones. */
- int knownSonesCounter = 0;
- while (true) {
- String knownSonePrefix = "KnownSone." + knownSonesCounter++;
- String knownSoneId = configuration.getStringValue(knownSonePrefix + "/ID").getValue(null);
- if (knownSoneId == null) {
- break;
- }
- String knownSoneName = configuration.getStringValue(knownSonePrefix + "/Name").getValue(null);
- String knownSoneKey = configuration.getStringValue(knownSonePrefix + "/Key").getValue(null);
- try {
- getSone(knownSoneId).setName(knownSoneName).setRequestUri(new FreenetURI(knownSoneKey));
- } catch (MalformedURLException mue1) {
- logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + knownSoneKey + "”)!", mue1);
- }
- }
-
- /* load all blacklisted Sones. */
- int blacklistedSonesCounter = 0;
- while (true) {
- String blacklistedSonePrefix = "BlacklistedSone." + blacklistedSonesCounter++;
- String blacklistedSoneId = configuration.getStringValue(blacklistedSonePrefix + "/ID").getValue(null);
- if (blacklistedSoneId == null) {
- break;
- }
- String blacklistedSoneName = configuration.getStringValue(blacklistedSonePrefix + "/Name").getValue(null);
- String blacklistedSoneKey = configuration.getStringValue(blacklistedSonePrefix + "/Key").getValue(null);
- String blacklistedSoneInsertKey = configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").getValue(null);
- try {
- blacklistSone(getSone(blacklistedSoneId).setName(blacklistedSoneName).setRequestUri(new FreenetURI(blacklistedSoneKey)).setInsertUri((blacklistedSoneInsertKey != null) ? new FreenetURI(blacklistedSoneInsertKey) : null));
- } catch (MalformedURLException mue1) {
- logger.log(Level.WARNING, "Could not create blacklisted Sone from requestUri (“" + blacklistedSoneKey + "”)!", mue1);
- }
- }
-
/* load all remote Sones. */
for (Sone remoteSone : getRemoteSones()) {
loadSone(remoteSone);
/* write null ID as terminator. */
configuration.getStringValue(sonePrefix + "/Friend." + friendId + "/ID").setValue(null);
- /* write all blocked Sones. */
- int blockedSoneCounter = 0;
- for (String blockedSoneId : sone.getBlockedSoneIds()) {
- String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++;
- configuration.getStringValue(blockedSonePrefix + "/ID").setValue(blockedSoneId);
- }
- configuration.getStringValue(sonePrefix + "/BlockedSone." + blockedSoneCounter + "/ID").setValue(null);
-
/* write all liked posts. */
int likedPostIdCounter = 0;
for (String soneLikedPostId : sone.getLikedPostIds()) {
/* write null ID as terminator. */
configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null);
- /* write all known Sones. */
- int knownSonesCounter = 0;
- for (Sone knownSone : getRemoteSones()) {
- String knownSonePrefix = "KnownSone." + knownSonesCounter++;
- configuration.getStringValue(knownSonePrefix + "/ID").setValue(knownSone.getId());
- configuration.getStringValue(knownSonePrefix + "/Name").setValue(knownSone.getName());
- configuration.getStringValue(knownSonePrefix + "/Key").setValue(knownSone.getRequestUri().toString());
- /* TODO - store all known stuff? */
- }
- configuration.getStringValue("KnownSone." + knownSonesCounter + "/ID").setValue(null);
-
- /* write all blacklisted Sones. */
- int blacklistedSonesCounter = 0;
- for (Sone blacklistedSone : getBlacklistedSones()) {
- String blacklistedSonePrefix = "BlacklistedSone." + blacklistedSonesCounter++;
- configuration.getStringValue(blacklistedSonePrefix + "/ID").setValue(blacklistedSone.getId());
- configuration.getStringValue(blacklistedSonePrefix + "/Name").setValue(blacklistedSone.getName());
- configuration.getStringValue(blacklistedSonePrefix + "/Key").setValue(blacklistedSone.getRequestUri().toString());
- configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").setValue((blacklistedSone.getInsertUri() != null) ? blacklistedSone.getInsertUri().toString() : null);
- /* TODO - store all known stuff? */
- }
- configuration.getStringValue("BlacklistedSone." + blacklistedSonesCounter + "/ID").setValue(null);
-
} catch (ConfigurationException ce1) {
logger.log(Level.WARNING, "Could not store configuration!", ce1);
}
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
soneProperties.put("profile", sone.getProfile());
soneProperties.put("posts", new ArrayList<Post>(sone.getPosts()));
soneProperties.put("replies", new HashSet<Reply>(sone.getReplies()));
- soneProperties.put("blockedSoneIds", new HashSet<String>(sone.getBlockedSoneIds()));
soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
soneProperties.put("likeReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
}
} finally {
Closer.close(templateInputStreamReader);
}
- @SuppressWarnings("unchecked")
- final Set<String> blockedSoneIds = (Set<String>) soneProperties.get("blockedSoneIds");
Collection<Sone> knownSones = Filters.filteredCollection(core.getKnownSones(), new Filter<Sone>() {
/**
*/
@Override
public boolean filterObject(Sone object) {
- return !blockedSoneIds.contains(object.getId()) && !object.getId().equals(soneProperties.get("id"));
+ return !object.getId().equals(soneProperties.get("id"));
}
});
/** All replies. */
private final Set<Reply> replies = Collections.synchronizedSet(new HashSet<Reply>());
- /** The IDs of all blocked Sones. */
- private final Set<String> blockedSoneIds = Collections.synchronizedSet(new HashSet<String>());
-
/** The IDs of all liked posts. */
private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
}
/**
- * Returns the IDs of all blocked Sones. These Sones will not propagated
- * using the “known Sones” mechanism.
- *
- * @return The IDs of all blocked Sones
- */
- public Set<String> getBlockedSoneIds() {
- return Collections.unmodifiableSet(blockedSoneIds);
- }
-
- /**
- * Returns whether the given Sone ID is blocked.
- *
- * @param soneId
- * The Sone ID to check
- * @return {@code true} if the given Sone ID is blocked, {@code false}
- * otherwise
- */
- public boolean isSoneBlocked(String soneId) {
- return blockedSoneIds.contains(soneId);
- }
-
- /**
- * Adds the given ID to the list of blocked IDs.
- *
- * @param soneId
- * The Sone ID to block
- */
- public synchronized void addBlockedSoneId(String soneId) {
- if (blockedSoneIds.add(soneId)) {
- modificationCounter++;
- }
- }
-
- /**
- * Removes the given ID from the list of blocked IDs.
- *
- * @param soneId
- * The Sone ID to unblock
- */
- public synchronized void removeBlockedSoneId(String soneId) {
- if (blockedSoneIds.remove(soneId)) {
- modificationCounter++;
- }
- }
-
- /**
* Returns the IDs of all liked posts.
*
* @return All liked posts’ IDs
} else if (member.equals("current")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
return (currentSone != null) && currentSone.equals(sone);
- } else if (member.equals("blocked")) {
- Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return (currentSone != null) && currentSone.isSoneBlocked(sone.getId());
- } else if (member.equals("blacklisted")) {
- return core.isBlacklistedSone(sone);
} else if (member.equals("modified")) {
return sone.getModificationCounter() > 0;
} else if (member.equals("status")) {
+++ /dev/null
-/*
- * Sone - BlacklistPage.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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.template.SoneAccessor;
-import net.pterodactylus.util.template.Template;
-
-/**
- * This page lets the user manage Sone’s global blacklist.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BlacklistPage extends SoneTemplatePage {
-
- /**
- * Creates a new blacklist management page.
- *
- * @param template
- * The template to render
- * @param webInterface
- * The Sone web interface
- */
- public BlacklistPage(Template template, WebInterface webInterface) {
- super("blacklist.html", template, "Page.Blacklist.Title", webInterface, false);
- }
-
- //
- // TEMPLATEPAGE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processTemplate(Request request, Template template) throws RedirectException {
- super.processTemplate(request, template);
- List<Sone> blacklistedSones = new ArrayList<Sone>(webInterface.core().getBlacklistedSones());
- Collections.sort(blacklistedSones, new Comparator<Sone>() {
-
- @Override
- public int compare(Sone leftSone, Sone rightSone) {
- return SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
- }
-
- });
- template.set("blacklistedSones", blacklistedSones);
- }
-
-}
+++ /dev/null
-/*
- * Sone - BlacklistSonePage.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.data.Sone;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
-import net.pterodactylus.util.template.Template;
-
-/**
- * This page lets the user blacklist a {@link Sone}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BlacklistSonePage extends SoneTemplatePage {
-
- /**
- * Creates a new “blacklist Sone” page.
- *
- * @param template
- * The template to render
- * @param webInterface
- * The Sone web interface
- */
- public BlacklistSonePage(Template template, WebInterface webInterface) {
- super("blacklistSone.html", template, "Page.BlacklistSone.Title", webInterface, false);
- }
-
- //
- // TEMPLATEPAGE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processTemplate(Request request, Template template) throws RedirectException {
- super.processTemplate(request, template);
- if (request.getMethod() == Method.POST) {
- String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36);
- String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
- Sone sone = webInterface.core().getSone(soneId);
- webInterface.core().blacklistSone(sone);
- throw new RedirectException(returnPage);
- }
- }
-
-}
+++ /dev/null
-/*
- * 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, true);
- }
-
- //
- // TEMPLATEPAGE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processTemplate(Request request, Template template) throws RedirectException {
- super.processTemplate(request, template);
- if (request.getMethod() == Method.POST) {
- String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36);
- String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
- getCurrentSone(request.getToadletContext()).addBlockedSoneId(soneId);
- throw new RedirectException(returnPage);
- }
- }
-
-}
+++ /dev/null
-/*
- * Sone - UnblacklistSonePage.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.data.Sone;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
-import net.pterodactylus.util.template.Template;
-
-/**
- * This page lets the user unblacklist a {@link Sone}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class UnblacklistSonePage extends SoneTemplatePage {
-
- /**
- * Creates a new “unblacklist Sone” page.
- *
- * @param template
- * The template to render
- * @param webInterface
- * The Sone web interface
- */
- public UnblacklistSonePage(Template template, WebInterface webInterface) {
- super("unblacklistSone.html", template, "Page.UnblacklistSone.Title", webInterface, false);
- }
-
- //
- // TEMPLATEPAGE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processTemplate(Request request, Template template) throws RedirectException {
- super.processTemplate(request, template);
- if (request.getMethod() == Method.POST) {
- String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36);
- String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
- Sone sone = webInterface.core().getSone(soneId);
- webInterface.core().unblacklistSone(sone);
- throw new RedirectException(returnPage);
- }
- }
-
-}
+++ /dev/null
-/*
- * 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, true);
- }
-
- //
- // TEMPLATEPAGE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processTemplate(Request request, Template template) throws RedirectException {
- super.processTemplate(request, template);
- if (request.getMethod() == Method.POST) {
- String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36);
- String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
- if (request.getMethod() == Method.POST) {
- getCurrentSone(request.getToadletContext()).removeBlockedSoneId(soneId);
- }
- throw new RedirectException(returnPage);
- }
- }
-
-}
import net.pterodactylus.sone.template.RequestChangeFilter;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.template.SubstringFilter;
-import net.pterodactylus.sone.web.ajax.BlacklistSoneAjaxPage;
-import net.pterodactylus.sone.web.ajax.BlockSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.DeletePostAjaxPage;
import net.pterodactylus.sone.web.ajax.DeleteReplyAjaxPage;
import net.pterodactylus.sone.web.ajax.FollowSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.GetSoneStatusPage;
import net.pterodactylus.sone.web.ajax.GetTranslationPage;
import net.pterodactylus.sone.web.ajax.LikeAjaxPage;
-import net.pterodactylus.sone.web.ajax.UnblacklistSoneAjaxPage;
-import net.pterodactylus.sone.web.ajax.UnblockSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.UnfollowSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.UnlikeAjaxPage;
import net.pterodactylus.sone.web.page.PageToadlet;
Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml"));
Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
- Template blockSoneTemplate = templateFactory.createTemplate(createReader("/templates/blockSone.html"));
- Template unblockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblockSone.html"));
Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html"));
Template unlikePostTemplate = templateFactory.createTemplate(createReader("/templates/unlike.html"));
Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html"));
Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html"));
- Template blacklistTemplate = templateFactory.createTemplate(createReader("/templates/blacklist.html"));
- Template blacklistSoneTemplate = templateFactory.createTemplate(createReader("/templates/blacklistSone.html"));
- Template unblacklistSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblacklistSone.html"));
Template aboutTemplate = templateFactory.createTemplate(createReader("/templates/about.html"));
Template helpTemplate = templateFactory.createTemplate(createReader("/templates/help.html"));
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 LikePage(likePostTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikePage(unlikePostTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistPage(blacklistTemplate, this), "Blacklist"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistSonePage(blacklistSoneTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblacklistSonePage(unblacklistSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("help.html", helpTemplate, "Page.Help.Title", this), "Help"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSoneAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlockSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblacklistSoneAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LikeAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikeAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new GetLikesAjaxPage(this)));
+++ /dev/null
-/*
- * Sone - BlacklistSoneAjaxPage.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.ajax;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
-
-/**
- * AJAX page that blacklists a Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BlacklistSoneAjaxPage extends JsonPage {
-
- /**
- * Creates a new “blacklist Sone” AJAX page.
- *
- * @param webInterface
- * The Sone web interface
- */
- public BlacklistSoneAjaxPage(WebInterface webInterface) {
- super("ajax/blacklistSone.ajax", webInterface);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected JsonObject createJsonObject(Request request) {
- String soneId = request.getHttpRequest().getParam("sone");
- if (soneId == null) {
- return new JsonObject().put("success", false).put("error", "invalid-sone-id");
- }
- Sone sone = webInterface.core().getSone(soneId);
- webInterface.core().blacklistSone(sone);
- return new JsonObject().put("success", true);
- }
-
-}
+++ /dev/null
-/*
- * Sone - BlockSoneAjaxPage.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.ajax;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
-
-/**
- * AJAX page that lets the user block another Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BlockSoneAjaxPage extends JsonPage {
-
- /**
- * Creates a new “block Sone” AJAX page.
- *
- * @param webInterface
- * The Sone web interface
- */
- public BlockSoneAjaxPage(WebInterface webInterface) {
- super("ajax/blockSone.ajax", webInterface);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected JsonObject createJsonObject(Request request) {
- String soneId = request.getHttpRequest().getParam("sone");
- if (soneId == null) {
- return new JsonObject().put("success", false).put("error", "invalid-sone-id");
- }
- Sone currentSone = getCurrentSone(request.getToadletContext());
- if (currentSone == null) {
- return new JsonObject().put("success", false).put("error", "auth-required");
- }
- currentSone.addBlockedSoneId(soneId);
- return new JsonObject().put("success", true);
- }
-
-}
+++ /dev/null
-/*
- * Sone - UnblacklistSoneAjaxPage.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.ajax;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
-
-/**
- * AJAX page that unblacklists a Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class UnblacklistSoneAjaxPage extends JsonPage {
-
- /**
- * Creates a new “unblacklist Sone” AJAX page.
- *
- * @param webInterface
- * The Sone web interface
- */
- public UnblacklistSoneAjaxPage(WebInterface webInterface) {
- super("ajax/unblacklistSone.ajax", webInterface);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected JsonObject createJsonObject(Request request) {
- String soneId = request.getHttpRequest().getParam("sone");
- if (soneId == null) {
- return new JsonObject().put("success", false).put("error", "invalid-sone-id");
- }
- Sone sone = webInterface.core().getSone(soneId);
- webInterface.core().unblacklistSone(sone);
- return new JsonObject().put("success", true);
- }
-
-}
+++ /dev/null
-/*
- * Sone - UnblockSoneAjaxPage.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.ajax;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
-
-/**
- * AJAX page that lets the user unblock another Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class UnblockSoneAjaxPage extends JsonPage {
-
- /**
- * Creates a new “unblock Sone” AJAX page.
- *
- * @param webInterface
- * The Sone web interface
- */
- public UnblockSoneAjaxPage(WebInterface webInterface) {
- super("ajax/unblockSone.ajax", webInterface);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected JsonObject createJsonObject(Request request) {
- String soneId = request.getHttpRequest().getParam("sone");
- if (soneId == null) {
- return new JsonObject().put("success", false).put("error", "invalid-sone-id");
- }
- Sone currentSone = getCurrentSone(request.getToadletContext());
- if (currentSone == null) {
- return new JsonObject().put("success", false).put("error", "auth-required");
- }
- currentSone.removeBlockedSoneId(soneId);
- return new JsonObject().put("success", true);
- }
-
-}
Navigation.Menu.Item.Logout.Tooltip=Logs you out of the current Sone
Navigation.Menu.Item.Options.Name=Options
Navigation.Menu.Item.Options.Tooltip=Options for the Sone plugin
-Navigation.Menu.Item.Blacklist.Name=Blacklist
-Navigation.Menu.Item.Blacklist.Tooltip=Manages the global blacklist
Navigation.Menu.Item.About.Name=About
Navigation.Menu.Item.About.Tooltip=Information about Sone
Navigation.Menu.Item.Help.Name=Help
Page.Options.Option.ReallyClearOnNextRestart.Description=This option needs to be set to “yes” if you really, {strong}really{/strong} want to clear the plugin configuration on the next restart.
Page.Options.Button.Save=Save
-Page.Blacklist.Title=Blacklist - Sone
-Page.Blacklist.Page.Title=Blacklist
-Page.Blacklist.Text.Description=The Sone on the blacklist are prevented from being distributed with your next Sone updates, and there will be no updates fetched for these Sones.
-Page.Blacklist.Text.Empty=There are currently no Sones in the blacklist.
-
-Page.BlacklistSone.Title=Blacklist Sone - Sone
-
-Page.UnblacklistSone.Title=Unblacklist Sone - Sone
-
Page.Login.Title=Login - Sone
Page.Login.Page.Title=Login
Page.Login.Label.SelectSone=Select 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!
View.Sone.Label.LastUpdate=Last update:
View.Sone.Button.UnfollowSone=unfollow
View.Sone.Button.FollowSone=follow
-View.Sone.Button.UnblockSone=unblock
-View.Sone.Button.BlockSone=block
-View.Sone.Button.BlacklistSone=blacklist
-View.Sone.Button.UnblacklistSone=unblacklist
View.Sone.Status.Modified=This Sone was modified and waits to be inserted.
View.Sone.Status.Unknown=This Sone has not yet been retrieved.
View.Sone.Status.Idle=This Sone is idle, i.e. not being inserted or downloaded.
+++ /dev/null
-<%include include/head.html>
-
- <h1><%= Page.Blacklist.Page.Title|l10n|html></h1>
-
- <p><%= Page.Blacklist.Text.Description|l10n|html></p>
-
- <div id="blacklist">
- <%getpage>
- <%paginate list=blacklistedSones pagesize=25>
- <%= page|store key=pageParameter>
- <%include include/pagination.html>
- <%foreach pagination.items sone>
- <%include include/viewSone.html>
- <%foreachelse>
- <p><%= Page.Blacklist.Text.Empty|l10n|html></p>
- <%/foreach>
- <%include include/pagination.html>
- </div>
-
-<%include include/tail.html>
+++ /dev/null
-<%include include/head.html>
-
-<%include include/tail.html>
+++ /dev/null
-<%include include/head.html>
-
-<%include include/tail.html>
<div class="short-request-uri"><% sone.requestUri|substring start=4 length=43|html></div>
<div class="hidden"><% sone.blacklisted></div>
<%if ! sone.current>
- <%if ! sone.blacklisted>
- <form class="blacklist" action="blacklistSone.html" method="post">
+ <%ifnull ! currentSone>
+ <form class="unfollow<%if ! sone.friend> hidden<%/if>" action="unfollowSone.html" method="post">
<input type="hidden" name="formPassword" value="<% formPassword|html>" />
<input type="hidden" name="sone" value="<% sone.id|html>" />
<input type="hidden" name="returnPage" value="<% request.uri|html>" />
- <button type="submit"><%= View.Sone.Button.BlacklistSone|l10n|html></button>
+ <button type="submit"><%= View.Sone.Button.UnfollowSone|l10n|html></button>
</form>
- <%ifnull ! currentSone>
- <form class="unfollow<%if ! sone.friend> hidden<%/if>" action="unfollowSone.html" method="post">
- <input type="hidden" name="formPassword" value="<% formPassword|html>" />
- <input type="hidden" name="sone" value="<% sone.id|html>" />
- <input type="hidden" name="returnPage" value="<% request.uri|html>" />
- <button type="submit"><%= View.Sone.Button.UnfollowSone|l10n|html></button>
- </form>
- <form class="follow<%if sone.friend> hidden<%/if>" action="followSone.html" method="post">
- <input type="hidden" name="formPassword" value="<% formPassword|html>" />
- <input type="hidden" name="sone" value="<% sone.id|html>" />
- <input type="hidden" name="returnPage" value="<% request.uri|html>" />
- <button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
- </form>
- <form class="unblock<%if ! sone.blocked> hidden<%/if>" action="unblockSone.html" method="post">
- <input type="hidden" name="formPassword" value="<% formPassword|html>" />
- <input type="hidden" name="sone" value="<% sone.id|html>" />
- <input type="hidden" name="returnPage" value="<% request.uri|html>" />
- <button type="submit"><%= View.Sone.Button.UnblockSone|l10n|html></button>
- </form>
- <form class="block<%if sone.blocked> hidden<%/if>" action="blockSone.html" method="post">
- <input type="hidden" name="formPassword" value="<% formPassword|html>" />
- <input type="hidden" name="sone" value="<% sone.id|html>" />
- <input type="hidden" name="returnPage" value="<% request.uri|html>" />
- <button type="submit"><%= View.Sone.Button.BlockSone|l10n|html></button>
- </form>
- <%/if>
- <%else>
- <form class="unblacklist" action="unblacklistSone.html" method="post">
+ <form class="follow<%if sone.friend> hidden<%/if>" action="followSone.html" method="post">
<input type="hidden" name="formPassword" value="<% formPassword|html>" />
<input type="hidden" name="sone" value="<% sone.id|html>" />
<input type="hidden" name="returnPage" value="<% request.uri|html>" />
- <button type="submit"><%= View.Sone.Button.UnblacklistSone|l10n|html></button>
+ <button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
</form>
<%/if>
<%/if>
<%/foreach>
</reply-likes>
- <known-sones>
- <%foreach knownSones sone>
- <known-sone>
- <sone-id><% sone.id|xml></sone-id>
- <sone-key><% sone.requestUri|xml></sone-key>
- <sone-name><% sone.name|xml></sone-name>
- </known-sone>
- <%/foreach>
- </known-sones>
-
</sone>
+++ /dev/null
-<%include include/head.html>
-
-<%include include/tail.html>
+++ /dev/null
-<%include include/head.html>
-
-<%include include/tail.html>
projects / Sone.git / commitdiff