Merge branch 'next' into edit-wot-trust
[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java
index ea491bb..f7b56a1 100644 (file)
@@ -40,6 +40,8 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
+import net.pterodactylus.sone.freenet.wot.Trust;
+import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
@@ -84,7 +86,10 @@ public class Core implements IdentityListener {
        private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
 
        /** The configuration. */
-       private final Configuration configuration;
+       private Configuration configuration;
+
+       /** Whether we’re currently saving the configuration. */
+       private boolean storingConfiguration = false;
 
        /** The identity manager. */
        private final IdentityManager identityManager;
@@ -144,6 +149,9 @@ public class Core implements IdentityListener {
        /** All known replies. */
        private Set<String> knownReplies = new HashSet<String>();
 
+       /** Trusted identities, sorted by own identities. */
+       private Map<OwnIdentity, Set<Identity>> trustedIdentities = Collections.synchronizedMap(new HashMap<OwnIdentity, Set<Identity>>());
+
        /**
         * Creates a new core.
         *
@@ -190,6 +198,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
@@ -488,6 +508,19 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Returns whether the target Sone is trusted by the origin Sone.
+        *
+        * @param origin
+        *            The origin Sone
+        * @param target
+        *            The target Sone
+        * @return {@code true} if the target Sone is trusted by the origin Sone
+        */
+       public boolean isSoneTrusted(Sone origin, Sone target) {
+               return trustedIdentities.containsKey(origin) && trustedIdentities.get(origin.getIdentity()).contains(target);
+       }
+
+       /**
         * Returns the post with the given ID.
         *
         * @param postId
@@ -529,27 +562,63 @@ public class Core implements IdentityListener {
         *         otherwise
         */
        public boolean isNewPost(String postId) {
+               return isNewPost(postId, true);
+       }
+
+       /**
+        * Returns whether the given post ID is new. If {@code markAsKnown} is
+        * {@code true} then after this method returns the post ID is marked a known
+        * post ID.
+        *
+        * @param postId
+        *            The post ID
+        * @param markAsKnown
+        *            {@code true} to mark the post ID as known, {@code false} to
+        *            not to mark it as known
+        * @return {@code true} if the post is considered to be new, {@code false}
+        *         otherwise
+        */
+       public boolean isNewPost(String postId, boolean markAsKnown) {
                synchronized (newPosts) {
-                       boolean isNew = !knownPosts.contains(postId) && newPosts.remove(postId);
-                       knownPosts.add(postId);
-                       if (isNew) {
-                               coreListenerManager.fireMarkPostKnown(getPost(postId));
+                       boolean isNew = !knownPosts.contains(postId) && newPosts.contains(postId);
+                       if (markAsKnown) {
+                               Post post = getPost(postId, false);
+                               if (post != null) {
+                                       markPostKnown(post);
+                               }
                        }
                        return isNew;
                }
        }
 
        /**
-        * Returns the reply with the given ID.
+        * Returns the reply with the given ID. If there is no reply with the given
+        * ID yet, a new one is created.
         *
         * @param replyId
         *            The ID of the reply to get
-        * @return The reply, or {@code null} if there is no such reply
+        * @return The reply
         */
        public Reply getReply(String replyId) {
+               return getReply(replyId, true);
+       }
+
+       /**
+        * Returns the reply with the given ID. If there is no reply with the given
+        * ID yet, a new one is created, unless {@code create} is false in which
+        * case {@code null} is returned.
+        *
+        * @param replyId
+        *            The ID of the reply to get
+        * @param create
+        *            {@code true} to always return a {@link Reply}, {@code false}
+        *            to return {@code null} if no reply can be found
+        * @return The reply, or {@code null} if there is no such reply
+        */
+       public Reply getReply(String replyId, boolean create) {
                synchronized (replies) {
                        Reply reply = replies.get(replyId);
-                       if (reply == null) {
+                       if (create && (reply == null)) {
                                reply = new Reply(replyId);
                                replies.put(replyId, reply);
                        }
@@ -587,11 +656,28 @@ public class Core implements IdentityListener {
         *         otherwise
         */
        public boolean isNewReply(String replyId) {
+               return isNewReply(replyId, true);
+       }
+
+       /**
+        * Returns whether the reply with the given ID is new.
+        *
+        * @param replyId
+        *            The ID of the reply to check
+        * @param markAsKnown
+        *            {@code true} to mark the reply as known, {@code false} to not
+        *            to mark it as known
+        * @return {@code true} if the reply is considered to be new, {@code false}
+        *         otherwise
+        */
+       public boolean isNewReply(String replyId, boolean markAsKnown) {
                synchronized (newReplies) {
-                       boolean isNew = !knownReplies.contains(replyId) && newReplies.remove(replyId);
-                       knownReplies.add(replyId);
-                       if (isNew) {
-                               coreListenerManager.fireMarkReplyKnown(getReply(replyId));
+                       boolean isNew = !knownReplies.contains(replyId) && newReplies.contains(replyId);
+                       if (markAsKnown) {
+                               Reply reply = getReply(replyId, false);
+                               if (reply != null) {
+                                       markReplyKnown(reply);
+                               }
                        }
                        return isNew;
                }
@@ -645,7 +731,9 @@ public class Core implements IdentityListener {
         */
        public void lockSone(Sone sone) {
                synchronized (lockedSones) {
-                       lockedSones.add(sone);
+                       if (lockedSones.add(sone)) {
+                               coreListenerManager.fireSoneLocked(sone);
+                       }
                }
        }
 
@@ -658,7 +746,9 @@ public class Core implements IdentityListener {
         */
        public void unlockSone(Sone sone) {
                synchronized (lockedSones) {
-                       lockedSones.remove(sone);
+                       if (lockedSones.remove(sone)) {
+                               coreListenerManager.fireSoneUnlocked(sone);
+                       }
                }
        }
 
@@ -735,6 +825,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();
                                }
@@ -752,7 +843,12 @@ public class Core implements IdentityListener {
         * @return The created Sone
         */
        public Sone createSone(OwnIdentity ownIdentity) {
-               identityManager.addContext(ownIdentity, "Sone");
+               try {
+                       ownIdentity.addContext("Sone");
+               } catch (WebOfTrustException wote1) {
+                       logger.log(Level.SEVERE, "Could not add “Sone” context to own identity: " + ownIdentity, wote1);
+                       return null;
+               }
                Sone sone = addLocalSone(ownIdentity);
                return sone;
        }
@@ -802,6 +898,28 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Retrieves the trust relationship from the origin to the target.
+        *
+        * @param origin
+        *            The origin of the trust tree
+        * @param target
+        *            The target of the trust
+        * @return The trust relationship
+        */
+       public Trust getTrust(Sone origin, Sone target) {
+               if (!isLocalSone(origin)) {
+                       logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
+                       return null;
+               }
+               try {
+                       return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
+               } catch (WebOfTrustException wote1) {
+                       logger.log(Level.WARNING, "Could not get trust for Sone: " + target, wote1);
+                       return null;
+               }
+       }
+
+       /**
         * Updates the stores Sone with the given Sone.
         *
         * @param sone
@@ -819,12 +937,15 @@ public class Core implements IdentityListener {
                                if (!soneRescueMode) {
                                        for (Post post : storedSone.getPosts()) {
                                                posts.remove(post.getId());
+                                               if (!sone.getPosts().contains(post)) {
+                                                       coreListenerManager.firePostRemoved(post);
+                                               }
                                        }
                                }
                                synchronized (newPosts) {
                                        for (Post post : sone.getPosts()) {
+                                               post.setSone(getSone(post.getSone().getId()));
                                                if (!storedSone.getPosts().contains(post) && !knownPosts.contains(post.getId())) {
-                                                       post.setSone(getSone(post.getSone().getId()));
                                                        newPosts.add(post.getId());
                                                        coreListenerManager.fireNewPostFound(post);
                                                }
@@ -836,10 +957,14 @@ public class Core implements IdentityListener {
                                if (!soneRescueMode) {
                                        for (Reply reply : storedSone.getReplies()) {
                                                replies.remove(reply.getId());
+                                               if (!sone.getReplies().contains(reply)) {
+                                                       coreListenerManager.fireReplyRemoved(reply);
+                                               }
                                        }
                                }
                                synchronized (newReplies) {
                                        for (Reply reply : sone.getReplies()) {
+                                               reply.setSone(getSone(reply.getSone().getId()));
                                                if (!storedSone.getReplies().contains(reply) && !knownReplies.contains(reply.getId())) {
                                                        newReplies.add(reply.getId());
                                                        coreListenerManager.fireNewReplyFound(reply);
@@ -849,7 +974,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) {
@@ -871,7 +998,7 @@ public class Core implements IdentityListener {
                                        storedSone.setLikePostIds(sone.getLikedPostIds());
                                        storedSone.setLikeReplyIds(sone.getLikedReplyIds());
                                }
-                               storedSone.setLatestEdition(sone.getRequestUri().getEdition());
+                               storedSone.setLatestEdition(sone.getLatestEdition());
                        }
                }
        }
@@ -897,8 +1024,12 @@ public class Core implements IdentityListener {
                        localSones.remove(sone.getId());
                        soneInserters.remove(sone).stop();
                }
-               identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
-               identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+               try {
+                       ((OwnIdentity) sone.getIdentity()).removeContext("Sone");
+                       ((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
+               } catch (WebOfTrustException wote1) {
+                       logger.log(Level.WARNING, "Could not remove context and properties from Sone: " + sone, wote1);
+               }
                try {
                        configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
                } catch (ConfigurationException ce1) {
@@ -945,13 +1076,18 @@ public class Core implements IdentityListener {
                        if (postId == null) {
                                break;
                        }
+                       String postRecipientId = configuration.getStringValue(postPrefix + "/Recipient").getValue(null);
                        long postTime = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
                        String postText = configuration.getStringValue(postPrefix + "/Text").getValue(null);
                        if ((postTime == 0) || (postText == null)) {
                                logger.log(Level.WARNING, "Invalid post found, aborting load!");
                                return;
                        }
-                       posts.add(getPost(postId).setSone(sone).setTime(postTime).setText(postText));
+                       Post post = getPost(postId).setSone(sone).setTime(postTime).setText(postText);
+                       if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
+                               post.setRecipient(getSone(postRecipientId));
+                       }
+                       posts.add(post);
                }
 
                /* load replies. */
@@ -1037,7 +1173,7 @@ public class Core implements IdentityListener {
         * @param sone
         *            The Sone to save
         */
-       public void saveSone(Sone sone) {
+       public synchronized void saveSone(Sone sone) {
                if (!isLocalSone(sone)) {
                        logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
                        return;
@@ -1048,8 +1184,9 @@ public class Core implements IdentityListener {
                }
 
                logger.log(Level.INFO, "Saving Sone: %s", sone);
-               identityManager.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
                try {
+                       ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+
                        /* save Sone into configuration. */
                        String sonePrefix = "Sone/" + sone.getId();
                        configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
@@ -1069,6 +1206,7 @@ public class Core implements IdentityListener {
                        for (Post post : sone.getPosts()) {
                                String postPrefix = sonePrefix + "/Posts/" + postCounter++;
                                configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+                               configuration.getStringValue(postPrefix + "/Recipient").setValue((post.getRecipient() != null) ? post.getRecipient().getId() : null);
                                configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
                                configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
                        }
@@ -1106,9 +1244,12 @@ public class Core implements IdentityListener {
                        }
                        configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+                       configuration.save();
                        logger.log(Level.INFO, "Sone %s saved.", sone);
                } catch (ConfigurationException ce1) {
                        logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
+               } catch (WebOfTrustException wote1) {
+                       logger.log(Level.WARNING, "Could not set WoT property for Sone: " + sone, wote1);
                }
        }
 
@@ -1119,9 +1260,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);
        }
 
        /**
@@ -1133,13 +1275,51 @@ 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) {
+               return createPost(sone, null, time, text);
+       }
+
+       /**
+        * Creates a new post.
+        *
+        * @param sone
+        *            The Sone that creates the post
+        * @param recipient
+        *            The recipient Sone, or {@code null} if this post does not have
+        *            a recipient
+        * @param text
+        *            The text of the post
+        * @return The created post
+        */
+       public Post createPost(Sone sone, Sone recipient, String text) {
+               return createPost(sone, recipient, System.currentTimeMillis(), text);
+       }
+
+       /**
+        * Creates a new post.
+        *
+        * @param sone
+        *            The Sone that creates the post
+        * @param recipient
+        *            The recipient Sone, or {@code null} if this post does not have
+        *            a recipient
+        * @param time
+        *            The time of the post
+        * @param text
+        *            The text of the post
+        * @return The created post
+        */
+       public Post createPost(Sone sone, Sone recipient, 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);
+               if (recipient != null) {
+                       post.setRecipient(recipient);
+               }
                synchronized (posts) {
                        posts.put(post.getId(), post);
                }
@@ -1148,6 +1328,7 @@ public class Core implements IdentityListener {
                }
                sone.addPost(post);
                saveSone(sone);
+               return post;
        }
 
        /**
@@ -1169,6 +1350,23 @@ 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);
+                               saveConfiguration();
+                       }
+               }
+       }
+
+       /**
         * Creates a new reply.
         *
         * @param sone
@@ -1233,6 +1431,23 @@ 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);
+                               saveConfiguration();
+                       }
+               }
+       }
+
+       /**
         * Starts the core.
         */
        public void start() {
@@ -1248,10 +1463,69 @@ public class Core implements IdentityListener {
                                soneInserter.stop();
                        }
                }
+               soneDownloader.stop();
                saveConfiguration();
                stopped = true;
        }
 
+       /**
+        * Saves the current options.
+        */
+       public void saveConfiguration() {
+               synchronized (configuration) {
+                       if (storingConfiguration) {
+                               logger.log(Level.FINE, "Already storing configuration…");
+                               return;
+                       }
+                       storingConfiguration = true;
+               }
+
+               /* 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);
+               } finally {
+                       synchronized (configuration) {
+                               storingConfiguration = false;
+                       }
+               }
+       }
+
        //
        // PRIVATE METHODS
        //
@@ -1327,49 +1601,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
@@ -1397,6 +1628,7 @@ public class Core implements IdentityListener {
        public void ownIdentityAdded(OwnIdentity ownIdentity) {
                logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity);
                if (ownIdentity.hasContext("Sone")) {
+                       trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet<Identity>()));
                        addLocalSone(ownIdentity);
                }
        }
@@ -1407,14 +1639,16 @@ public class Core implements IdentityListener {
        @Override
        public void ownIdentityRemoved(OwnIdentity ownIdentity) {
                logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
+               trustedIdentities.remove(ownIdentity);
        }
 
        /**
         * {@inheritDoc}
         */
        @Override
-       public void identityAdded(Identity identity) {
+       public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
                logger.log(Level.FINEST, "Adding Identity: " + identity);
+               trustedIdentities.get(ownIdentity).add(identity);
                addRemoteSone(identity);
        }
 
@@ -1422,7 +1656,7 @@ public class Core implements IdentityListener {
         * {@inheritDoc}
         */
        @Override
-       public void identityUpdated(final Identity identity) {
+       public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
                new Thread(new Runnable() {
 
                        @Override
@@ -1438,8 +1672,8 @@ public class Core implements IdentityListener {
         * {@inheritDoc}
         */
        @Override
-       public void identityRemoved(Identity identity) {
-               /* TODO */
+       public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
+               trustedIdentities.get(ownIdentity).remove(identity);
        }
 
 }