X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=b79dad3850bff9d15ea0c2f83fe0d0fa67f4514c;hb=796d369b021786649dbda6d5b3aed7a5d3b612a8;hp=ca970c2b3dca4b8e1eb5caec56446e1d79011c4a;hpb=2b6349abcc3380869532b4fab01f7cff9d3c2ac3;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index ca970c2..b79dad3 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -21,9 +21,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -47,6 +48,30 @@ import freenet.keys.FreenetURI;
  */
 public class Sone implements Fingerprintable, Comparable<Sone> {
 
+	/**
+	 * The possible values for the “show custom avatars” option.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 */
+	public static enum ShowCustomAvatars {
+
+		/** Never show custom avatars. */
+		NEVER,
+
+		/** Only show custom avatars of followed Sones. */
+		FOLLOWED,
+
+		/** Only show custom avatars of Sones you manually trust. */
+		MANUALLY_TRUSTED,
+
+		/** Only show custom avatars of automatically trusted Sones. */
+		TRUSTED,
+
+		/** Always show custom avatars. */
+		ALWAYS,
+
+	}
+
 	/** comparator that sorts Sones by their nice name. */
 	public static final Comparator<Sone> NICE_NAME_COMPARATOR = new Comparator<Sone>() {
 
@@ -115,6 +140,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,28 +172,28 @@ 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;
 
 	/** All friend Sones. */
-	private final Set<String> friendSones = Collections.synchronizedSet(new HashSet<String>());
+	private final Set<String> friendSones = new CopyOnWriteArraySet<String>();
 
 	/** All posts. */
-	private final Set<Post> posts = Collections.synchronizedSet(new HashSet<Post>());
+	private final Set<Post> posts = new CopyOnWriteArraySet<Post>();
 
 	/** All replies. */
-	private final Set<PostReply> replies = Collections.synchronizedSet(new HashSet<PostReply>());
+	private final Set<PostReply> replies = new CopyOnWriteArraySet<PostReply>();
 
 	/** The IDs of all liked posts. */
-	private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
+	private final Set<String> likedPostIds = new CopyOnWriteArraySet<String>();
 
 	/** The IDs of all liked replies. */
-	private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
+	private final Set<String> likedReplyIds = new CopyOnWriteArraySet<String>();
 
 	/** The albums of this Sone. */
-	private final List<Album> albums = Collections.synchronizedList(new ArrayList<Album>());
+	private final List<Album> albums = new CopyOnWriteArrayList<Album>();
 
 	/** Sone-specific options. */
 	private final Options options = new Options();
@@ -380,19 +414,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