X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=09e46b3defcf6b65f4b4c0db331482f2a18b6a87;hb=099ca7d98f1e557191f9e4db97d1c970a53bc062;hp=b42fc34a68a153776f5de99f30d540b082df0ab0;hpb=d7ddf7e18617dd738a7e1df7931c5e4dcd7803aa;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 b42fc34..09e46b3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -528,7 +528,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);
@@ -1032,7 +1032,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption<Boolean>(true));
 		sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption<Boolean>(true));
 		sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption<Boolean>(true));
-		sone.addFriend("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
+		followSone(sone, getSone("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI"));
 		touchConfiguration();
 		return sone;
 	}
@@ -1065,13 +1065,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					coreListenerManager.fireNewSoneFound(sone);
 					for (Sone localSone : getLocalSones()) {
 						if (localSone.getOptions().getBooleanOption("AutoFollow").get()) {
-							localSone.addFriend(sone.getId());
-							touchConfiguration();
+							followSone(localSone, sone);
 						}
 					}
 				}
 			}
-			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			setSoneStatus(sone, SoneStatus.unknown);
 			soneDownloaders.execute(new Runnable() {
@@ -1303,9 +1301,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);
 					}
@@ -1324,9 +1326,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);
 					}
@@ -1628,7 +1634,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
-			sone.setFriends(friends);
+			for (String friendId : friends) {
+				followSone(sone, friendId);
+			}
 			sone.setAlbums(topLevelAlbums);
 			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 		}