Store a post’s known-status in the post itself.

[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 7a97842..a4fca35 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -137,21 +137,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
        /* synchronize access on this on itself. */
        private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
 
-       /** All new Sones. */
-       private Set<String> newSones = new HashSet<String>();
-
        /** All known Sones. */
-       /* synchronize access on {@link #newSones}. */
        private Set<String> knownSones = new HashSet<String>();
 
        /** All posts. */
        private Map<String, Post> posts = new HashMap<String, Post>();
 
-       /** All new posts. */
-       private Set<String> newPosts = new HashSet<String>();
-
        /** All known posts. */
-       /* synchronize access on {@link #newPosts}. */
        private Set<String> knownPosts = new HashSet<String>();
 
        /** All replies. */
@@ -504,19 +496,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
        }
 
        /**
-        * Returns whether the Sone with the given ID is a new Sone.
-        *
-        * @param soneId
-        *            The ID of the sone to check for
-        * @return {@code true} if the given Sone is new, false otherwise
-        */
-       public boolean isNewSone(String soneId) {
-               synchronized (newSones) {
-                       return !knownSones.contains(soneId) && newSones.contains(soneId);
-               }
-       }
-
-       /**
         * Returns whether the given Sone has been modified.
         *
         * @param sone
@@ -593,20 +572,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
        }
 
        /**
-        * Returns whether the given post ID is new.
-        *
-        * @param postId
-        *            The post ID
-        * @return {@code true} if the post is considered to be new, {@code false}
-        *         otherwise
-        */
-       public boolean isNewPost(String postId) {
-               synchronized (newPosts) {
-                       return !knownPosts.contains(postId) && newPosts.contains(postId);
-               }
-       }
-
-       /**
         * Returns all posts that have the given Sone as recipient.
         *
         * @see Post#getRecipient()
@@ -972,12 +937,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        sone.setRequestUri(getSoneUri(identity.getRequestUri()));
                        sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
                        if (newSone) {
-                               synchronized (newSones) {
+                               synchronized (knownSones) {
                                        newSone = !knownSones.contains(sone.getId());
-                                       if (newSone) {
-                                               newSones.add(sone.getId());
-                                       }
                                }
+                               sone.setKnown(!newSone);
                                if (newSone) {
                                        coreListenerManager.fireNewSoneFound(sone);
                                        for (Sone localSone : getLocalSones()) {
@@ -1219,15 +1182,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                                        }
                                }
                                List<Post> storedPosts = storedSone.getPosts();
-                               synchronized (newPosts) {
+                               synchronized (knownPosts) {
                                        for (Post post : sone.getPosts()) {
                                                post.setSone(storedSone);
                                                if (!storedPosts.contains(post)) {
                                                        if (post.getTime() < getSoneFollowingTime(sone)) {
+                                                               sone.setKnown(true);
                                                                knownPosts.add(post.getId());
                                                        } else if (!knownPosts.contains(post.getId())) {
-                                                               newPosts.add(post.getId());
                                                                coreListenerManager.fireNewPostFound(post);
+                                                       } else {
+                                                               sone.setKnown(true);
                                                        }
                                                }
                                                posts.put(post.getId(), post);
@@ -1353,12 +1318,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
         *            The Sone to mark as known
         */
        public void markSoneKnown(Sone sone) {
-               synchronized (newSones) {
-                       if (newSones.remove(sone.getId())) {
+               if (!sone.isKnown()) {
+                       sone.setKnown(true);
+                       synchronized (knownSones) {
                                knownSones.add(sone.getId());
-                               coreListenerManager.fireMarkSoneKnown(sone);
-                               touchConfiguration();
                        }
+                       coreListenerManager.fireMarkSoneKnown(sone);
+                       touchConfiguration();
                }
        }
 
@@ -1569,12 +1535,12 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        sone.setAlbums(topLevelAlbums);
                        soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
                }
-               synchronized (newSones) {
+               synchronized (knownSones) {
                        for (String friend : friends) {
                                knownSones.add(friend);
                        }
                }
-               synchronized (newPosts) {
+               synchronized (knownPosts) {
                        for (Post post : posts) {
                                knownPosts.add(post.getId());
                        }
@@ -1656,10 +1622,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                synchronized (posts) {
                        posts.put(post.getId(), post);
                }
-               synchronized (newPosts) {
-                       newPosts.add(post.getId());
-                       coreListenerManager.fireNewPostFound(post);
-               }
+               coreListenerManager.fireNewPostFound(post);
                sone.addPost(post);
                touchConfiguration();
                localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
@@ -1691,10 +1654,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        posts.remove(post.getId());
                }
                coreListenerManager.firePostRemoved(post);
-               synchronized (newPosts) {
-                       markPostKnown(post);
-                       knownPosts.remove(post.getId());
-               }
+               markPostKnown(post);
                touchConfiguration();
        }
 
@@ -1706,8 +1666,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
         *            The post to mark as known
         */
        public void markPostKnown(Post post) {
-               synchronized (newPosts) {
-                       newPosts.remove(post.getId());
+               post.setKnown(true);
+               synchronized (knownPosts) {
                        if (knownPosts.add(post.getId())) {
                                coreListenerManager.fireMarkPostKnown(post);
                                touchConfiguration();
@@ -2232,7 +2192,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
                        /* save known Sones. */
                        int soneCounter = 0;
-                       synchronized (newSones) {
+                       synchronized (knownSones) {
                                for (String knownSoneId : knownSones) {
                                        configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
                                }
@@ -2252,7 +2212,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
                        /* save known posts. */
                        int postCounter = 0;
-                       synchronized (newPosts) {
+                       synchronized (knownPosts) {
                                for (String knownPostId : knownPosts) {
                                        configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
                                }
@@ -2361,7 +2321,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        if (knownSoneId == null) {
                                break;
                        }
-                       synchronized (newSones) {
+                       synchronized (knownSones) {
                                knownSones.add(knownSoneId);
                        }
                }
@@ -2392,7 +2352,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        if (knownPostId == null) {
                                break;
                        }
-                       synchronized (newPosts) {
+                       synchronized (knownPosts) {
                                knownPosts.add(knownPostId);
                        }
                }
@@ -2534,10 +2494,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        return;
                }
                synchronized (posts) {
-                       synchronized (newPosts) {
+                       synchronized (knownPosts) {
                                for (Post post : sone.getPosts()) {
                                        posts.remove(post.getId());
-                                       newPosts.remove(post.getId());
                                        coreListenerManager.firePostRemoved(post);
                                }
                        }
@@ -2554,10 +2513,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                synchronized (remoteSones) {
                        remoteSones.remove(identity.getId());
                }
-               synchronized (newSones) {
-                       newSones.remove(identity.getId());
-                       coreListenerManager.fireSoneRemoved(sone);
-               }
+               coreListenerManager.fireSoneRemoved(sone);
        }
 
        //
@@ -2678,8 +2634,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                 *
                 * @param insertionDelay
                 *            The insertion delay to validate
-                * @return {@code true} if the given insertion delay was valid, {@code
-                *         false} otherwise
+                * @return {@code true} if the given insertion delay was valid,
+                *         {@code false} otherwise
                 */
                public boolean validateInsertionDelay(Integer insertionDelay) {
                        return options.getIntegerOption("InsertionDelay").validate(insertionDelay);