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=ca970c2b3dca4b8e1eb5caec56446e1d79011c4a;hb=8cbc1e2bc1a94d2ceb6a635389ed4791a08a4889;hpb=2b6349abcc3380869532b4fab01f7cff9d3c2ac3

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index ca970c2..e36a306 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -115,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);
 
@@ -164,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.
 	 *
@@ -380,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
@@ -768,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
@@ -824,6 +851,8 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 		fingerprint.append(')');
 
+		fingerprint.append("Avatar(").append(avatar).append(')');
+
 		return fingerprint.toString();
 	}