X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=9d7ca826421ee9afcc64090e2d6b1e1a32734b33;hp=be3a660cf1323394b1450911ca27ca63319edb44;hb=63df577f7ced52acfa93e4a7f329292069d8ba9d;hpb=e2e8fe4fd31ebfc73fa9ea2bd77aba71ee2939c7

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index be3a660..9d7ca82 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -84,6 +84,18 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 	};
 
+	/** Comparator that sorts Sones by number of images (descending). */
+	public static final Comparator<Sone> IMAGE_COUNT_COMPARATOR = new Comparator<Sone>() {
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public int compare(Sone leftSone, Sone rightSone) {
+			return rightSone.getAllImages().size() - leftSone.getAllImages().size();
+		}
+	};
+
 	/** Filter to remove Sones that have not been downloaded. */
 	public static final Filter<Sone> EMPTY_SONE_FILTER = new Filter<Sone>() {
 
@@ -103,6 +115,15 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 
 	};
 
+	/** Filter that matches Sones that have at least one album. */
+	public static final Filter<Sone> HAS_ALBUM_FILTER = new Filter<Sone>() {
+
+		@Override
+		public boolean filterObject(Sone sone) {
+			return !sone.getAlbums().isEmpty();
+		}
+	};
+
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Sone.class);
 
@@ -126,7 +147,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	private volatile long time;
 
 	/** The profile of this Sone. */
-	private volatile Profile profile = new Profile();
+	private volatile Profile profile = new Profile(this);
 
 	/** The client used by the Sone. */
 	private volatile Client client;
@@ -138,7 +159,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	private final Set<Post> posts = Collections.synchronizedSet(new HashSet<Post>());
 
 	/** All replies. */
-	private final Set<Reply> replies = Collections.synchronizedSet(new HashSet<Reply>());
+	private final Set<PostReply> replies = Collections.synchronizedSet(new HashSet<PostReply>());
 
 	/** The IDs of all liked posts. */
 	private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
@@ -368,19 +389,6 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	}
 
 	/**
-	 * Sets all friends of this Sone at once.
-	 *
-	 * @param friends
-	 *            The new (and only) friends of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	public Sone setFriends(Collection<String> friends) {
-		friendSones.clear();
-		friendSones.addAll(friends);
-		return this;
-	}
-
-	/**
 	 * Returns whether this Sone has the given Sone as a friend Sone.
 	 *
 	 * @param friendSoneId
@@ -477,7 +485,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 *
 	 * @return All replies this Sone made
 	 */
-	public synchronized Set<Reply> getReplies() {
+	public synchronized Set<PostReply> getReplies() {
 		return Collections.unmodifiableSet(replies);
 	}
 
@@ -488,7 +496,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 *            The new (and only) replies of this Sone
 	 * @return This Sone (for method chaining)
 	 */
-	public synchronized Sone setReplies(Collection<Reply> replies) {
+	public synchronized Sone setReplies(Collection<PostReply> replies) {
 		this.replies.clear();
 		this.replies.addAll(replies);
 		return this;
@@ -501,7 +509,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 * @param reply
 	 *            The reply to add
 	 */
-	public synchronized void addReply(Reply reply) {
+	public synchronized void addReply(PostReply reply) {
 		if (reply.getSone().equals(this)) {
 			replies.add(reply);
 		}
@@ -513,7 +521,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 * @param reply
 	 *            The reply to remove
 	 */
-	public synchronized void removeReply(Reply reply) {
+	public synchronized void removeReply(PostReply reply) {
 		if (reply.getSone().equals(this)) {
 			replies.remove(reply);
 		}
@@ -782,10 +790,10 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 		fingerprint.append(")");
 
-		List<Reply> replies = new ArrayList<Reply>(getReplies());
+		List<PostReply> replies = new ArrayList<PostReply>(getReplies());
 		Collections.sort(replies, Reply.TIME_COMPARATOR);
 		fingerprint.append("Replies(");
-		for (Reply reply : replies) {
+		for (PostReply reply : replies) {
 			fingerprint.append("Reply(").append(reply.getId()).append(')');
 		}
 		fingerprint.append(')');