Add methods to mark posts and replies as known.

[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 4561b6d..3f2111a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -84,7 +84,7 @@ public class Core implements IdentityListener {
        private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
 
        /** The configuration. */
-       private final Configuration configuration;
+       private Configuration configuration;
 
        /** The identity manager. */
        private final IdentityManager identityManager;
@@ -190,6 +190,18 @@ public class Core implements IdentityListener {
        //
 
        /**
+        * Sets the configuration to use. This will automatically save the current
+        * configuration to the given configuration.
+        *
+        * @param configuration
+        *            The new configuration to use
+        */
+       public void setConfiguration(Configuration configuration) {
+               this.configuration = configuration;
+               saveConfiguration();
+       }
+
+       /**
         * Returns the options used by the core.
         *
         * @return The options of the core
@@ -735,6 +747,7 @@ public class Core implements IdentityListener {
                                                --edition;
                                        }
                                        logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserter…");
+                                       saveSone(sone);
                                        coreListenerManager.fireRescuedSone(sone);
                                        soneInserter.start();
                                }
@@ -850,7 +863,9 @@ public class Core implements IdentityListener {
                                }
                        }
                        synchronized (storedSone) {
-                               storedSone.setTime(sone.getTime());
+                               if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
+                                       storedSone.setTime(sone.getTime());
+                               }
                                storedSone.setClient(sone.getClient());
                                storedSone.setProfile(sone.getProfile());
                                if (soneRescueMode) {
@@ -872,7 +887,7 @@ public class Core implements IdentityListener {
                                        storedSone.setLikePostIds(sone.getLikedPostIds());
                                        storedSone.setLikeReplyIds(sone.getLikedReplyIds());
                                }
-                               storedSone.setLatestEdition(sone.getRequestUri().getEdition());
+                               storedSone.setLatestEdition(sone.getLatestEdition());
                        }
                }
        }
@@ -1120,9 +1135,10 @@ public class Core implements IdentityListener {
         *            The Sone that creates the post
         * @param text
         *            The text of the post
+        * @return The created post
         */
-       public void createPost(Sone sone, String text) {
-               createPost(sone, System.currentTimeMillis(), text);
+       public Post createPost(Sone sone, String text) {
+               return createPost(sone, System.currentTimeMillis(), text);
        }
 
        /**
@@ -1134,11 +1150,12 @@ public class Core implements IdentityListener {
         *            The time of the post
         * @param text
         *            The text of the post
+        * @return The created post
         */
-       public void createPost(Sone sone, long time, String text) {
+       public Post createPost(Sone sone, long time, String text) {
                if (!isLocalSone(sone)) {
                        logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone);
-                       return;
+                       return null;
                }
                Post post = new Post(sone, time, text);
                synchronized (posts) {
@@ -1149,6 +1166,7 @@ public class Core implements IdentityListener {
                }
                sone.addPost(post);
                saveSone(sone);
+               return post;
        }
 
        /**
@@ -1185,6 +1203,22 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Marks the given post as known, if it is currently a new post (according
+        * to {@link #isNewPost(String)}).
+        *
+        * @param post
+        *            The post to mark as known
+        */
+       public void markPostKnown(Post post) {
+               synchronized (newPosts) {
+                       if (newPosts.remove(post.getId())) {
+                               knownPosts.add(post.getId());
+                               coreListenerManager.fireMarkPostKnown(post);
+                       }
+               }
+       }
+
+       /**
         * Creates a new reply.
         *
         * @param sone
@@ -1234,6 +1268,22 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Marks the given reply as known, if it is currently a new reply (according
+        * to {@link #isNewReply(String)}).
+        *
+        * @param reply
+        *            The reply to mark as known
+        */
+       public void markReplyKnown(Reply reply) {
+               synchronized (newReplies) {
+                       if (newReplies.remove(reply.getId())) {
+                               knownReplies.add(reply.getId());
+                               coreListenerManager.fireMarkReplyKnown(reply);
+                       }
+               }
+       }
+
+       /**
         * Starts the core.
         */
        public void start() {
@@ -1253,6 +1303,52 @@ public class Core implements IdentityListener {
                stopped = true;
        }
 
+       /**
+        * Saves the current options.
+        */
+       public void saveConfiguration() {
+               /* store the options first. */
+               try {
+                       configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
+                       configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
+                       configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
+                       configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
+
+                       /* save known Sones. */
+                       int soneCounter = 0;
+                       synchronized (newSones) {
+                               for (String knownSoneId : knownSones) {
+                                       configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
+                               }
+                               configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
+                       }
+
+                       /* save known posts. */
+                       int postCounter = 0;
+                       synchronized (newPosts) {
+                               for (String knownPostId : knownPosts) {
+                                       configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
+                               }
+                               configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
+                       }
+
+                       /* save known replies. */
+                       int replyCounter = 0;
+                       synchronized (newReplies) {
+                               for (String knownReplyId : knownReplies) {
+                                       configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
+                               }
+                               configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null);
+                       }
+
+                       /* now save it. */
+                       configuration.save();
+
+               } catch (ConfigurationException ce1) {
+                       logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+               }
+       }
+
        //
        // PRIVATE METHODS
        //
@@ -1328,49 +1424,6 @@ public class Core implements IdentityListener {
        }
 
        /**
-        * Saves the current options.
-        */
-       private void saveConfiguration() {
-               /* store the options first. */
-               try {
-                       configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
-                       configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
-                       configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
-                       configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
-
-                       /* save known Sones. */
-                       int soneCounter = 0;
-                       synchronized (newSones) {
-                               for (String knownSoneId : knownSones) {
-                                       configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
-                               }
-                               configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
-                       }
-
-                       /* save known posts. */
-                       int postCounter = 0;
-                       synchronized (newPosts) {
-                               for (String knownPostId : knownPosts) {
-                                       configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
-                               }
-                               configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
-                       }
-
-                       /* save known replies. */
-                       int replyCounter = 0;
-                       synchronized (newReplies) {
-                               for (String knownReplyId : knownReplies) {
-                                       configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
-                               }
-                               configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null);
-                       }
-
-               } catch (ConfigurationException ce1) {
-                       logger.log(Level.SEVERE, "Could not store configuration!", ce1);
-               }
-       }
-
-       /**
         * Generate a Sone URI from the given URI and latest edition.
         *
         * @param uriString