X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=108b05c712b40f0ec033c40dadf6028a7d232f18;hp=a4fca35034e1b0098600e8cb2234b16d2b5f77ed;hb=c03a4ced3dd1562f4387edb449680a6fd8b9a746;hpb=39ed514e96c15e07aba9478d3cbf304e5f1fda8f

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index a4fca35..108b05c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -149,9 +149,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	/** All replies. */
 	private Map<String, PostReply> replies = new HashMap<String, PostReply>();
 
-	/** All new replies. */
-	private Set<String> newReplies = new HashSet<String>();
-
 	/** All known replies. */
 	private Set<String> knownReplies = new HashSet<String>();
 
@@ -649,20 +646,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Returns whether the reply with the given ID is new.
-	 *
-	 * @param replyId
-	 *            The ID of the reply to check
-	 * @return {@code true} if the reply is considered to be new, {@code false}
-	 *         otherwise
-	 */
-	public boolean isNewReply(String replyId) {
-		synchronized (newReplies) {
-			return !knownReplies.contains(replyId) && newReplies.contains(replyId);
-		}
-	}
-
-	/**
 	 * Returns all Sones that have liked the given post.
 	 *
 	 * @param post
@@ -880,6 +863,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			}
 			sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
 			sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
+			sone.setKnown(true);
 			/* TODO - load posts ’n stuff */
 			localSones.put(ownIdentity.getId(), sone);
 			final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
@@ -1184,15 +1168,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				List<Post> storedPosts = storedSone.getPosts();
 				synchronized (knownPosts) {
 					for (Post post : sone.getPosts()) {
-						post.setSone(storedSone);
+						post.setSone(storedSone).setKnown(knownPosts.contains(post.getId()));
 						if (!storedPosts.contains(post)) {
 							if (post.getTime() < getSoneFollowingTime(sone)) {
-								sone.setKnown(true);
 								knownPosts.add(post.getId());
 							} else if (!knownPosts.contains(post.getId())) {
+								sone.setKnown(false);
 								coreListenerManager.fireNewPostFound(post);
-							} else {
-								sone.setKnown(true);
 							}
 						}
 						posts.put(post.getId(), post);
@@ -1209,14 +1191,14 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					}
 				}
 				Set<PostReply> storedReplies = storedSone.getReplies();
-				synchronized (newReplies) {
+				synchronized (knownReplies) {
 					for (PostReply reply : sone.getReplies()) {
-						reply.setSone(storedSone);
+						reply.setSone(storedSone).setKnown(knownReplies.contains(reply.getId()));
 						if (!storedReplies.contains(reply)) {
 							if (reply.getTime() < getSoneFollowingTime(sone)) {
 								knownReplies.add(reply.getId());
 							} else if (!knownReplies.contains(reply.getId())) {
-								newReplies.add(reply.getId());
+								reply.setKnown(false);
 								coreListenerManager.fireNewReplyFound(reply);
 							}
 						}
@@ -1545,7 +1527,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				knownPosts.add(post.getId());
 			}
 		}
-		synchronized (newReplies) {
+		synchronized (knownReplies) {
 			for (PostReply reply : replies) {
 				knownReplies.add(reply.getId());
 			}
@@ -1756,8 +1738,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (replies) {
 			replies.put(reply.getId(), reply);
 		}
-		synchronized (newReplies) {
-			newReplies.add(reply.getId());
+		synchronized (knownReplies) {
 			coreListenerManager.fireNewReplyFound(reply);
 		}
 		sone.addReply(reply);
@@ -1790,7 +1771,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (replies) {
 			replies.remove(reply.getId());
 		}
-		synchronized (newReplies) {
+		synchronized (knownReplies) {
 			markReplyKnown(reply);
 			knownReplies.remove(reply.getId());
 		}
@@ -1806,8 +1787,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *            The reply to mark as known
 	 */
 	public void markReplyKnown(PostReply reply) {
-		synchronized (newReplies) {
-			newReplies.remove(reply.getId());
+		reply.setKnown(true);
+		synchronized (knownReplies) {
 			if (knownReplies.add(reply.getId())) {
 				coreListenerManager.fireMarkReplyKnown(reply);
 				touchConfiguration();
@@ -2221,7 +2202,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 			/* save known replies. */
 			int replyCounter = 0;
-			synchronized (newReplies) {
+			synchronized (knownReplies) {
 				for (String knownReplyId : knownReplies) {
 					configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
 				}
@@ -2364,7 +2345,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			if (knownReplyId == null) {
 				break;
 			}
-			synchronized (newReplies) {
+			synchronized (knownReplies) {
 				knownReplies.add(knownReplyId);
 			}
 		}
@@ -2502,10 +2483,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			}
 		}
 		synchronized (replies) {
-			synchronized (newReplies) {
+			synchronized (knownReplies) {
 				for (PostReply reply : sone.getReplies()) {
 					replies.remove(reply.getId());
-					newReplies.remove(reply.getId());
 					coreListenerManager.fireReplyRemoved(reply);
 				}
 			}