Fix loading of local Sones without posts and replies.
[Sone.git] / src / main / java / net / pterodactylus / sone / database / memory / MemoryDatabase.java
index 2f77eed..561f14f 100644 (file)
 
 package net.pterodactylus.sone.database.memory;
 
+import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Predicates.not;
+import static com.google.common.collect.FluentIterable.from;
+import static java.lang.String.format;
+import static java.util.logging.Level.WARNING;
+import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR;
+import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
+import static net.pterodactylus.sone.data.Sone.toAllAlbums;
+import static net.pterodactylus.sone.data.Sone.toAllImages;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import net.pterodactylus.sone.core.ConfigurationSoneParser;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidAlbumFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
+import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Client;
+import net.pterodactylus.sone.data.Image;
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
+import net.pterodactylus.sone.data.impl.AlbumBuilderImpl;
+import net.pterodactylus.sone.data.impl.ImageBuilderImpl;
+import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
+import net.pterodactylus.sone.database.ImageBuilder;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostDatabase;
 import net.pterodactylus.sone.database.PostReplyBuilder;
+import net.pterodactylus.sone.database.SoneBuilder;
 import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.freenet.wot.OwnIdentity;
+import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.utils.Optionals;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.SortedSetMultimap;
+import com.google.common.collect.TreeMultimap;
+import com.google.common.primitives.Longs;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 /**
  * Memory-based {@link PostDatabase} implementation.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class MemoryDatabase extends AbstractService implements Database {
 
+       private static final Logger logger = Logger.getLogger("Sone.Database.Memory");
+       private static final String LATEST_EDITION_PROPERTY = "Sone.LatestEdition";
        /** The lock. */
        private final ReadWriteLock lock = new ReentrantReadWriteLock();
 
@@ -64,78 +105,385 @@ public class MemoryDatabase extends AbstractService implements Database {
 
        /** The configuration. */
        private final Configuration configuration;
+       private final ConfigurationLoader configurationLoader;
 
-       /** All posts by their ID. */
-       private final Map<String, Post> allPosts = new HashMap<String, Post>();
-
-       /** All posts by their Sones. */
-       private final Map<String, Collection<Post>> sonePosts = new HashMap<String, Collection<Post>>();
-
-       /** All posts by their recipient. */
-       private final Map<String, Collection<Post>> recipientPosts = new HashMap<String, Collection<Post>>();
-
-       /** Whether posts are known. */
-       private final Set<String> knownPosts = new HashSet<String>();
+       private final Set<String> localSones = new HashSet<String>();
+       private final Map<String, Sone> allSones = new HashMap<String, Sone>();
+       private final Map<String, String> lastInsertFingerprints = new HashMap<String, String>();
 
        /** All post replies by their ID. */
        private final Map<String, PostReply> allPostReplies = new HashMap<String, PostReply>();
 
-       /** Replies by post. */
-       private final Map<String, SortedSet<PostReply>> postReplies = new HashMap<String, SortedSet<PostReply>>();
+       /** Replies sorted by Sone. */
+       private final SortedSetMultimap<String, PostReply> sonePostReplies = TreeMultimap.create(new Comparator<String>() {
+
+               @Override
+               public int compare(String leftString, String rightString) {
+                       return leftString.compareTo(rightString);
+               }
+       }, TIME_COMPARATOR);
 
        /** Whether post replies are known. */
        private final Set<String> knownPostReplies = new HashSet<String>();
 
+       private final Map<String, Album> allAlbums = new HashMap<String, Album>();
+       private final Multimap<String, Album> soneAlbums = HashMultimap.create();
+
+       private final Map<String, Image> allImages = new HashMap<String, Image>();
+       private final Multimap<String, Image> soneImages = HashMultimap.create();
+
+       private final MemorySoneDatabase soneDatabase;
+       private final MemoryPostDatabase postDatabase;
+       private final MemoryBookmarkDatabase memoryBookmarkDatabase;
+       private final MemoryFriendDatabase memoryFriendDatabase;
+
        /**
         * Creates a new memory database.
         *
         * @param soneProvider
-        *            The Sone provider
+        *              The Sone provider
         * @param configuration
-        *            The configuration for loading and saving elements
+        *              The configuration for loading and saving elements
         */
        @Inject
        public MemoryDatabase(SoneProvider soneProvider, Configuration configuration) {
                this.soneProvider = soneProvider;
                this.configuration = configuration;
+               this.configurationLoader = new ConfigurationLoader(configuration);
+               soneDatabase = new MemorySoneDatabase(configurationLoader);
+               postDatabase = new MemoryPostDatabase(this, configurationLoader);
+               memoryBookmarkDatabase =
+                               new MemoryBookmarkDatabase(this, configurationLoader);
+               memoryFriendDatabase = new MemoryFriendDatabase(configurationLoader);
        }
 
        //
        // DATABASE METHODS
        //
 
+       @Override
+       public Optional<LocalSone> getLocalSone(String localSoneId) {
+               lock.readLock().lock();
+               try {
+                       if (!localSones.contains(localSoneId)) {
+                               return Optional.absent();
+                       }
+                       return Optional.of((LocalSone) allSones.get(localSoneId));
+               } finally {
+                       lock.readLock().unlock();
+               }
+       }
+
+       @Override
+       public LocalSone registerLocalSone(OwnIdentity ownIdentity) {
+               final LocalSone localSone = loadLocalSone(ownIdentity);
+               localSones.add(ownIdentity.getId());
+               return localSone;
+       }
+
+       private LocalSone loadLocalSone(OwnIdentity ownIdentity) {
+               final SoneBuilder soneBuilder = newSoneBuilder().from(ownIdentity).using(
+                               new Client("Sone", SonePlugin.VERSION.toString()));
+
+               loadElements(soneBuilder, ownIdentity.getId());
+
+               LocalSone localSone = soneBuilder.buildLocal();
+               loadSone(localSone);
+               localSone.setKnown(true);
+               localSone.setLatestEdition(
+                               Optional.fromNullable(
+                                               Longs.tryParse(ownIdentity.getProperty(LATEST_EDITION_PROPERTY)))
+                               .or(0L));
+               return localSone;
+       }
+
+       private void loadElements(SoneBuilder soneBuilder, String soneId) {
+               ConfigurationSoneParser configurationSoneParser = new ConfigurationSoneParser(configuration, soneId);
+
+               try {
+                       Set<Post> posts = configurationSoneParser.parsePosts(this);
+                       soneBuilder.withPosts(posts);
+                       for (Post post : posts) {
+                               post.setKnown(true);
+                       }
+               } catch (InvalidPostFound ipf) {
+                       logger.log(Level.WARNING, "Invalid post found, aborting load!");
+                       return;
+               }
+
+               try {
+                       Set<PostReply> postReplies = configurationSoneParser.parsePostReplies(this);
+                       soneBuilder.withPostReplies(postReplies);
+                       for (PostReply reply : postReplies) {
+                               reply.setKnown(true);
+                       }
+               } catch (InvalidPostReplyFound iprf) {
+                       logger.log(Level.WARNING, "Invalid reply found, aborting load!");
+                       return;
+               }
+       }
+
+       private void loadSone(LocalSone sone) {
+               long soneTime = configurationLoader.getLocalSoneTime(sone.getId());
+               if (soneTime == -1) {
+                       return;
+               }
+
+               /* load profile. */
+               ConfigurationSoneParser configurationSoneParser = new ConfigurationSoneParser(configuration, sone.getId());
+               Profile profile = configurationSoneParser.parseProfile(sone);
+
+               /* load post likes. */
+               Set<String> likedPostIds = configurationSoneParser.parseLikedPostIds();
+
+               /* load reply likes. */
+               Set<String> likedReplyIds = configurationSoneParser.parseLikedPostReplyIds();
+
+               /* load albums. */
+               List<Album> topLevelAlbums;
+               try {
+                       topLevelAlbums = configurationSoneParser.parseTopLevelAlbums(this, sone);
+               } catch (InvalidAlbumFound iaf) {
+                       logger.log(Level.WARNING, "Invalid album found, aborting load!");
+                       return;
+               } catch (InvalidParentAlbumFound ipaf) {
+                       logger.log(Level.WARNING,
+                                       format("Invalid parent album ID: %s", ipaf.getAlbumParentId()));
+                       return;
+               }
+
+               /* load images. */
+               try {
+                       configurationSoneParser.parseImages(this, sone);
+               } catch (InvalidImageFound iif) {
+                       logger.log(WARNING, "Invalid image found, aborting load!");
+                       return;
+               } catch (InvalidParentAlbumFound ipaf) {
+                       logger.log(Level.WARNING,
+                                       format("Invalid album image (%s) encountered, aborting load!",
+                                                       ipaf.getAlbumParentId()));
+                       return;
+               }
+
+               /* load avatar. */
+               String sonePrefix = "Sone/" + sone.getId();
+               String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
+               if (avatarId != null) {
+                       final Map<String, Image> images = configurationSoneParser.getImages();
+                       profile.setAvatar(images.get(avatarId));
+               }
+
+               /* load options. */
+               sone.getOptions().setAutoFollow(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
+               sone.getOptions().setSoneInsertNotificationEnabled(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
+               sone.getOptions().setShowNewSoneNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null));
+               sone.getOptions().setShowNewPostNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null));
+               sone.getOptions().setShowNewReplyNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null));
+               sone.getOptions().setShowCustomAvatars(ShowCustomAvatars.valueOf(
+                               configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars")
+                                               .getValue(ShowCustomAvatars.NEVER.name())));
+
+               /* if we’re still here, Sone was loaded successfully. */
+               lock.writeLock().lock();
+               try {
+                       updateSoneTime(sone, soneTime);
+                       sone.setProfile(profile);
+                       sone.setLikePostIds(likedPostIds);
+                       sone.setLikeReplyIds(likedReplyIds);
+
+                       String lastInsertFingerprint = configurationLoader.getLastInsertFingerprint(sone.getId());
+                       lastInsertFingerprints.put(sone.getId(), lastInsertFingerprint);
+
+                       allSones.put(sone.getId(), sone);
+                       storePosts(sone.getId(), sone.getPosts());
+                       storePostReplies(sone.getId(), sone.getReplies());
+                       storeAlbums(sone.getId(), topLevelAlbums);
+                       storeImages(sone.getId(), from(topLevelAlbums).transformAndConcat(Album.FLATTENER).transformAndConcat(Album.IMAGES).toList());
+               } finally {
+                       lock.writeLock().unlock();
+               }
+
+               logger.info(String.format("Sone loaded successfully: %s", sone));
+       }
+
+       @Override
+       public String getLastInsertFingerprint(Sone sone) {
+               lock.readLock().lock();
+               try {
+                       if (!lastInsertFingerprints.containsKey(sone.getId())) {
+                               return "";
+                       }
+                       return lastInsertFingerprints.get(sone.getId());
+               } finally {
+                       lock.readLock().unlock();
+               }
+       }
+
+       @Override
+       public void setLastInsertFingerprint(Sone sone, String lastInsertFingerprint) {
+               lock.writeLock().lock();
+               try {
+                       lastInsertFingerprints.put(sone.getId(), lastInsertFingerprint);
+               } finally {
+                       lock.writeLock().unlock();
+               }
+       }
+
        /**
         * Saves the database.
         *
         * @throws DatabaseException
-        *             if an error occurs while saving
+        *              if an error occurs while saving
         */
        @Override
        public void save() throws DatabaseException {
-               saveKnownPosts();
-               saveKnownPostReplies();
+               lock.writeLock().lock();
+               try {
+                       saveKnownPostReplies();
+                       for (Sone localSone : from(localSones).transform(soneLoader()).transform(Optionals.<Sone>get())) {
+                               saveSone(localSone);
+                       }
+               } finally {
+                       lock.writeLock().unlock();
+               }
+       }
+
+       private synchronized void saveSone(Sone sone) {
+               logger.log(Level.INFO, String.format("Saving Sone: %s", sone));
+               try {
+                       /* save Sone into configuration. */
+                       String sonePrefix = "Sone/" + sone.getId();
+                       configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
+                       configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(lastInsertFingerprints.get(sone.getId()));
+
+                       /* save profile. */
+                       Profile profile = sone.getProfile();
+                       configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName());
+                       configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName());
+                       configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName());
+                       configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
+                       configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
+                       configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+                       configuration.getStringValue(sonePrefix + "/Profile/Avatar").setValue(profile.getAvatar());
+
+                       /* save profile fields. */
+                       int fieldCounter = 0;
+                       for (Field profileField : profile.getFields()) {
+                               String fieldPrefix = sonePrefix + "/Profile/Fields/" + fieldCounter++;
+                               configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getName());
+                               configuration.getStringValue(fieldPrefix + "/Value").setValue(profileField.getValue());
+                       }
+                       configuration.getStringValue(sonePrefix + "/Profile/Fields/" + fieldCounter + "/Name").setValue(null);
+
+                       /* save posts. */
+                       int postCounter = 0;
+                       for (Post post : sone.getPosts()) {
+                               String postPrefix = sonePrefix + "/Posts/" + postCounter++;
+                               configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+                               configuration.getStringValue(postPrefix + "/Recipient").setValue(post.getRecipientId().orNull());
+                               configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
+                               configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
+                       }
+                       configuration.getStringValue(sonePrefix + "/Posts/" + postCounter + "/ID").setValue(null);
+
+                       /* save replies. */
+                       int replyCounter = 0;
+                       for (PostReply reply : sone.getReplies()) {
+                               String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
+                               configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
+                               configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId());
+                               configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
+                               configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
+                       }
+                       configuration.getStringValue(sonePrefix + "/Replies/" + replyCounter + "/ID").setValue(null);
+
+                       /* save post likes. */
+                       int postLikeCounter = 0;
+                       for (String postId : sone.getLikedPostIds()) {
+                               configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter++ + "/ID").setValue(postId);
+                       }
+                       configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter + "/ID").setValue(null);
+
+                       /* save reply likes. */
+                       int replyLikeCounter = 0;
+                       for (String replyId : sone.getLikedReplyIds()) {
+                               configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter++ + "/ID").setValue(replyId);
+                       }
+                       configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
+
+                       /* save albums. first, collect in a flat structure, top-level first. */
+                       List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();
+
+                       int albumCounter = 0;
+                       for (Album album : albums) {
+                               String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
+                               configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
+                               configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
+                               configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
+                               configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
+                               configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
+                       }
+                       configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);
+
+                       /* save images. */
+                       int imageCounter = 0;
+                       for (Album album : albums) {
+                               for (Image image : album.getImages()) {
+                                       if (!image.isInserted()) {
+                                               continue;
+                                       }
+                                       String imagePrefix = sonePrefix + "/Images/" + imageCounter++;
+                                       configuration.getStringValue(imagePrefix + "/ID").setValue(image.getId());
+                                       configuration.getStringValue(imagePrefix + "/Album").setValue(album.getId());
+                                       configuration.getStringValue(imagePrefix + "/Key").setValue(image.getKey());
+                                       configuration.getStringValue(imagePrefix + "/Title").setValue(image.getTitle());
+                                       configuration.getStringValue(imagePrefix + "/Description").setValue(image.getDescription());
+                                       configuration.getLongValue(imagePrefix + "/CreationTime").setValue(image.getCreationTime());
+                                       configuration.getIntValue(imagePrefix + "/Width").setValue(image.getWidth());
+                                       configuration.getIntValue(imagePrefix + "/Height").setValue(image.getHeight());
+                               }
+                       }
+                       configuration.getStringValue(sonePrefix + "/Images/" + imageCounter + "/ID").setValue(null);
+
+                       /* save options. */
+                       configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").setValue(sone.getOptions().isAutoFollow());
+                       configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().isSoneInsertNotificationEnabled());
+                       configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").setValue(sone.getOptions().isShowNewSoneNotifications());
+                       configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").setValue(sone.getOptions().isShowNewPostNotifications());
+                       configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").setValue(sone.getOptions().isShowNewReplyNotifications());
+                       configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions().getShowCustomAvatars().name());
+
+                       configuration.save();
+
+                       logger.log(Level.INFO, String.format("Sone %s saved.", sone));
+               } catch (ConfigurationException ce1) {
+                       logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1);
+               }
        }
 
        //
        // SERVICE METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        protected void doStart() {
-               loadKnownPosts();
+               soneDatabase.start();
+               memoryFriendDatabase.start();
+               postDatabase.start();
+               memoryBookmarkDatabase.start();
                loadKnownPostReplies();
                notifyStarted();
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        protected void doStop() {
                try {
+                       soneDatabase.stop();
+                       memoryFriendDatabase.stop();
+                       postDatabase.stop();
+                       memoryBookmarkDatabase.stop();
                        save();
                        notifyStopped();
                } catch (DatabaseException de1) {
@@ -143,184 +491,258 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       //
-       // POSTPROVIDER METHODS
-       //
+       @Override
+       public SoneBuilder newSoneBuilder() {
+               return new MemorySoneBuilder(this);
+       }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public Optional<Post> getPost(String postId) {
-               lock.readLock().lock();
+       public void storeSone(Sone sone) {
+               lock.writeLock().lock();
                try {
-                       return Optional.fromNullable(allPosts.get(postId));
+                       removeSone(sone);
+
+                       allSones.put(sone.getId(), sone);
+                       storePosts(sone.getId(), sone.getPosts());
+                       storePostReplies(sone.getId(), sone.getReplies());
+                       storeAlbums(sone.getId(), toAllAlbums.apply(sone));
+                       storeImages(sone.getId(), toAllImages.apply(sone));
                } finally {
-                       lock.readLock().unlock();
+                       lock.writeLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public Collection<Post> getPosts(String soneId) {
-               return new HashSet<Post>(getPostsFrom(soneId));
+       public boolean isSoneKnown(Sone sone) {
+               return soneDatabase.isKnownSone(sone.getId());
        }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public Collection<Post> getDirectedPosts(String recipientId) {
-               lock.readLock().lock();
-               try {
-                       Collection<Post> posts = recipientPosts.get(recipientId);
-                       return (posts == null) ? Collections.<Post> emptySet() : new HashSet<Post>(posts);
-               } finally {
-                       lock.readLock().unlock();
-               }
+       public void setSoneKnown(Sone sone) {
+               soneDatabase.setSoneKnown(sone.getId());
        }
 
-       //
-       // POSTBUILDERFACTORY METHODS
-       //
-
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public PostBuilder newPostBuilder() {
-               return new MemoryPostBuilder(this, soneProvider);
+       public void updateSoneTime(Sone sone, long soneTime) {
+               soneDatabase.updateSoneTime(sone.getId(), soneTime);
        }
 
-       //
-       // POSTSTORE METHODS
-       //
+       private void storePosts(String soneId, Collection<Post> posts) {
+               postDatabase.storePosts(soneId, posts);
+       }
+
+       private void storePostReplies(String soneId, Collection<PostReply> postReplies) {
+               sonePostReplies.putAll(soneId, postReplies);
+               for (PostReply postReply : postReplies) {
+                       allPostReplies.put(postReply.getId(), postReply);
+               }
+       }
+
+       private void storeAlbums(String soneId, Collection<Album> albums) {
+               soneAlbums.putAll(soneId, albums);
+               for (Album album : albums) {
+                       allAlbums.put(album.getId(), album);
+               }
+       }
+
+       private void storeImages(String soneId, Collection<Image> images) {
+               soneImages.putAll(soneId, images);
+               for (Image image : images) {
+                       allImages.put(image.getId(), image);
+               }
+       }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public void storePost(Post post) {
-               checkNotNull(post, "post must not be null");
+       public void removeSone(Sone sone) {
                lock.writeLock().lock();
                try {
-                       allPosts.put(post.getId(), post);
-                       getPostsFrom(post.getSone().getId()).add(post);
-                       if (post.getRecipientId().isPresent()) {
-                               getPostsTo(post.getRecipientId().get()).add(post);
+                       allSones.remove(sone.getId());
+                       postDatabase.removePostsFor(sone.getId());
+                       Collection<PostReply> removedPostReplies =
+                                       sonePostReplies.removeAll(sone.getId());
+                       for (PostReply removedPostReply : removedPostReplies) {
+                               allPostReplies.remove(removedPostReply.getId());
+                       }
+                       Collection<Album> removedAlbums =
+                                       soneAlbums.removeAll(sone.getId());
+                       for (Album removedAlbum : removedAlbums) {
+                               allAlbums.remove(removedAlbum.getId());
+                       }
+                       Collection<Image> removedImages =
+                                       soneImages.removeAll(sone.getId());
+                       for (Image removedImage : removedImages) {
+                               allImages.remove(removedImage.getId());
                        }
                } finally {
                        lock.writeLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public void removePost(Post post) {
-               checkNotNull(post, "post must not be null");
-               lock.writeLock().lock();
-               try {
-                       allPosts.remove(post.getId());
-                       getPostsFrom(post.getSone().getId()).remove(post);
-                       if (post.getRecipientId().isPresent()) {
-                               getPostsTo(post.getRecipientId().get()).remove(post);
+       public Function<String, Optional<Sone>> soneLoader() {
+               return new Function<String, Optional<Sone>>() {
+                       @Override
+                       public Optional<Sone> apply(String soneId) {
+                               return getSone(soneId);
                        }
-                       post.getSone().removePost(post);
+               };
+       }
+
+       @Override
+       public Optional<Sone> getSone(String soneId) {
+               lock.readLock().lock();
+               try {
+                       return fromNullable(allSones.get(soneId));
                } finally {
-                       lock.writeLock().unlock();
+                       lock.readLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public void storePosts(Sone sone, Collection<Post> posts) throws IllegalArgumentException {
-               checkNotNull(sone, "sone must not be null");
-               /* verify that all posts are from the same Sone. */
-               for (Post post : posts) {
-                       if (!sone.equals(post.getSone())) {
-                               throw new IllegalArgumentException(String.format("Post from different Sone found: %s", post));
-                       }
+       public Collection<Sone> getSones() {
+               lock.readLock().lock();
+               try {
+                       return new HashSet<Sone>(allSones.values());
+               } finally {
+                       lock.readLock().unlock();
                }
+       }
 
-               lock.writeLock().lock();
+       @Override
+       public Collection<LocalSone> getLocalSones() {
+               lock.readLock().lock();
                try {
-                       /* remove all posts by the Sone. */
-                       getPostsFrom(sone.getId()).clear();
-                       for (Post post : posts) {
-                               allPosts.remove(post.getId());
-                               if (post.getRecipientId().isPresent()) {
-                                       getPostsTo(post.getRecipientId().get()).remove(post);
+                       return from(allSones.values()).filter(LOCAL_SONE_FILTER).transform(new Function<Sone, LocalSone>() {
+                               @Override
+                               public LocalSone apply(Sone sone) {
+                                       // FIXME – Sones will not always implement LocalSone
+                                       return (LocalSone) sone;
                                }
-                       }
-
-                       /* add new posts. */
-                       getPostsFrom(sone.getId()).addAll(posts);
-                       for (Post post : posts) {
-                               allPosts.put(post.getId(), post);
-                               if (post.getRecipientId().isPresent()) {
-                                       getPostsTo(post.getRecipientId().get()).add(post);
-                               }
-                       }
+                       }).toSet();
                } finally {
-                       lock.writeLock().unlock();
+                       lock.readLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public void removePosts(Sone sone) {
-               checkNotNull(sone, "sone must not be null");
-               lock.writeLock().lock();
+       public Collection<Sone> getRemoteSones() {
+               lock.readLock().lock();
                try {
-                       /* remove all posts by the Sone. */
-                       getPostsFrom(sone.getId()).clear();
-                       for (Post post : sone.getPosts()) {
-                               allPosts.remove(post.getId());
-                               if (post.getRecipientId().isPresent()) {
-                                       getPostsTo(post.getRecipientId().get()).remove(post);
-                               }
-                       }
+                       return from(allSones.values())
+                                       .filter(not(LOCAL_SONE_FILTER)) .toSet();
                } finally {
-                       lock.writeLock().unlock();
+                       lock.readLock().unlock();
                }
        }
 
+       @Override
+       public Collection<String> getFriends(LocalSone localSone) {
+               if (!localSone.isLocal()) {
+                       return Collections.emptySet();
+               }
+               return memoryFriendDatabase.getFriends(localSone.getId());
+       }
+
+       @Override
+       public Optional<Long> getSoneFollowingTime(String remoteSoneId) {
+               return memoryFriendDatabase.getSoneFollowingTime(remoteSoneId);
+       }
+
+       @Override
+       public boolean isFriend(LocalSone localSone, String friendSoneId) {
+               if (!localSone.isLocal()) {
+                       return false;
+               }
+               return memoryFriendDatabase.isFriend(localSone.getId(), friendSoneId);
+       }
+
+       @Override
+       public void addFriend(LocalSone localSone, String friendSoneId) {
+               memoryFriendDatabase.addFriend(localSone.getId(), friendSoneId);
+       }
+
+       @Override
+       public void removeFriend(LocalSone localSone, String friendSoneId) {
+               memoryFriendDatabase.removeFriend(localSone.getId(), friendSoneId);
+       }
+
+       //
+       // POSTPROVIDER METHODS
+       //
+
+       /** {@inheritDocs} */
+       @Override
+       public Optional<Post> getPost(String postId) {
+               return postDatabase.getPost(postId);
+       }
+
+       /** {@inheritDocs} */
+       @Override
+       public Collection<Post> getPosts(String soneId) {
+               return new HashSet<Post>(getPostsFrom(soneId));
+       }
+
+       /** {@inheritDocs} */
+       @Override
+       public Collection<Post> getDirectedPosts(final String recipientId) {
+               return postDatabase.getDirectedPosts(recipientId);
+       }
+
+       //
+       // POSTBUILDERFACTORY METHODS
+       //
+
+       /** {@inheritDocs} */
+       @Override
+       public PostBuilder newPostBuilder() {
+               return new MemoryPostBuilder(this, soneProvider);
+       }
+
+       //
+       // POSTSTORE METHODS
+       //
+
+       /** {@inheritDocs} */
+       @Override
+       public void storePost(Post post) {
+               checkNotNull(post, "post must not be null");
+               postDatabase.storePost(post);
+       }
+
+       /** {@inheritDocs} */
+       @Override
+       public void removePost(Post post) {
+               checkNotNull(post, "post must not be null");
+               postDatabase.removePost(post.getId());
+       }
+
        //
        // POSTREPLYPROVIDER METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public Optional<PostReply> getPostReply(String id) {
                lock.readLock().lock();
                try {
-                       return Optional.fromNullable(allPostReplies.get(id));
+                       return fromNullable(allPostReplies.get(id));
                } finally {
                        lock.readLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
-       public List<PostReply> getReplies(String postId) {
+       public List<PostReply> getReplies(final String postId) {
                lock.readLock().lock();
                try {
-                       if (!postReplies.containsKey(postId)) {
-                               return Collections.emptyList();
-                       }
-                       return new ArrayList<PostReply>(postReplies.get(postId));
+                       return from(allPostReplies.values())
+                                       .filter(new Predicate<PostReply>() {
+                                               @Override
+                                               public boolean apply(PostReply postReply) {
+                                                       return postReply.getPostId().equals(postId);
+                                               }
+                                       }).toSortedList(TIME_COMPARATOR);
                } finally {
                        lock.readLock().unlock();
                }
@@ -330,9 +752,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        // POSTREPLYBUILDERFACTORY METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public PostReplyBuilder newPostReplyBuilder() {
                return new MemoryPostReplyBuilder(this, soneProvider);
@@ -342,92 +762,146 @@ public class MemoryDatabase extends AbstractService implements Database {
        // POSTREPLYSTORE METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public void storePostReply(PostReply postReply) {
                lock.writeLock().lock();
                try {
                        allPostReplies.put(postReply.getId(), postReply);
-                       if (postReplies.containsKey(postReply.getPostId())) {
-                               postReplies.get(postReply.getPostId()).add(postReply);
-                       } else {
-                               TreeSet<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                               replies.add(postReply);
-                               postReplies.put(postReply.getPostId(), replies);
-                       }
                } finally {
                        lock.writeLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
-       public void storePostReplies(Sone sone, Collection<PostReply> postReplies) {
-               checkNotNull(sone, "sone must not be null");
-               /* verify that all posts are from the same Sone. */
-               for (PostReply postReply : postReplies) {
-                       if (!sone.equals(postReply.getSone())) {
-                               throw new IllegalArgumentException(String.format("PostReply from different Sone found: %s", postReply));
-                       }
+       public void removePostReply(PostReply postReply) {
+               lock.writeLock().lock();
+               try {
+                       allPostReplies.remove(postReply.getId());
+               } finally {
+                       lock.writeLock().unlock();
                }
+       }
+
+       //
+       // ALBUMPROVDER METHODS
+       //
 
+       @Override
+       public Optional<Album> getAlbum(String albumId) {
+               lock.readLock().lock();
+               try {
+                       return fromNullable(allAlbums.get(albumId));
+               } finally {
+                       lock.readLock().unlock();
+               }
+       }
+
+       //
+       // ALBUMBUILDERFACTORY METHODS
+       //
+
+       @Override
+       public AlbumBuilder newAlbumBuilder() {
+               return new AlbumBuilderImpl();
+       }
+
+       //
+       // ALBUMSTORE METHODS
+       //
+
+       @Override
+       public void storeAlbum(Album album) {
                lock.writeLock().lock();
                try {
-                       for (PostReply postReply : postReplies) {
-                               allPostReplies.put(postReply.getId(), postReply);
-                               if (this.postReplies.containsKey(postReply.getPostId())) {
-                                       this.postReplies.get(postReply.getPostId()).add(postReply);
-                               } else {
-                                       TreeSet<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                                       replies.add(postReply);
-                                       this.postReplies.put(postReply.getPostId(), replies);
-                               }
-                       }
+                       allAlbums.put(album.getId(), album);
+                       soneAlbums.put(album.getSone().getId(), album);
                } finally {
                        lock.writeLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
        @Override
-       public void removePostReply(PostReply postReply) {
+       public void removeAlbum(Album album) {
                lock.writeLock().lock();
                try {
-                       allPostReplies.remove(postReply.getId());
-                       if (postReplies.containsKey(postReply.getPostId())) {
-                               postReplies.get(postReply.getPostId()).remove(postReply);
-                               if (postReplies.get(postReply.getPostId()).isEmpty()) {
-                                       postReplies.remove(postReply.getPostId());
-                               }
-                       }
+                       allAlbums.remove(album.getId());
+                       soneAlbums.remove(album.getSone().getId(), album);
                } finally {
                        lock.writeLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       //
+       // IMAGEPROVIDER METHODS
+       //
+
        @Override
-       public void removePostReplies(Sone sone) {
-               checkNotNull(sone, "sone must not be null");
+       public Optional<Image> getImage(String imageId) {
+               lock.readLock().lock();
+               try {
+                       return fromNullable(allImages.get(imageId));
+               } finally {
+                       lock.readLock().unlock();
+               }
+       }
 
+       //
+       // IMAGEBUILDERFACTORY METHODS
+       //
+
+       @Override
+       public ImageBuilder newImageBuilder() {
+               return new ImageBuilderImpl();
+       }
+
+       //
+       // IMAGESTORE METHODS
+       //
+
+       @Override
+       public void storeImage(Image image) {
                lock.writeLock().lock();
                try {
-                       for (PostReply postReply : sone.getReplies()) {
-                               removePostReply(postReply);
-                       }
+                       allImages.put(image.getId(), image);
+                       soneImages.put(image.getSone().getId(), image);
                } finally {
                        lock.writeLock().unlock();
                }
        }
 
+       @Override
+       public void removeImage(Image image) {
+               lock.writeLock().lock();
+               try {
+                       allImages.remove(image.getId());
+                       soneImages.remove(image.getSone().getId(), image);
+               } finally {
+                       lock.writeLock().unlock();
+               }
+       }
+
+       @Override
+       public void bookmarkPost(Post post) {
+               memoryBookmarkDatabase.bookmarkPost(post);
+       }
+
+       @Override
+       public void unbookmarkPost(Post post) {
+               memoryBookmarkDatabase.unbookmarkPost(post);
+       }
+
+       @Override
+       public boolean isPostBookmarked(Post post) {
+               return memoryBookmarkDatabase.isPostBookmarked(post);
+       }
+
+       @Override
+       public Set<Post> getBookmarkedPosts() {
+               return memoryBookmarkDatabase.getBookmarkedPosts();
+       }
+
        //
        // PACKAGE-PRIVATE METHODS
        //
@@ -436,44 +910,30 @@ public class MemoryDatabase extends AbstractService implements Database {
         * Returns whether the given post is known.
         *
         * @param post
-        *            The post
+        *              The post
         * @return {@code true} if the post is known, {@code false} otherwise
         */
        boolean isPostKnown(Post post) {
-               lock.readLock().lock();
-               try {
-                       return knownPosts.contains(post.getId());
-               } finally {
-                       lock.readLock().unlock();
-               }
+               return postDatabase.isPostKnown(post.getId());
        }
 
        /**
         * Sets whether the given post is known.
         *
         * @param post
-        *            The post
+        *              The post
         * @param known
-        *            {@code true} if the post is known, {@code false} otherwise
+        *              {@code true} if the post is known, {@code false} otherwise
         */
        void setPostKnown(Post post, boolean known) {
-               lock.writeLock().lock();
-               try {
-                       if (known) {
-                               knownPosts.add(post.getId());
-                       } else {
-                               knownPosts.remove(post.getId());
-                       }
-               } finally {
-                       lock.writeLock().unlock();
-               }
+               postDatabase.setPostKnown(post.getId(), known);
        }
 
        /**
         * Returns whether the given post reply is known.
         *
         * @param postReply
-        *            The post reply
+        *              The post reply
         * @return {@code true} if the given post reply is known, {@code false}
         *         otherwise
         */
@@ -490,10 +950,9 @@ public class MemoryDatabase extends AbstractService implements Database {
         * Sets whether the given post reply is known.
         *
         * @param postReply
-        *            The post reply
+        *              The post reply
         * @param known
-        *            {@code true} if the post reply is known, {@code false}
-        *            otherwise
+        *              {@code true} if the post reply is known, {@code false} otherwise
         */
        void setPostReplyKnown(PostReply postReply, boolean known) {
                lock.writeLock().lock();
@@ -517,117 +976,20 @@ public class MemoryDatabase extends AbstractService implements Database {
         * none yet.
         *
         * @param soneId
-        *            The ID of the Sone to get the posts for
+        *              The ID of the Sone to get the posts for
         * @return All posts
         */
        private Collection<Post> getPostsFrom(String soneId) {
-               Collection<Post> posts = null;
-               lock.readLock().lock();
-               try {
-                       posts = sonePosts.get(soneId);
-               } finally {
-                       lock.readLock().unlock();
-               }
-               if (posts != null) {
-                       return posts;
-               }
-
-               posts = new HashSet<Post>();
-               lock.writeLock().lock();
-               try {
-                       sonePosts.put(soneId, posts);
-               } finally {
-                       lock.writeLock().unlock();
-               }
-
-               return posts;
+               return postDatabase.getPostsFrom(soneId);
        }
 
-       /**
-        * Gets all posts that are directed the given Sone, creating a new
-        * collection if there is none yet.
-        *
-        * @param recipientId
-        *            The ID of the Sone to get the posts for
-        * @return All posts
-        */
-       private Collection<Post> getPostsTo(String recipientId) {
-               Collection<Post> posts = null;
-               lock.readLock().lock();
-               try {
-                       posts = recipientPosts.get(recipientId);
-               } finally {
-                       lock.readLock().unlock();
-               }
-               if (posts != null) {
-                       return posts;
-               }
-
-               posts = new HashSet<Post>();
-               lock.writeLock().lock();
-               try {
-                       recipientPosts.put(recipientId, posts);
-               } finally {
-                       lock.writeLock().unlock();
-               }
-
-               return posts;
-       }
-
-       /**
-        * Loads the known posts.
-        */
-       private void loadKnownPosts() {
-               lock.writeLock().lock();
-               try {
-                       int postCounter = 0;
-                       while (true) {
-                               String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
-                               if (knownPostId == null) {
-                                       break;
-                               }
-                               knownPosts.add(knownPostId);
-                       }
-               } finally {
-                       lock.writeLock().unlock();
-               }
-       }
-
-       /**
-        * Saves the known posts to the configuration.
-        *
-        * @throws DatabaseException
-        *             if a configuration error occurs
-        */
-       private void saveKnownPosts() throws DatabaseException {
-               lock.readLock().lock();
-               try {
-                       int postCounter = 0;
-                       for (String knownPostId : knownPosts) {
-                               configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
-                       }
-                       configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
-               } catch (ConfigurationException ce1) {
-                       throw new DatabaseException("Could not save database.", ce1);
-               } finally {
-                       lock.readLock().unlock();
-               }
-       }
-
-       /**
-        * Loads the known post replies.
-        */
+       /** Loads the known post replies. */
        private void loadKnownPostReplies() {
+               Set<String> knownPostReplies = configurationLoader.loadKnownPostReplies();
                lock.writeLock().lock();
                try {
-                       int replyCounter = 0;
-                       while (true) {
-                               String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null);
-                               if (knownReplyId == null) {
-                                       break;
-                               }
-                               knownPostReplies.add(knownReplyId);
-                       }
+                       this.knownPostReplies.clear();
+                       this.knownPostReplies.addAll(knownPostReplies);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -637,14 +999,15 @@ public class MemoryDatabase extends AbstractService implements Database {
         * Saves the known post replies to the configuration.
         *
         * @throws DatabaseException
-        *             if a configuration error occurs
+        *              if a configuration error occurs
         */
        private void saveKnownPostReplies() throws DatabaseException {
                lock.readLock().lock();
                try {
                        int replyCounter = 0;
                        for (String knownReplyId : knownPostReplies) {
-                               configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
+                               configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(
+                                               knownReplyId);
                        }
                        configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null);
                } catch (ConfigurationException ce1) {