X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=e36a3063f2d1ba37e7bea1e24f3edfe903079a28;hp=aad50e55032f5b21bdaffcbbf47f06b39da6c202;hb=8cbc1e2bc1a94d2ceb6a635389ed4791a08a4889;hpb=bde1cf20c781b7c33934e58cb0beafd1cea5e43b

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index aad50e5..e36a306 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);
 
@@ -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>());
@@ -152,6 +173,9 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	/** Sone-specific options. */
 	private final Options options = new Options();
 
+	/** The avatar of this Sone. */
+	private volatile String avatar;
+
 	/**
 	 * Creates a new Sone.
 	 *
@@ -368,19 +392,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 +488,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 +499,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 +512,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 +524,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);
 		}
@@ -666,6 +677,20 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	}
 
 	/**
+	 * Returns all images of a Sone. Images of a album are inserted into this
+	 * list before images of all child albums.
+	 *
+	 * @return The list of all images
+	 */
+	public List<Image> getAllImages() {
+		List<Image> allImages = new ArrayList<Image>();
+		for (Album album : getAllAlbums()) {
+			allImages.addAll(album.getImages());
+		}
+		return allImages;
+	}
+
+	/**
 	 * Adds an album to this Sone.
 	 *
 	 * @param album
@@ -742,6 +767,34 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	}
 
 	/**
+	 * Returns the ID of the currently selected avatar image.
+	 *
+	 * @return The ID of the currently selected avatar image, or {@code null} if
+	 *         no avatar is selected.
+	 */
+	public String getAvatar() {
+		return avatar;
+	}
+
+	/**
+	 * Sets the avatar image.
+	 *
+	 * @param avatar
+	 *            The new avatar image, or {@code null} to not select an avatar
+	 *            image.
+	 * @return This Sone
+	 */
+	public Sone setAvatar(Image avatar) {
+		if (avatar == null) {
+			this.avatar = null;
+			return this;
+		}
+		Validation.begin().isEqual("Image Owner", avatar.getSone(), this).check();
+		this.avatar = avatar.getId();
+		return this;
+	}
+
+	/**
 	 * Returns Sone-specific options.
 	 *
 	 * @return The options of this Sone
@@ -768,10 +821,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(')');
@@ -798,6 +851,8 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 		fingerprint.append(')');
 
+		fingerprint.append("Avatar(").append(avatar).append(')');
+
 		return fingerprint.toString();
 	}