Move avatar from options to profile.

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

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 44f8bbc..4d9878f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;
@@ -189,6 +190,7 @@ public class SoneInserter extends AbstractService {
        @Override
        protected void serviceRun() {
                long lastModificationTime = 0;
+               String lastInsertedFingerprint = lastInsertFingerprint;
                String lastFingerprint = "";
                while (!shouldStop()) { try {
                        /* check every seconds. */
@@ -198,7 +200,7 @@ public class SoneInserter extends AbstractService {
                        if (core.isLocked(sone)) {
                                /* trigger redetection when the Sone is unlocked. */
                                synchronized (sone) {
-                                       modified = !sone.getFingerprint().equals(lastInsertFingerprint);
+                                       modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
                                }
                                lastFingerprint = "";
                                lastModificationTime = 0;
@@ -209,7 +211,7 @@ public class SoneInserter extends AbstractService {
                        synchronized (sone) {
                                String fingerprint = sone.getFingerprint();
                                if (!fingerprint.equals(lastFingerprint)) {
-                                       if (fingerprint.equals(lastInsertFingerprint)) {
+                                       if (fingerprint.equals(lastInsertedFingerprint)) {
                                                modified = false;
                                                lastModificationTime = 0;
                                                logger.log(Level.FINE, "Sone %s has been reverted to last insert state.", sone);
@@ -221,7 +223,7 @@ public class SoneInserter extends AbstractService {
                                        lastFingerprint = fingerprint;
                                }
                                if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
-                                       lastInsertFingerprint = fingerprint;
+                                       lastInsertedFingerprint = fingerprint;
                                        insertInformation = new InsertInformation(sone);
                                }
                        }
@@ -260,9 +262,11 @@ public class SoneInserter extends AbstractService {
                                 */
                                if (success) {
                                        synchronized (sone) {
-                                               if (lastInsertFingerprint.equals(sone.getFingerprint())) {
+                                               if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
                                                        logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
                                                        lastModificationTime = 0;
+                                                       lastInsertFingerprint = lastInsertedFingerprint;
+                                                       core.touchConfiguration();
                                                        modified = false;
                                                }
                                        }
@@ -299,10 +303,10 @@ public class SoneInserter extends AbstractService {
                        soneProperties.put("insertUri", sone.getInsertUri());
                        soneProperties.put("profile", sone.getProfile());
                        soneProperties.put("posts", new ListBuilder<Post>(new ArrayList<Post>(sone.getPosts())).sort(Post.TIME_COMPARATOR).get());
-                       soneProperties.put("replies", new ListBuilder<Reply>(new ArrayList<Reply>(sone.getReplies())).sort(new ReverseComparator<Reply>(Reply.TIME_COMPARATOR)).get());
+                       soneProperties.put("replies", new ListBuilder<PostReply>(new ArrayList<PostReply>(sone.getReplies())).sort(new ReverseComparator<Reply<?>>(Reply.TIME_COMPARATOR)).get());
                        soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
                        soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
-                       soneProperties.put("albums", Sone.flattenAlbums(sone.getAlbums()));
+                       soneProperties.put("albums", sone.getAllAlbums());
                }
 
                //