X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=bd2416608dc8199450c500a1ac50b067785a0391;hb=a4cd99055d3814bc087efb8fa77ae861dff4e0fd;hp=9219e990ac76390a088ca299b35d9de3c234f05c;hpb=94041feaf2a141b8c75725301f06d7e4bc617a12;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 9219e99..bd24166 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -28,6 +28,7 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
 
@@ -57,6 +58,9 @@ public class Sone {
 	/* This will be null for remote Sones! */
 	private FreenetURI insertUri;
 
+	/** The time of the last inserted update. */
+	private long time;
+
 	/** The profile of this Sone. */
 	private Profile profile;
 
@@ -64,11 +68,14 @@ public class Sone {
 	private final Set<Sone> friendSones = new HashSet<Sone>();
 
 	/** All posts. */
-	private final List<Post> posts = new ArrayList<Post>();
+	private final Set<Post> posts = new HashSet<Post>();
 
 	/** All replies. */
 	private final Set<Reply> replies = new HashSet<Reply>();
 
+	/** The IDs of all blocked Sones. */
+	private final Set<String> blockedSoneIds = new HashSet<String>();
+
 	/** Modification count. */
 	private volatile long modificationCounter = 0;
 
@@ -159,6 +166,27 @@ public class Sone {
 	}
 
 	/**
+	 * Return the time of the last inserted update of this Sone.
+	 *
+	 * @return The time of the update (in milliseconds since Jan 1, 1970 UTC)
+	 */
+	public long getTime() {
+		return time;
+	}
+
+	/**
+	 * Sets the time of the last inserted update of this Sone.
+	 *
+	 * @param time
+	 *            The time of the update (in milliseconds since Jan 1, 1970 UTC)
+	 * @return This Sone (for method chaining)
+	 */
+	public Sone setTime(long time) {
+		this.time = time;
+		return this;
+	}
+
+	/**
 	 * Returns a copy of the profile. If you want to update values in the
 	 * profile of this Sone, update the values in the returned {@link Profile}
 	 * and use {@link #setProfile(Profile)} to change the profile in this Sone.
@@ -187,8 +215,20 @@ public class Sone {
 	 *
 	 * @return The friend Sones of this Sone
 	 */
-	public Set<Sone> getFriends() {
-		return Collections.unmodifiableSet(friendSones);
+	public List<Sone> getFriends() {
+		List<Sone> friends = new ArrayList<Sone>(friendSones);
+		Collections.sort(friends, new Comparator<Sone>() {
+
+			@Override
+			public int compare(Sone leftSone, Sone rightSone) {
+				int diff = SoneAccessor.getNiceName(leftSone).compareTo(SoneAccessor.getNiceName(rightSone));
+				if (diff != 0) {
+					return diff;
+				}
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
+			}
+		});
+		return friends;
 	}
 
 	/**
@@ -353,6 +393,52 @@ public class Sone {
 	}
 
 	/**
+	 * Returns the IDs of all blocked Sones. These Sones will not propagated
+	 * using the “known Sones” mechanism.
+	 *
+	 * @return The IDs of all blocked Sones
+	 */
+	public Set<String> getBlockedSoneIds() {
+		return Collections.unmodifiableSet(blockedSoneIds);
+	}
+
+	/**
+	 * Returns whether the given Sone ID is blocked.
+	 *
+	 * @param soneId
+	 *            The Sone ID to check
+	 * @return {@code true} if the given Sone ID is blocked, {@code false}
+	 *         otherwise
+	 */
+	public boolean isSoneBlocked(String soneId) {
+		return blockedSoneIds.contains(soneId);
+	}
+
+	/**
+	 * Adds the given ID to the list of blocked IDs.
+	 *
+	 * @param soneId
+	 *            The Sone ID to block
+	 */
+	public synchronized void addBlockedSoneId(String soneId) {
+		if (blockedSoneIds.add(soneId)) {
+			modificationCounter++;
+		}
+	}
+
+	/**
+	 * Removes the given ID from the list of blocked IDs.
+	 *
+	 * @param soneId
+	 *            The Sone ID to unblock
+	 */
+	public synchronized void removeBlockedSoneId(String soneId) {
+		if (blockedSoneIds.remove(soneId)) {
+			modificationCounter++;
+		}
+	}
+
+	/**
 	 * Returns the modification counter.
 	 *
 	 * @return The modification counter