X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=6ed56674d2c8cccab1638fd2a0a5be81e5dc4949;hb=00d11d64ca4247b81f54a806c14e7b9cfb961cf5;hp=0e27265a76899c2a7fa4e6428c4e7236876fcd58;hpb=0ce0d62894739d3769490d9fde6fa98561b3dfae;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java index 0e27265..6ed5667 100644 --- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java +++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java @@ -62,13 +62,13 @@ public class KnownSonesPage extends SoneTemplatePage { super.processTemplate(request, templateContext); String sortField = request.getHttpRequest().getParam("sort"); String sortOrder = request.getHttpRequest().getParam("order"); - String followedSones = request.getHttpRequest().getParam("followedSones"); + String filter = request.getHttpRequest().getParam("filter"); templateContext.set("sort", (sortField != null) ? sortField : "name"); templateContext.set("order", (sortOrder != null) ? sortOrder : "asc"); - templateContext.set("followedSones", followedSones); + templateContext.set("filter", filter); final Sone currentSone = getCurrentSone(request.getToadletContext(), false); List knownSones = Filters.filteredList(new ArrayList(webInterface.getCore().getSones()), Sone.EMPTY_SONE_FILTER); - if ((currentSone != null) && "show-only".equals(followedSones)) { + if ((currentSone != null) && "followed".equals(filter)) { knownSones = Filters.filteredList(knownSones, new Filter() { @Override @@ -76,7 +76,7 @@ public class KnownSonesPage extends SoneTemplatePage { return currentSone.hasFriend(sone.getId()); } }); - } else if ((currentSone != null) && "hide".equals(followedSones)) { + } else if ((currentSone != null) && "not-followed".equals(filter)) { knownSones = Filters.filteredList(knownSones, new Filter() { @Override @@ -84,6 +84,26 @@ public class KnownSonesPage extends SoneTemplatePage { return !currentSone.hasFriend(sone.getId()); } }); + } else if ("new".equals(filter)) { + knownSones = Filters.filteredList(knownSones, new Filter() { + /** + * {@inheritDoc} + */ + @Override + public boolean filterObject(Sone sone) { + return webInterface.getCore().isNewSone(sone.getId()); + } + }); + } else if ("not-new".equals(filter)) { + knownSones = Filters.filteredList(knownSones, new Filter() { + /** + * {@inheritDoc} + */ + @Override + public boolean filterObject(Sone sone) { + return !webInterface.getCore().isNewSone(sone.getId()); + } + }); } if ("activity".equals(sortField)) { if ("asc".equals(sortOrder)) {