X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=c74f4b96ba3b7788a849dfe7c6b110c54961a44a;hp=f32a47d4abcd912a64d53b0935106481c8235115;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hpb=85aa9c556ef8ac726694f0077a4f8df0bc912e5f diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java index f32a47d..c74f4b9 100644 --- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java +++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java @@ -1,5 +1,5 @@ /* - * Sone - KnownSonesPage.java - Copyright © 2010 David Roden + * Sone - KnownSonesPage.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 @@ -17,20 +17,24 @@ package net.pterodactylus.sone.web; +import static net.pterodactylus.sone.utils.NumberParsers.parseInt; + import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.collection.Pagination; -import net.pterodactylus.util.collection.ReverseComparator; -import net.pterodactylus.util.filter.Filter; -import net.pterodactylus.util.filter.Filters; -import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Collections2; +import com.google.common.collect.Ordering; + /** * This page shows all known Sones. * @@ -38,6 +42,9 @@ import net.pterodactylus.util.template.TemplateContext; */ public class KnownSonesPage extends SoneTemplatePage { + private static final String defaultSortField = "activity"; + private static final String defaultSortOrder = "desc"; + /** * Creates a “known Sones” page. * @@ -58,79 +65,85 @@ public class KnownSonesPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - super.processTemplate(request, templateContext); - String sortField = request.getHttpRequest().getParam("sort"); - String sortOrder = request.getHttpRequest().getParam("order"); + protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { + String sortField = request.getHttpRequest().getParam("sort", defaultSortField); + String sortOrder = request.getHttpRequest().getParam("order", defaultSortOrder); String filter = request.getHttpRequest().getParam("filter"); - templateContext.set("sort", (sortField != null) ? sortField : "name"); - templateContext.set("order", (sortOrder != null) ? sortOrder : "asc"); + templateContext.set("sort", sortField); + templateContext.set("order", sortOrder); templateContext.set("filter", filter); - final Sone currentSone = getCurrentSone(request.getToadletContext(), false); - List knownSones = Filters.filteredList(new ArrayList(webInterface.getCore().getSones()), Sone.EMPTY_SONE_FILTER); + final Sone currentSone = getCurrentSoneWithoutCreatingSession(request.getToadletContext()); + Collection knownSones = Collections2.filter(webInterface.getCore().getSones(), Sone.EMPTY_SONE_FILTER); if ((currentSone != null) && "followed".equals(filter)) { - knownSones = Filters.filteredList(knownSones, new Filter() { + knownSones = Collections2.filter(knownSones, new Predicate() { @Override - public boolean filterObject(Sone sone) { + public boolean apply(Sone sone) { return currentSone.hasFriend(sone.getId()); } }); } else if ((currentSone != null) && "not-followed".equals(filter)) { - knownSones = Filters.filteredList(knownSones, new Filter() { + knownSones = Collections2.filter(knownSones, new Predicate() { @Override - public boolean filterObject(Sone sone) { + public boolean apply(Sone sone) { return !currentSone.hasFriend(sone.getId()); } }); } else if ("new".equals(filter)) { - knownSones = Filters.filteredList(knownSones, new Filter() { + knownSones = Collections2.filter(knownSones, new Predicate() { + /** * {@inheritDoc} */ @Override - public boolean filterObject(Sone sone) { + public boolean apply(Sone sone) { return !sone.isKnown(); } }); } else if ("not-new".equals(filter)) { - knownSones = Filters.filteredList(knownSones, new Filter() { + knownSones = Collections2.filter(knownSones, new Predicate() { + /** * {@inheritDoc} */ @Override - public boolean filterObject(Sone sone) { + public boolean apply(Sone sone) { return sone.isKnown(); } }); + } else if ("own".equals(filter)) { + knownSones = Collections2.filter(knownSones, Sone.LOCAL_SONE_FILTER); + } else if ("not-own".equals(filter)) { + knownSones = Collections2.filter(knownSones, Predicates.not(Sone.LOCAL_SONE_FILTER)); } + List sortedSones = new ArrayList(knownSones); if ("activity".equals(sortField)) { if ("asc".equals(sortOrder)) { - Collections.sort(knownSones, new ReverseComparator(Sone.LAST_ACTIVITY_COMPARATOR)); + Collections.sort(sortedSones, Ordering.from(Sone.LAST_ACTIVITY_COMPARATOR).reverse()); } else { - Collections.sort(knownSones, Sone.LAST_ACTIVITY_COMPARATOR); + Collections.sort(sortedSones, Sone.LAST_ACTIVITY_COMPARATOR); } } else if ("posts".equals(sortField)) { if ("asc".equals(sortOrder)) { - Collections.sort(knownSones, new ReverseComparator(Sone.POST_COUNT_COMPARATOR)); + Collections.sort(sortedSones, Ordering.from(Sone.POST_COUNT_COMPARATOR).reverse()); } else { - Collections.sort(knownSones, Sone.POST_COUNT_COMPARATOR); + Collections.sort(sortedSones, Sone.POST_COUNT_COMPARATOR); } } else if ("images".equals(sortField)) { if ("asc".equals(sortOrder)) { - Collections.sort(knownSones, new ReverseComparator(Sone.IMAGE_COUNT_COMPARATOR)); + Collections.sort(sortedSones, Ordering.from(Sone.IMAGE_COUNT_COMPARATOR).reverse()); } else { - Collections.sort(knownSones, Sone.IMAGE_COUNT_COMPARATOR); + Collections.sort(sortedSones, Sone.IMAGE_COUNT_COMPARATOR); } } else { if ("desc".equals(sortOrder)) { - Collections.sort(knownSones, new ReverseComparator(Sone.NICE_NAME_COMPARATOR)); + Collections.sort(sortedSones, Ordering.from(Sone.NICE_NAME_COMPARATOR).reverse()); } else { - Collections.sort(knownSones, Sone.NICE_NAME_COMPARATOR); + Collections.sort(sortedSones, Sone.NICE_NAME_COMPARATOR); } } - Pagination sonePagination = new Pagination(knownSones, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0)); + Pagination sonePagination = new Pagination(sortedSones, 25).setPage(parseInt(request.getHttpRequest().getParam("page"), 0)); templateContext.set("pagination", sonePagination); templateContext.set("knownSones", sonePagination.getItems()); }