X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=6d729c37696e57c5e7c63799ae71cfe1a3e605cb;hb=6a0938d8f6fdf9dbc45f03384a3cd83efeef022c;hp=6c50462afad246325047aec5f043c225b4e958d3;hpb=ca9a2a724bafac435ddc549469e510810ee31584;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 6c50462..6d729c3 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -19,16 +19,20 @@ package net.pterodactylus.sone.data;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
+import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
 
 /**
- * A Sone defines everything about a user: the {@link User} itself, her profile,
- * her status updates.
+ * A Sone defines everything about a user: her profile, her status updates, her
+ * replies, her likes and dislikes, etc.
  * <p>
  * Operations that modify the Sone need to synchronize on the Sone in question.
  *
@@ -36,6 +40,9 @@ import freenet.keys.FreenetURI;
  */
 public class Sone {
 
+	/** The logger. */
+	private static final Logger logger = Logging.getLogger(Sone.class);
+
 	/** A GUID for this Sone. */
 	private final UUID id;
 
@@ -43,11 +50,11 @@ public class Sone {
 	private final String name;
 
 	/** The URI under which the Sone is stored in Freenet. */
-	private final FreenetURI requestUri;
+	private FreenetURI requestUri;
 
 	/** The URI used to insert a new version of this Sone. */
 	/* This will be null for remote Sones! */
-	private final FreenetURI insertUri;
+	private FreenetURI insertUri;
 
 	/** The profile of this Sone. */
 	private Profile profile;
@@ -166,7 +173,7 @@ public class Sone {
 	 *
 	 * @return The friend Sones of this Sone
 	 */
-	public Set<Sone> getFriendSones() {
+	public Set<Sone> getFriends() {
 		return Collections.unmodifiableSet(friendSones);
 	}
 
@@ -178,7 +185,7 @@ public class Sone {
 	 * @return {@code true} if this Sone has the given Sone as a friend,
 	 *         {@code false} otherwise
 	 */
-	public boolean hasFriendSone(Sone friendSone) {
+	public boolean hasFriend(Sone friendSone) {
 		return friendSones.contains(friendSone);
 	}
 
@@ -189,8 +196,8 @@ public class Sone {
 	 *            The friend Sone to add
 	 * @return This Sone (for method chaining)
 	 */
-	public synchronized Sone addFriendSone(Sone friendSone) {
-		if (friendSones.add(friendSone)) {
+	public synchronized Sone addFriend(Sone friendSone) {
+		if (!friendSone.equals(this) && friendSones.add(friendSone)) {
 			modificationCounter++;
 		}
 		return this;
@@ -203,7 +210,7 @@ public class Sone {
 	 *            The friend Sone to remove
 	 * @return This Sone (for method chaining)
 	 */
-	public synchronized Sone removeFriendSone(Sone friendSone) {
+	public synchronized Sone removeFriend(Sone friendSone) {
 		if (friendSones.remove(friendSone)) {
 			modificationCounter++;
 		}
@@ -211,12 +218,21 @@ public class Sone {
 	}
 
 	/**
-	 * Returns the list of posts of this Sone.
+	 * Returns the list of posts of this Sone, sorted by time, newest first.
 	 *
 	 * @return All posts of this Sone
 	 */
 	public List<Post> getPosts() {
-		return Collections.unmodifiableList(posts);
+		List<Post> sortedPosts = new ArrayList<Post>(posts);
+		Collections.sort(sortedPosts, new Comparator<Post>() {
+
+			@Override
+			public int compare(Post leftPost, Post rightPost) {
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime()));
+			}
+
+		});
+		return sortedPosts;
 	}
 
 	/**
@@ -228,6 +244,7 @@ public class Sone {
 	 */
 	public synchronized void addPost(Post post) {
 		if (post.getSone().equals(this) && posts.add(post)) {
+			logger.log(Level.FINEST, "Adding %s to “%s”.", new Object[] { post, getName() });
 			modificationCounter++;
 		}
 	}
@@ -297,6 +314,19 @@ public class Sone {
 		this.modificationCounter = modificationCounter;
 	}
 
+	/**
+	 * Updates the suggested edition in both the request URI and the insert URI.
+	 *
+	 * @param requestUri
+	 *            The request URI that resulted from an insert
+	 */
+	public void updateUris(FreenetURI requestUri) {
+		/* TODO - check for the correct URI. */
+		long latestEdition = requestUri.getSuggestedEdition();
+		this.requestUri = this.requestUri.setSuggestedEdition(latestEdition);
+		this.insertUri = this.insertUri.setSuggestedEdition(latestEdition);
+	}
+
 	//
 	// OBJECT METHODS
 	//
@@ -306,7 +336,7 @@ public class Sone {
 	 */
 	@Override
 	public int hashCode() {
-		return id.hashCode();
+		return getId().hashCode();
 	}
 
 	/**
@@ -317,7 +347,15 @@ public class Sone {
 		if (!(object instanceof Sone)) {
 			return false;
 		}
-		return ((Sone) object).id.equals(id);
+		return ((Sone) object).id.equals(getId());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		return getClass().getName() + "[id=" + getId() + ",name=" + getName() + ",requestUri=" + getRequestUri() + ",insertUri=" + getInsertUri() + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
 	}
 
 }