X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8c2dabb7106772afa12d8fa13bd72b1a132595f4;hb=2b5d2439bd2c609fa8d7cd743e6724a49980cbde;hp=2112e18b96b40d592376bc54fc73067bc73b3ca7;hpb=b3d8b88791743298e897d7f5400304a54f6e2ba4;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 2112e18..8c2dabb 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -509,17 +509,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *
 	 * @param id
 	 *            The ID of the remote Sone to get
-	 * @return The Sone with the given ID
-	 */
-	public Sone getRemoteSone(String id) {
-		return getRemoteSone(id, true);
-	}
-
-	/**
-	 * Returns the remote Sone with the given ID.
-	 *
-	 * @param id
-	 *            The ID of the remote Sone to get
 	 * @param create
 	 *            {@code true} to always create a Sone, {@code false} to return
 	 *            {@code null} if no Sone with the given ID exists
@@ -528,7 +517,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public Sone getRemoteSone(String id, boolean create) {
 		synchronized (remoteSones) {
 			Sone sone = remoteSones.get(id);
-			if ((sone == null) && create) {
+			if ((sone == null) && create && (id != null) && (id.length() == 43)) {
 				sone = new Sone(id);
 				remoteSones.put(id, sone);
 				setSoneStatus(sone, SoneStatus.unknown);
@@ -956,29 +945,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Adds a local Sone from the given ID which has to be the ID of an own
-	 * identity.
-	 *
-	 * @param id
-	 *            The ID of an own identity to add a Sone for
-	 * @return The added (or already existing) Sone
-	 */
-	public Sone addLocalSone(String id) {
-		synchronized (localSones) {
-			if (localSones.containsKey(id)) {
-				logger.log(Level.FINE, "Tried to add known local Sone: %s", id);
-				return localSones.get(id);
-			}
-			OwnIdentity ownIdentity = identityManager.getOwnIdentity(id);
-			if (ownIdentity == null) {
-				logger.log(Level.INFO, "Invalid Sone ID: %s", id);
-				return null;
-			}
-			return addLocalSone(ownIdentity);
-		}
-	}
-
-	/**
 	 * Adds a local Sone from the given own identity.
 	 *
 	 * @param ownIdentity
@@ -1050,7 +1016,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			return null;
 		}
 		synchronized (remoteSones) {
-			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+			final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
@@ -1070,7 +1036,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					}
 				}
 			}
-			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			setSoneStatus(sone, SoneStatus.unknown);
 			soneDownloaders.execute(new Runnable() {
@@ -1096,6 +1061,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void followSone(Sone sone, String soneId) {
 		Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
+		Sone followedSone = getSone(soneId, true);
+		if (followedSone == null) {
+			logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
+			return;
+		}
 		followSone(sone, getSone(soneId));
 	}
 
@@ -1302,9 +1272,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				synchronized (newPosts) {
 					for (Post post : sone.getPosts()) {
 						post.setSone(storedSone);
-						if (!storedPosts.contains(post) && !knownPosts.contains(post.getId())) {
-							newPosts.add(post.getId());
-							coreListenerManager.fireNewPostFound(post);
+						if (!storedPosts.contains(post)) {
+							if (post.getTime() < getSoneFollowingTime(sone)) {
+								knownPosts.add(post.getId());
+							} else if (!knownPosts.contains(post.getId())) {
+								newPosts.add(post.getId());
+								coreListenerManager.fireNewPostFound(post);
+							}
 						}
 						posts.put(post.getId(), post);
 					}
@@ -1323,9 +1297,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				synchronized (newReplies) {
 					for (PostReply reply : sone.getReplies()) {
 						reply.setSone(storedSone);
-						if (!storedReplies.contains(reply) && !knownReplies.contains(reply.getId())) {
-							newReplies.add(reply.getId());
-							coreListenerManager.fireNewReplyFound(reply);
+						if (!storedReplies.contains(reply)) {
+							if (reply.getTime() < getSoneFollowingTime(sone)) {
+								knownReplies.add(reply.getId());
+							} else if (!knownReplies.contains(reply.getId())) {
+								newReplies.add(reply.getId());
+								coreListenerManager.fireNewReplyFound(reply);
+							}
 						}
 						replies.put(reply.getId(), reply);
 					}
@@ -2557,7 +2535,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
-				Sone sone = getRemoteSone(identity.getId());
+				Sone sone = getRemoteSone(identity.getId(), false);
 				sone.setIdentity(identity);
 				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
 				soneDownloader.addSone(sone);