Remove superfluous method.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index b42fc34..b612c74 100644 (file)
--- 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
@@ -1032,7 +998,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;
        }
@@ -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));
@@ -1065,13 +1031,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 +1267,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 +1292,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 +1600,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);
                }
@@ -2556,7 +2530,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);