X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=5613828d870ff2d0eaad2f8583c06362c1adae63;hb=0d4c0d1807ed83cbed7fd11fde34944be2864908;hp=b38f8be5339677ef4534f8063ae72335d039d6fa;hpb=046f9eb545bb5b18fd7229c0325832be11148ecc;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 b38f8be..5613828 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -24,7 +24,6 @@ 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; @@ -45,36 +44,42 @@ public class Sone { /** The logger. */ private static final Logger logger = Logging.getLogger(Sone.class); - /** A GUID for this Sone. */ - private final UUID id; + /** The ID of this Sone. */ + private final String id; /** The name of this Sone. */ - private String name; + private volatile String name; /** The URI under which the Sone is stored in Freenet. */ - private FreenetURI requestUri; + private volatile FreenetURI requestUri; /** The URI used to insert a new version of this Sone. */ /* This will be null for remote Sones! */ - private FreenetURI insertUri; + private volatile FreenetURI insertUri; /** The time of the last inserted update. */ - private long time; + private volatile long time; /** The profile of this Sone. */ - private Profile profile; + private volatile Profile profile; /** All friend Sones. */ - private final Set friendSones = new HashSet(); + private final Set friendSones = Collections.synchronizedSet(new HashSet()); /** All posts. */ - private final Set posts = new HashSet(); + private final Set posts = Collections.synchronizedSet(new HashSet()); /** All replies. */ - private final Set replies = new HashSet(); + private final Set replies = Collections.synchronizedSet(new HashSet()); /** The IDs of all blocked Sones. */ - private final Set blockedSoneIds = new HashSet(); + private final Set blockedSoneIds = Collections.synchronizedSet(new HashSet()); + + /** The IDs of all liked posts. */ + private final Set likedPostIds = Collections.synchronizedSet(new HashSet()); + + /** The IDs of all liked replies. */ + private final Set likedReplyIds = Collections.synchronizedSet(new HashSet()); /** Modification count. */ private volatile long modificationCounter = 0; @@ -86,7 +91,7 @@ public class Sone { * The ID of this Sone */ public Sone(String id) { - this.id = UUID.fromString(id); + this.id = id; } // @@ -99,7 +104,7 @@ public class Sone { * @return The ID of this Sone */ public String getId() { - return id.toString(); + return id; } /** @@ -140,7 +145,19 @@ public class Sone { * @return This Sone (for method chaining) */ public Sone setRequestUri(FreenetURI requestUri) { - this.requestUri = requestUri; + if (this.requestUri == null) { + this.requestUri = requestUri; + updateEditions(); + return this; + } + if (!this.requestUri.equalsKeypair(requestUri)) { + logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri }); + return this; + } + long latestEdition = requestUri.getEdition(); + if ((latestEdition > this.requestUri.getEdition()) || (latestEdition > this.requestUri.getSuggestedEdition())) { + this.requestUri.setSuggestedEdition(latestEdition); + } return this; } @@ -161,7 +178,19 @@ public class Sone { * @return This Sone (for method chaining) */ public Sone setInsertUri(FreenetURI insertUri) { - this.insertUri = insertUri; + if (this.insertUri == null) { + this.insertUri = insertUri; + updateEditions(); + return this; + } + if (!this.insertUri.equalsKeypair(insertUri)) { + logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri }); + return this; + } + long latestEdition = insertUri.getEdition(); + if ((latestEdition > this.insertUri.getEdition()) || (latestEdition > this.insertUri.getSuggestedEdition())) { + this.insertUri.setSuggestedEdition(latestEdition); + } return this; } @@ -221,7 +250,7 @@ public class Sone { @Override public int compare(Sone leftSone, Sone rightSone) { - int diff = SoneAccessor.getNiceName(leftSone).compareTo(SoneAccessor.getNiceName(rightSone)); + int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone)); if (diff != 0) { return diff; } @@ -436,6 +465,132 @@ public class Sone { } /** + * Returns the IDs of all liked posts. + * + * @return All liked posts’ IDs + */ + public Set getLikedPostIds() { + return Collections.unmodifiableSet(likedPostIds); + } + + /** + * Sets the IDs of all liked posts. + * + * @param likedPostIds + * All liked posts’ IDs + * @return This Sone (for method chaining) + */ + public synchronized Sone setLikePostIds(Set likedPostIds) { + this.likedPostIds.clear(); + this.likedPostIds.addAll(likedPostIds); + modificationCounter++; + return this; + } + + /** + * Checks whether the given post ID is liked by this Sone. + * + * @param postId + * The ID of the post + * @return {@code true} if this Sone likes the given post, {@code false} + * otherwise + */ + public boolean isLikedPostId(String postId) { + return likedPostIds.contains(postId); + } + + /** + * Adds the given post ID to the list of posts this Sone likes. + * + * @param postId + * The ID of the post + * @return This Sone (for method chaining) + */ + public synchronized Sone addLikedPostId(String postId) { + if (likedPostIds.add(postId)) { + modificationCounter++; + } + return this; + } + + /** + * Removes the given post ID from the list of posts this Sone likes. + * + * @param postId + * The ID of the post + * @return This Sone (for method chaining) + */ + public synchronized Sone removeLikedPostId(String postId) { + if (likedPostIds.remove(postId)) { + modificationCounter++; + } + return this; + } + + /** + * Returns the IDs of all liked replies. + * + * @return All liked replies’ IDs + */ + public Set getLikedReplyIds() { + return Collections.unmodifiableSet(likedReplyIds); + } + + /** + * Sets the IDs of all liked replies. + * + * @param likedReplyIds + * All liked replies’ IDs + * @return This Sone (for method chaining) + */ + public synchronized Sone setLikeReplyIds(Set likedReplyIds) { + this.likedReplyIds.clear(); + this.likedReplyIds.addAll(likedReplyIds); + modificationCounter++; + return this; + } + + /** + * Checks whether the given reply ID is liked by this Sone. + * + * @param replyId + * The ID of the reply + * @return {@code true} if this Sone likes the given reply, {@code false} + * otherwise + */ + public boolean isLikedReplyId(String replyId) { + return likedReplyIds.contains(replyId); + } + + /** + * Adds the given reply ID to the list of replies this Sone likes. + * + * @param replyId + * The ID of the reply + * @return This Sone (for method chaining) + */ + public synchronized Sone addLikedReplyId(String replyId) { + if (likedReplyIds.add(replyId)) { + modificationCounter++; + } + return this; + } + + /** + * Removes the given post ID from the list of replies this Sone likes. + * + * @param replyId + * The ID of the reply + * @return This Sone (for method chaining) + */ + public synchronized Sone removeLikedReplyId(String replyId) { + if (likedReplyIds.remove(replyId)) { + modificationCounter++; + } + return this; + } + + /** * Returns the modification counter. * * @return The modification counter @@ -457,16 +612,36 @@ public class Sone { /** * 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); - if (this.insertUri != null) { - this.insertUri = this.insertUri.setSuggestedEdition(latestEdition); + * @param latestEdition + * The latest edition to update the URIs to + */ + public void updateUris(long latestEdition) { + if ((requestUri != null) && (requestUri.getEdition() < latestEdition)) { + requestUri = requestUri.setSuggestedEdition(latestEdition); + } + if ((insertUri != null) && (insertUri.getEdition() < latestEdition)) { + insertUri = insertUri.setSuggestedEdition(latestEdition); + } + } + + // + // PRIVATE METHODS + // + + /** + * Updates the editions of the request URI and the insert URI (if latter is + * not {@code null}) with the greater edition of either one. + */ + private void updateEditions() { + long requestEdition = 0; + if (requestUri != null) { + requestEdition = requestUri.getEdition(); + } + long insertEdition = 0; + if (insertUri != null) { + insertEdition = insertUri.getEdition(); } + updateUris(Math.max(requestEdition, insertEdition)); } //