X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=4bf8a8a1a054d284512e76cfa6da64bc0d9037a7;hp=70d9ea2c6dc01a086f3e5e0b32b342cf7a6ca68e;hb=90d8e2eacb9888735865d8f890d105885959ca65;hpb=93fdf9e218d808f65f618abbddce183191d8c15b diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index 70d9ea2..4bf8a8a 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -17,13 +17,16 @@ package net.pterodactylus.sone.core; +import static com.google.common.base.Optional.of; import static com.google.common.base.Preconditions.checkArgument; 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 net.pterodactylus.sone.data.Identified.GET_ID; +import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER; +import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI; -import java.net.MalformedURLException; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -56,18 +59,23 @@ import net.pterodactylus.sone.data.Album; import net.pterodactylus.sone.data.Client; import net.pterodactylus.sone.data.Image; import net.pterodactylus.sone.data.Post; -import net.pterodactylus.sone.data.PostBuilder; -import net.pterodactylus.sone.data.PostBuilderFactory; import net.pterodactylus.sone.data.PostReply; -import net.pterodactylus.sone.data.PostReplyBuilder; -import net.pterodactylus.sone.data.PostReplyBuilderFactory; import net.pterodactylus.sone.data.Profile; import net.pterodactylus.sone.data.Profile.Field; -import net.pterodactylus.sone.data.Reply; +import net.pterodactylus.sone.data.Reply.Modifier.ReplyUpdated; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.data.Sone.ShowCustomAvatars; import net.pterodactylus.sone.data.Sone.SoneStatus; import net.pterodactylus.sone.data.TemporaryImage; +import net.pterodactylus.sone.database.Database; +import net.pterodactylus.sone.database.DatabaseException; +import net.pterodactylus.sone.database.ImageBuilder.ImageCreated; +import net.pterodactylus.sone.database.PostBuilder; +import net.pterodactylus.sone.database.PostBuilder.PostCreated; +import net.pterodactylus.sone.database.PostReplyBuilder; +import net.pterodactylus.sone.database.PostReplyBuilder.PostReplyCreated; +import net.pterodactylus.sone.database.SoneBuilder.SoneCreated; +import net.pterodactylus.sone.database.SoneProvider; import net.pterodactylus.sone.fcp.FcpInterface; import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired; import net.pterodactylus.sone.freenet.wot.Identity; @@ -91,28 +99,25 @@ import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.google.common.collect.Collections2; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.Ordering; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; -import freenet.keys.FreenetURI; - /** * The Sone core. * * @author David ‘Bombe’ Roden */ -public class Core extends AbstractService implements SoneProvider, PostProvider, PostReplyProvider { +public class Core extends AbstractService implements SoneProvider { /** The logger. */ private static final Logger logger = Logging.getLogger(Core.class); - /** The start time. */ - private final long startupTime = System.currentTimeMillis(); - /** The options. */ private final Options options = new Options(); @@ -153,7 +158,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, private volatile FcpInterface fcpInterface; /** The times Sones were followed. */ - private final Map soneFollowingTimes = new HashMap(); + private final Map soneFollowingTimes = new HashMap(); /** Locked local Sones. */ /* synchronize on itself. */ @@ -174,36 +179,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /** All known Sones. */ private final Set knownSones = new HashSet(); - /** The post builder. */ - private final PostBuilderFactory postBuilderFactory; - - /** All posts. */ - private final Map posts = new HashMap(); - - /** All known posts. */ - private final Set knownPosts = new HashSet(); - - /** The post reply builder factory. */ - private final PostReplyBuilderFactory postReplyBuilderFactory; - - /** All replies. */ - private final Map replies = new HashMap(); - - /** All known replies. */ - private final Set knownReplies = new HashSet(); + /** The post database. */ + private final Database database; /** All bookmarked posts. */ /* synchronize access on itself. */ private final Set bookmarkedPosts = new HashSet(); /** Trusted identities, sorted by own identities. */ - private final Map> trustedIdentities = Collections.synchronizedMap(new HashMap>()); - - /** All known albums. */ - private final Map albums = new HashMap(); - - /** All known images. */ - private final Map images = new HashMap(); + private final Multimap trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.create()); /** All temporary images. */ private final Map temporaryImages = new HashMap(); @@ -218,22 +202,20 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Creates a new core. * * @param configuration - * The configuration of the core + * The configuration of the core * @param freenetInterface - * The freenet interface + * The freenet interface * @param identityManager - * The identity manager + * The identity manager * @param webOfTrustUpdater - * The WebOfTrust updater + * The WebOfTrust updater * @param eventBus - * The event bus - * @param postBuilderFactory - * The post builder - * @param postReplyBuilderFactory - * The post reply builder factory + * The event bus + * @param database + * The database */ @Inject - public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, PostBuilderFactory postBuilderFactory, PostReplyBuilderFactory postReplyBuilderFactory) { + public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) { super("Sone Core"); this.configuration = configuration; this.freenetInterface = freenetInterface; @@ -243,8 +225,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, this.updateChecker = new UpdateChecker(eventBus, freenetInterface); this.webOfTrustUpdater = webOfTrustUpdater; this.eventBus = eventBus; - this.postBuilderFactory = postBuilderFactory; - this.postReplyBuilderFactory = postReplyBuilderFactory; + this.database = database; } // @@ -252,20 +233,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, // /** - * Returns the time Sone was started. - * - * @return The startup time (in milliseconds since Jan 1, 1970 UTC) - */ - public long getStartupTime() { - return startupTime; - } - - /** * Sets the configuration to use. This will automatically save the current * configuration to the given configuration. * * @param configuration - * The new configuration to use + * The new configuration to use */ public void setConfiguration(Configuration configuration) { this.configuration = configuration; @@ -303,17 +275,21 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Sets the FCP interface to use. * * @param fcpInterface - * The FCP interface to use + * The FCP interface to use */ public void setFcpInterface(FcpInterface fcpInterface) { this.fcpInterface = fcpInterface; } + public Database getDatabase() { + return database; + } + /** * Returns the Sone rescuer for the given local Sone. * * @param sone - * The local Sone to get the rescuer for + * The local Sone to get the rescuer for * @return The Sone rescuer for the given Sone */ public SoneRescuer getSoneRescuer(Sone sone) { @@ -334,7 +310,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Returns whether the given Sone is currently locked. * * @param sone - * The sone to check + * The sone to check * @return {@code true} if the Sone is locked, {@code false} if it is not */ public boolean isLocked(Sone sone) { @@ -343,80 +319,35 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** - * Returns all Sones, remote and local. - * - * @return All Sones - */ - public Set getSones() { - return new HashSet(sones.values()); - } - - /** - * Returns the Sone with the given ID, regardless whether it’s local or - * remote. - * - * @param id - * The ID of the Sone to get - * @return The Sone with the given ID, or {@code null} if there is no such - * Sone - */ - public Sone getSone(String id) { - return getSone(id, true); - } - - /** - * Returns the Sone with the given ID, regardless whether it’s local or - * remote. - * - * @param id - * The ID of the Sone to get - * @param create - * {@code true} to create a new Sone if none exists, - * {@code false} to return {@code null} if a Sone with the given - * ID does not exist - * @return The Sone with the given ID, or {@code null} if there is no such - * Sone - */ @Override - public Sone getSone(String id, boolean create) { + public Collection getSones() { synchronized (sones) { - if (!sones.containsKey(id) && create) { - Sone sone = new Sone(id, false); - sones.put(id, sone); - } - return sones.get(id); + return ImmutableSet.copyOf(sones.values()); } } - /** - * Checks whether the core knows a Sone with the given ID. - * - * @param id - * The ID of the Sone - * @return {@code true} if there is a Sone with the given ID, {@code false} - * otherwise - */ - public boolean hasSone(String id) { + @Override + public Function> getSone() { + return database.getSone(); + } + + @Override + public Optional getSone(String id) { synchronized (sones) { - return sones.containsKey(id); + return Optional.fromNullable(sones.get(id)); } } - /** - * Returns all local Sones. - * - * @return All local Sones - */ + @Override public Collection getLocalSones() { synchronized (sones) { - return Collections2.filter(sones.values(), new Predicate() { + return from(sones.values()).filter(new Predicate() { @Override public boolean apply(Sone sone) { return sone.isLocal(); } - }); + }).toSet(); } } @@ -424,41 +355,23 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Returns the local Sone with the given ID, optionally creating a new Sone. * * @param id - * The ID of the Sone - * @param create - * {@code true} to create a new Sone if none exists, - * {@code false} to return null if none exists + * The ID of the Sone * @return The Sone with the given ID, or {@code null} */ - public Sone getLocalSone(String id, boolean create) { - synchronized (sones) { - Sone sone = sones.get(id); - if ((sone == null) && create) { - sone = new Sone(id, true); - sones.put(id, sone); - } - if ((sone != null) && !sone.isLocal()) { - sone = new Sone(id, true); - sones.put(id, sone); - } - return sone; - } + public Optional getLocalSone(String id) { + return from(database.getSone(id).asSet()).firstMatch(LOCAL_SONE_FILTER); } - /** - * Returns all remote Sones. - * - * @return All remote Sones - */ + @Override public Collection getRemoteSones() { synchronized (sones) { - return Collections2.filter(sones.values(), new Predicate() { + return from(sones.values()).filter(new Predicate() { @Override public boolean apply(Sone sone) { return !sone.isLocal(); } - }); + }).toSet(); } } @@ -466,30 +379,20 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Returns the remote Sone with the given ID. * * @param id - * The ID of the remote Sone to get - * @param create - * {@code true} to always create a Sone, {@code false} to return - * {@code null} if no Sone with the given ID exists + * The ID of the remote Sone to get * @return The Sone with the given ID */ - public Sone getRemoteSone(String id, boolean create) { - synchronized (sones) { - Sone sone = sones.get(id); - if ((sone == null) && create && (id != null) && (id.length() == 43)) { - sone = new Sone(id, false); - sones.put(id, sone); - } - return sone; - } + public Optional getRemoteSone(String id) { + return from(database.getSone(id).asSet()).firstMatch(not(LOCAL_SONE_FILTER)); } /** * Returns whether the given Sone has been modified. * * @param sone - * The Sone to check for modifications - * @return {@code true} if a modification has been detected in the Sone, - * {@code false} otherwise + * The Sone to check for modifications + * @return {@code true} if a modification has been detected in the Sone, {@code + * false} otherwise */ public boolean isModifiedSone(Sone sone) { return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false; @@ -499,153 +402,21 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Returns the time when the given was first followed by any local Sone. * * @param sone - * The Sone to get the time for - * @return The time (in milliseconds since Jan 1, 1970) the Sone has first - * been followed, or {@link Long#MAX_VALUE} + * The Sone to get the time for + * @return The time (in milliseconds since Jan 1, 1970) the Sone has first been + * followed, or {@link Long#MAX_VALUE} */ public long getSoneFollowingTime(Sone sone) { synchronized (soneFollowingTimes) { - if (soneFollowingTimes.containsKey(sone)) { - return soneFollowingTimes.get(sone); - } - return Long.MAX_VALUE; + return Optional.fromNullable(soneFollowingTimes.get(sone.getId())).or(Long.MAX_VALUE); } } /** - * 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) { - checkNotNull(origin, "origin must not be null"); - checkNotNull(target, "target must not be null"); - checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin’s identity must be an OwnIdentity"); - return trustedIdentities.containsKey(origin.getIdentity()) && trustedIdentities.get(origin.getIdentity()).contains(target.getIdentity()); - } - - /** - * Returns a post builder. - * - * @return A new post builder - */ - public PostBuilder postBuilder() { - return postBuilderFactory.newPostBuilder(); - } - - /** - * {@inheritDoc} - */ - @Override - public Post getPost(String postId) { - synchronized (posts) { - return posts.get(postId); - } - } - - /** - * Returns all posts that have the given Sone as recipient. - * - * @see Post#getRecipient() - * @param recipient - * The recipient of the posts - * @return All posts that have the given Sone as recipient - */ - public Set getDirectedPosts(Sone recipient) { - checkNotNull(recipient, "recipient must not be null"); - Set directedPosts = new HashSet(); - synchronized (posts) { - for (Post post : posts.values()) { - if (recipient.equals(post.getRecipient())) { - directedPosts.add(post); - } - } - } - return directedPosts; - } - - /** - * Returns a post reply builder. - * - * @return A new post reply builder - */ - public PostReplyBuilder postReplyBuilder() { - return postReplyBuilderFactory.newPostReplyBuilder(); - } - - /** - * {@inheritDoc} - */ - @Override - public Optional getPostReply(String replyId) { - synchronized (replies) { - return Optional.fromNullable(replies.get(replyId)); - } - } - - /** - * {@inheritDoc} - */ - @Override - public List getReplies(final Post post) { - return Ordering.from(Reply.TIME_COMPARATOR).sortedCopy(FluentIterable.from(getSones()).transformAndConcat(new Function>() { - - @Override - public Iterable apply(Sone sone) { - return sone.getReplies(); - } - }).filter(new Predicate() { - - @Override - public boolean apply(PostReply reply) { - return post.equals(reply.getPost()); - } - })); - } - - /** - * Returns all Sones that have liked the given post. - * - * @param post - * The post to get the liking Sones for - * @return The Sones that like the given post - */ - public Set getLikes(Post post) { - Set sones = new HashSet(); - for (Sone sone : getSones()) { - if (sone.getLikedPostIds().contains(post.getId())) { - sones.add(sone); - } - } - return sones; - } - - /** - * Returns all Sones that have liked the given reply. - * - * @param reply - * The reply to get the liking Sones for - * @return The Sones that like the given reply - */ - public Set getLikes(PostReply reply) { - Set sones = new HashSet(); - for (Sone sone : getSones()) { - if (sone.getLikedReplyIds().contains(reply.getId())) { - sones.add(sone); - } - } - return sones; - } - - /** * Returns whether the given post is bookmarked. * * @param post - * The post to check + * The post to check * @return {@code true} if the given post is bookmarked, {@code false} * otherwise */ @@ -657,9 +428,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Returns whether the post with the given ID is bookmarked. * * @param id - * The ID of the post to check - * @return {@code true} if the post with the given ID is bookmarked, - * {@code false} otherwise + * The ID of the post to check + * @return {@code true} if the post with the given ID is bookmarked, {@code + * false} otherwise */ public boolean isPostBookmarked(String id) { synchronized (bookmarkedPosts) { @@ -676,91 +447,30 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, Set posts = new HashSet(); synchronized (bookmarkedPosts) { for (String bookmarkedPostId : bookmarkedPosts) { - Post post = getPost(bookmarkedPostId); - if (post != null) { - posts.add(post); + Optional post = database.getPost(bookmarkedPostId); + if (post.isPresent()) { + posts.add(post.get()); } } } return posts; } - /** - * Returns the album with the given ID, creating a new album if no album - * with the given ID can be found. - * - * @param albumId - * The ID of the album - * @return The album with the given ID - */ - public Album getAlbum(String albumId) { - return getAlbum(albumId, true); + public Optional getAlbum(String albumId) { + return database.getAlbum(albumId); } - /** - * Returns the album with the given ID, optionally creating a new album if - * an album with the given ID can not be found. - * - * @param albumId - * The ID of the album - * @param create - * {@code true} to create a new album if none exists for the - * given ID - * @return The album with the given ID, or {@code null} if no album with the - * given ID exists and {@code create} is {@code false} - */ - public Album getAlbum(String albumId, boolean create) { - synchronized (albums) { - Album album = albums.get(albumId); - if (create && (album == null)) { - album = new Album(albumId); - albums.put(albumId, album); - } - return album; - } - } - - /** - * Returns the image with the given ID, creating it if necessary. - * - * @param imageId - * The ID of the image - * @return The image with the given ID - */ - public Image getImage(String imageId) { - return getImage(imageId, true); - } - - /** - * Returns the image with the given ID, optionally creating it if it does - * not exist. - * - * @param imageId - * The ID of the image - * @param create - * {@code true} to create an image if none exists with the given - * ID - * @return The image with the given ID, or {@code null} if none exists and - * none was created - */ - public Image getImage(String imageId, boolean create) { - synchronized (images) { - Image image = images.get(imageId); - if (create && (image == null)) { - image = new Image(imageId); - images.put(imageId, image); - } - return image; - } + public Optional getImage(String imageId) { + return database.getImage(imageId); } /** * Returns the temporary image with the given ID. * * @param imageId - * The ID of the temporary image - * @return The temporary image, or {@code null} if there is no temporary - * image with the given ID + * The ID of the temporary image + * @return The temporary image, or {@code null} if there is no temporary image + * with the given ID */ public TemporaryImage getTemporaryImage(String imageId) { synchronized (temporaryImages) { @@ -773,12 +483,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, // /** - * Locks the given Sone. A locked Sone will not be inserted by - * {@link SoneInserter} until it is {@link #unlockSone(Sone) unlocked} - * again. + * Locks the given Sone. A locked Sone will not be inserted by {@link + * SoneInserter} until it is {@link #unlockSone(Sone) unlocked} again. * * @param sone - * The sone to lock + * The sone to lock */ public void lockSone(Sone sone) { synchronized (lockedSones) { @@ -791,9 +500,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /** * Unlocks the given Sone. * - * @see #lockSone(Sone) * @param sone - * The sone to unlock + * The sone to unlock + * @see #lockSone(Sone) */ public void unlockSone(Sone sone) { synchronized (lockedSones) { @@ -807,7 +516,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Adds a local Sone from the given own identity. * * @param ownIdentity - * The own identity to create a Sone from + * The own identity to create a Sone from * @return The added (or already existing) Sone */ public Sone addLocalSone(OwnIdentity ownIdentity) { @@ -815,16 +524,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, "Given OwnIdentity is null!"); return null; } + logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity)); synchronized (sones) { final Sone sone; - try { - sone = getLocalSone(ownIdentity.getId(), true).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri())); - } catch (MalformedURLException mue1) { - logger.log(Level.SEVERE, String.format("Could not convert the Identity’s URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1); - return null; - } - sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)); - sone.setClient(new Client("Sone", SonePlugin.VERSION.toString())); + sone = database.newSoneBuilder().by(ownIdentity.getId()).local().using(new Client("Sone", SonePlugin.VERSION.toString())).build(Optional.absent()); + sone.modify().setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)).update(); sone.setKnown(true); /* TODO - load posts ’n stuff */ sones.put(ownIdentity.getId(), sone); @@ -841,7 +545,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Creates a new Sone for the given own identity. * * @param ownIdentity - * The own identity to create a Sone for + * The own identity to create a Sone for * @return The created Sone */ public Sone createSone(OwnIdentity ownIdentity) { @@ -857,7 +561,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption(true)); sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption(ShowCustomAvatars.NEVER)); - followSone(sone, getSone("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI")); + followSone(sone, "nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI"); touchConfiguration(); return sone; } @@ -866,7 +570,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Adds the Sone of the given identity. * * @param identity - * The identity whose Sone to add + * The identity whose Sone to add * @return The added or already existing Sone */ public Sone addRemoteSone(Identity identity) { @@ -875,10 +579,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, return null; } synchronized (sones) { - final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity); - boolean newSone = sone.getRequestUri() == null; - sone.setRequestUri(SoneUri.create(identity.getRequestUri())); - sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0)); + Optional existingSone = database.getSone(identity.getId()); + if (existingSone.isPresent() && existingSone.get().isLocal()) { + return existingSone.get(); + } + boolean newSone = !existingSone.isPresent(); + final Sone sone = newSone ? database.newSoneBuilder().by(identity.getId()).using(new Client("Sone", SonePlugin.VERSION.toString())).build(Optional.absent()) : existingSone.get(); + sone.modify().setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0)).update(); if (newSone) { synchronized (knownSones) { newSone = !knownSones.contains(sone.getId()); @@ -888,7 +595,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, eventBus.post(new NewSoneFoundEvent(sone)); for (Sone localSone : getLocalSones()) { if (localSone.getOptions().getBooleanOption("AutoFollow").get()) { - followSone(localSone, sone); + followSone(localSone, sone.getId()); } } } @@ -899,7 +606,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, @Override @SuppressWarnings("synthetic-access") public void run() { - soneDownloader.fetchSone(sone, sone.getRequestUri()); + soneDownloader.fetchSone(sone, TO_FREENET_URI.apply(sone)); } }); @@ -911,48 +618,30 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Lets the given local Sone follow the Sone with the given ID. * * @param sone - * The local Sone that should follow another Sone + * The local Sone that should follow another Sone * @param soneId - * The ID of the Sone to follow + * The ID of the Sone to follow */ public void followSone(Sone sone, String soneId) { checkNotNull(sone, "sone must not be null"); checkNotNull(soneId, "soneId must not be null"); - Sone followedSone = getSone(soneId, true); - if (followedSone == null) { - logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId)); - return; - } - followSone(sone, getSone(soneId)); - } - - /** - * Lets the given local Sone follow the other given Sone. If the given Sone - * was not followed by any local Sone before, this will mark all elements of - * the followed Sone as read that have been created before the current - * moment. - * - * @param sone - * The local Sone that should follow the other Sone - * @param followedSone - * The Sone that should be followed - */ - public void followSone(Sone sone, Sone followedSone) { - checkNotNull(sone, "sone must not be null"); - checkNotNull(followedSone, "followedSone must not be null"); - sone.addFriend(followedSone.getId()); + sone.addFriend(soneId); synchronized (soneFollowingTimes) { - if (!soneFollowingTimes.containsKey(followedSone)) { + if (!soneFollowingTimes.containsKey(soneId)) { long now = System.currentTimeMillis(); - soneFollowingTimes.put(followedSone, now); - for (Post post : followedSone.getPosts()) { + soneFollowingTimes.put(soneId, now); + Optional followedSone = getSone(soneId); + if (!followedSone.isPresent()) { + return; + } + for (Post post : followedSone.get().getPosts()) { if (post.getTime() < now) { markPostKnown(post); } } - for (PostReply reply : followedSone.getReplies()) { + for (PostReply reply : followedSone.get().getReplies()) { if (reply.getTime() < now) { - markReplyKnown(reply); + reply.modify().setKnown().update(Optional.>absent()); } } } @@ -964,37 +653,21 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Lets the given local Sone unfollow the Sone with the given ID. * * @param sone - * The local Sone that should unfollow another Sone + * The local Sone that should unfollow another Sone * @param soneId - * The ID of the Sone being unfollowed + * The ID of the Sone being unfollowed */ public void unfollowSone(Sone sone, String soneId) { checkNotNull(sone, "sone must not be null"); checkNotNull(soneId, "soneId must not be null"); - unfollowSone(sone, getSone(soneId, false)); - } - - /** - * Lets the given local Sone unfollow the other given Sone. If the given - * local Sone is the last local Sone that followed the given Sone, its - * following time will be removed. - * - * @param sone - * The local Sone that should unfollow another Sone - * @param unfollowedSone - * The Sone being unfollowed - */ - public void unfollowSone(Sone sone, Sone unfollowedSone) { - checkNotNull(sone, "sone must not be null"); - checkNotNull(unfollowedSone, "unfollowedSone must not be null"); - sone.removeFriend(unfollowedSone.getId()); + sone.removeFriend(soneId); boolean unfollowedSoneStillFollowed = false; for (Sone localSone : getLocalSones()) { - unfollowedSoneStillFollowed |= localSone.hasFriend(unfollowedSone.getId()); + unfollowedSoneStillFollowed |= localSone.hasFriend(soneId); } if (!unfollowedSoneStillFollowed) { synchronized (soneFollowingTimes) { - soneFollowingTimes.remove(unfollowedSone); + soneFollowingTimes.remove(soneId); } } touchConfiguration(); @@ -1004,11 +677,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Sets the trust value of the given origin Sone for the target Sone. * * @param origin - * The origin Sone + * The origin Sone * @param target - * The target Sone + * The target Sone * @param trustValue - * The trust value (from {@code -100} to {@code 100}) + * The trust value (from {@code -100} to {@code 100}) */ public void setTrust(Sone origin, Sone target, int trustValue) { checkNotNull(origin, "origin must not be null"); @@ -1022,9 +695,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Removes any trust assignment for the given target Sone. * * @param origin - * The trust origin + * The trust origin * @param target - * The trust target + * The trust target */ public void removeTrust(Sone origin, Sone target) { checkNotNull(origin, "origin must not be null"); @@ -1037,9 +710,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Assigns the configured positive trust value for the given target. * * @param origin - * The trust origin + * The trust origin * @param target - * The trust target + * The trust target */ public void trustSone(Sone origin, Sone target) { setTrust(origin, target, preferences.getPositiveTrust()); @@ -1049,9 +722,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Assigns the configured negative trust value for the given target. * * @param origin - * The trust origin + * The trust origin * @param target - * The trust target + * The trust target */ public void distrustSone(Sone origin, Sone target) { setTrust(origin, target, preferences.getNegativeTrust()); @@ -1061,9 +734,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Removes the trust assignment for the given target. * * @param origin - * The trust origin + * The trust origin * @param target - * The trust target + * The trust target */ public void untrustSone(Sone origin, Sone target) { removeTrust(origin, target); @@ -1073,7 +746,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Updates the stored Sone with the given Sone. * * @param sone - * The updated Sone + * The updated Sone */ public void updateSone(Sone sone) { updateSone(sone, false); @@ -1081,131 +754,93 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /** * Updates the stored Sone with the given Sone. If {@code soneRescueMode} is - * {@code true}, an older Sone than the current Sone can be given to restore - * an old state. + * {@code true}, an older Sone than the current Sone can be given to restore an + * old state. * * @param sone - * The Sone to update + * The Sone to update * @param soneRescueMode - * {@code true} if the stored Sone should be updated regardless - * of the age of the given Sone + * {@code true} if the stored Sone should be updated regardless of the age of + * the given Sone */ public void updateSone(Sone sone, boolean soneRescueMode) { - if (hasSone(sone.getId())) { - Sone storedSone = getSone(sone.getId()); - if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) { + Optional storedSone = getSone(sone.getId()); + if (storedSone.isPresent()) { + if (!soneRescueMode && !(sone.getTime() > storedSone.get().getTime())) { logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone)); return; } - synchronized (posts) { - if (!soneRescueMode) { - for (Post post : storedSone.getPosts()) { - posts.remove(post.getId()); - if (!sone.getPosts().contains(post)) { - eventBus.post(new PostRemovedEvent(post)); - } - } + /* find removed posts. */ + Collection existingPosts = database.getPosts(sone.getId()); + for (Post oldPost : existingPosts) { + if (!sone.getPosts().contains(oldPost)) { + eventBus.post(new PostRemovedEvent(oldPost)); } - List storedPosts = storedSone.getPosts(); - synchronized (knownPosts) { - for (Post post : sone.getPosts()) { - PostBuilder postBuilder = postBuilderFactory.newPostBuilder(); - postBuilder.copyPost(post).from(storedSone); - Post newPost = postBuilder.build().setKnown(knownPosts.contains(post.getId())); - if (!storedPosts.contains(newPost)) { - if (newPost.getTime() < getSoneFollowingTime(sone)) { - knownPosts.add(newPost.getId()); - newPost.setKnown(true); - } else if (!knownPosts.contains(newPost.getId())) { - eventBus.post(new NewPostFoundEvent(newPost)); - } - } - posts.put(newPost.getId(), newPost); - } + } + /* find new posts. */ + for (Post newPost : sone.getPosts()) { + if (existingPosts.contains(newPost)) { + continue; + } + if (newPost.getTime() < getSoneFollowingTime(sone)) { + newPost.setKnown(true); + } else if (!newPost.isKnown()) { + eventBus.post(new NewPostFoundEvent(newPost)); } } - synchronized (replies) { - if (!soneRescueMode) { - for (PostReply reply : storedSone.getReplies()) { - replies.remove(reply.getId()); - if (!sone.getReplies().contains(reply)) { - eventBus.post(new PostReplyRemovedEvent(reply)); - } + /* store posts. */ + database.storePosts(sone, sone.getPosts()); + if (!soneRescueMode) { + for (PostReply reply : storedSone.get().getReplies()) { + if (!sone.getReplies().contains(reply)) { + eventBus.post(new PostReplyRemovedEvent(reply)); } } - Set storedReplies = storedSone.getReplies(); - synchronized (knownReplies) { - for (PostReply reply : sone.getReplies()) { - reply.setSone(storedSone).setKnown(knownReplies.contains(reply.getId())); - if (!storedReplies.contains(reply)) { - if (reply.getTime() < getSoneFollowingTime(sone)) { - knownReplies.add(reply.getId()); - reply.setKnown(true); - } else if (!knownReplies.contains(reply.getId())) { - eventBus.post(new NewPostReplyFoundEvent(reply)); - } - } - replies.put(reply.getId(), reply); - } + } + Set storedReplies = storedSone.get().getReplies(); + for (PostReply reply : sone.getReplies()) { + if (storedReplies.contains(reply)) { + continue; + } + if (reply.getTime() < getSoneFollowingTime(sone)) { + reply.modify().setKnown().update(Optional.>absent()); + } else if (!reply.isKnown()) { + eventBus.post(new NewPostReplyFoundEvent(reply)); } } - synchronized (albums) { - synchronized (images) { - for (Album album : storedSone.getAlbums()) { - albums.remove(album.getId()); - for (Image image : album.getImages()) { - images.remove(image.getId()); - } - } - for (Album album : sone.getAlbums()) { - albums.put(album.getId(), album); - for (Image image : album.getImages()) { - images.put(image.getId(), image); - } - } + database.storePostReplies(sone, sone.getReplies()); + for (Album album : storedSone.get().getRootAlbum().getAlbums()) { + database.removeAlbum(album); + for (Image image : album.getImages()) { + database.removeImage(image); } } - synchronized (storedSone) { - if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) { - storedSone.setTime(sone.getTime()); + for (Album album : sone.getRootAlbum().getAlbums()) { + database.storeAlbum(album); + for (Image image : album.getImages()) { + database.storeImage(image); } - storedSone.setClient(sone.getClient()); - storedSone.setProfile(sone.getProfile()); - if (soneRescueMode) { - for (Post post : sone.getPosts()) { - storedSone.addPost(post); - } - for (PostReply reply : sone.getReplies()) { - storedSone.addReply(reply); - } - for (String likedPostId : sone.getLikedPostIds()) { - storedSone.addLikedPostId(likedPostId); - } - for (String likedReplyId : sone.getLikedReplyIds()) { - storedSone.addLikedReplyId(likedReplyId); - } - for (Album album : sone.getAlbums()) { - storedSone.addAlbum(album); - } - } else { - storedSone.setPosts(sone.getPosts()); - storedSone.setReplies(sone.getReplies()); - storedSone.setLikePostIds(sone.getLikedPostIds()); - storedSone.setLikeReplyIds(sone.getLikedReplyIds()); - storedSone.setAlbums(sone.getAlbums()); + } + synchronized (sones) { + sone.setOptions(storedSone.get().getOptions()); + sone.setKnown(storedSone.get().isKnown()); + sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle); + if (sone.isLocal()) { + soneInserters.get(storedSone.get()).setSone(sone); + touchConfiguration(); } - storedSone.setLatestEdition(sone.getLatestEdition()); + sones.put(sone.getId(), sone); } } } /** - * Deletes the given Sone. This will remove the Sone from the - * {@link #getLocalSones() local Sones}, stop its {@link SoneInserter} and - * remove the context from its identity. + * Deletes the given Sone. This will remove the Sone from the {@link + * #getLocalSones() local Sones}, stop its {@link SoneInserter} and remove the + * context from its identity. * * @param sone - * The Sone to delete + * The Sone to delete */ public void deleteSone(Sone sone) { if (!(sone.getIdentity() instanceof OwnIdentity)) { @@ -1235,7 +870,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * known} before, a {@link MarkSoneKnownEvent} is fired. * * @param sone - * The Sone to mark as known + * The Sone to mark as known */ public void markSoneKnown(Sone sone) { if (!sone.isKnown()) { @@ -1253,13 +888,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * encountered, loading is aborted and the given Sone is not changed. * * @param sone - * The Sone to load and update + * The Sone to load and update */ public void loadSone(Sone sone) { if (!sone.isLocal()) { logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone)); return; } + logger.info(String.format("Loading local Sone: %s", sone)); /* initialize options. */ sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption(false)); @@ -1280,12 +916,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /* load profile. */ Profile profile = new Profile(sone); - profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null)); - profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null)); - profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null)); - profile.setBirthDay(configuration.getIntValue(sonePrefix + "/Profile/BirthDay").getValue(null)); - profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null)); - profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null)); + String firstName = configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null); + String middleName = configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null); + String lastName = configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null); + profile.modify().setFirstName(firstName).setMiddleName(middleName).setLastName(lastName).update(); + Integer birthDay = configuration.getIntValue(sonePrefix + "/Profile/BirthDay").getValue(null); + Integer birthMonth = configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null); + Integer birthYear = configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null); + profile.modify().setBirthYear(birthYear).setBirthMonth(birthMonth).setBirthDay(birthDay).update(); /* load profile fields. */ while (true) { @@ -1295,7 +933,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, break; } String fieldValue = configuration.getStringValue(fieldPrefix + "/Value").getValue(""); - profile.addField(fieldName).setValue(fieldValue); + profile.setField(profile.addField(fieldName), fieldValue); } /* load posts. */ @@ -1313,11 +951,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, "Invalid post found, aborting load!"); return; } - PostBuilder postBuilder = postBuilder().withId(postId).from(sone).withTime(postTime).withText(postText); + PostBuilder postBuilder = sone.newPostBuilder().withId(postId).withTime(postTime).withText(postText); if ((postRecipientId != null) && (postRecipientId.length() == 43)) { - postBuilder.to(getSone(postRecipientId)); + postBuilder.to(of(postRecipientId)); } - posts.add(postBuilder.build()); + posts.add(postBuilder.build(Optional.absent())); } /* load replies. */ @@ -1335,9 +973,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, "Invalid reply found, aborting load!"); return; } - PostReplyBuilder postReplyBuilder = postReplyBuilderFactory.newPostReplyBuilder(); - postReplyBuilder.withId(replyId).from(sone).to(postId).withTime(replyTime).withText(replyText); - replies.add(postReplyBuilder.build()); + PostReplyBuilder postReplyBuilder = sone.newPostReplyBuilder(postId).withId(replyId).withTime(replyTime).withText(replyText); + replies.add(postReplyBuilder.build(Optional.absent())); } /* load post likes. */ @@ -1371,7 +1008,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } /* load albums. */ - List topLevelAlbums = new ArrayList(); + Map albums = Maps.newHashMap(); int albumCounter = 0; while (true) { String albumPrefix = sonePrefix + "/Albums/" + albumCounter++; @@ -1387,19 +1024,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, "Invalid album found, aborting load!"); return; } - Album album = getAlbum(albumId).setSone(sone).setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId); + Album parentAlbum = sone.getRootAlbum(); if (albumParentId != null) { - Album parentAlbum = getAlbum(albumParentId, false); - if (parentAlbum == null) { - logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId)); - return; - } - parentAlbum.addAlbum(album); - } else { - if (!topLevelAlbums.contains(album)) { - topLevelAlbums.add(album); - } + parentAlbum = albums.get(albumParentId); } + Album album = parentAlbum.newAlbumBuilder().withId(albumId).build().modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update(); + albums.put(album.getId(), album); } /* load images. */ @@ -1421,20 +1051,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, "Invalid image found, aborting load!"); return; } - Album album = getAlbum(albumId, false); + Album album = albums.get(albumId); if (album == null) { logger.log(Level.WARNING, "Invalid album image encountered, aborting load!"); return; } - Image image = getImage(imageId).setSone(sone).setCreationTime(creationTime).setKey(key); - image.setTitle(title).setDescription(description).setWidth(width).setHeight(height); - album.addImage(image); + album.newImageBuilder().withId(imageId).created(creationTime).at(key).sized(width, height).build(Optional.absent()).modify().setTitle(title).setDescription(description).update(); } /* load avatar. */ String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null); if (avatarId != null) { - profile.setAvatar(getImage(avatarId, false)); + profile.setAvatar(getImage(avatarId).transform(GET_ID)); } /* load options. */ @@ -1443,7 +1071,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, sone.getOptions().getBooleanOption("ShowNotification/NewSones").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null)); sone.getOptions().getBooleanOption("ShowNotification/NewPosts").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null)); sone.getOptions().getBooleanOption("ShowNotification/NewReplies").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null)); - sone.getOptions(). getEnumOption("ShowCustomAvatars").set(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name()))); + sone.getOptions().getEnumOption("ShowCustomAvatars").set(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name()))); /* if we’re still here, Sone was loaded successfully. */ synchronized (sone) { @@ -1456,7 +1084,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, for (String friendId : friends) { followSone(sone, friendId); } - sone.setAlbums(topLevelAlbums); + for (Album album : sone.getRootAlbum().getAlbums()) { + album.remove(); + } soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint); } synchronized (knownSones) { @@ -1464,123 +1094,30 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, knownSones.add(friend); } } - synchronized (knownPosts) { - for (Post post : posts) { - knownPosts.add(post.getId()); - } + database.storePosts(sone, posts); + for (Post post : posts) { + post.setKnown(true); } - synchronized (knownReplies) { - for (PostReply reply : replies) { - knownReplies.add(reply.getId()); - } + database.storePostReplies(sone, replies); + for (PostReply reply : replies) { + reply.modify().setKnown().update(Optional.>absent()); } - } - /** - * Creates a new post. - * - * @param sone - * The Sone that creates the post - * @param text - * The text of the post - * @return The created post - */ - public Post createPost(Sone sone, String text) { - return createPost(sone, System.currentTimeMillis(), text); - } - - /** - * Creates a new post. - * - * @param sone - * The Sone that creates the post - * @param time - * The time of the post - * @param text - * The text of the post - * @return The created post - */ - 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) { - checkNotNull(text, "text must not be null"); - checkArgument(text.trim().length() > 0, "text must not be empty"); - if (!sone.isLocal()) { - logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone)); - return null; - } - PostBuilder postBuilder = postBuilderFactory.newPostBuilder(); - postBuilder.from(sone).randomId().withTime(time).withText(text.trim()); - if (recipient != null) { - postBuilder.to(recipient); - } - final Post post = postBuilder.build(); - synchronized (posts) { - posts.put(post.getId(), post); - } - eventBus.post(new NewPostFoundEvent(post)); - sone.addPost(post); - touchConfiguration(); - localElementTicker.schedule(new Runnable() { - - /** - * {@inheritDoc} - */ - @Override - public void run() { - markPostKnown(post); - } - }, 10, TimeUnit.SECONDS); - return post; + logger.info(String.format("Sone loaded successfully: %s", sone)); } /** * Deletes the given post. * * @param post - * The post to delete + * The post to delete */ public void deletePost(Post post) { if (!post.getSone().isLocal()) { logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone())); return; } - post.getSone().removePost(post); - synchronized (posts) { - posts.remove(post.getId()); - } + database.removePost(post); eventBus.post(new PostRemovedEvent(post)); markPostKnown(post); touchConfiguration(); @@ -1591,36 +1128,22 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * (according to {@link Post#isKnown()}). * * @param post - * The post to mark as known + * The post to mark as known */ public void markPostKnown(Post post) { post.setKnown(true); - synchronized (knownPosts) { - eventBus.post(new MarkPostKnownEvent(post)); - if (knownPosts.add(post.getId())) { - touchConfiguration(); - } - } - for (PostReply reply : getReplies(post)) { - markReplyKnown(reply); + eventBus.post(new MarkPostKnownEvent(post)); + touchConfiguration(); + for (PostReply reply : post.getReplies()) { + reply.modify().setKnown().update(postReplyUpdated()); } } /** - * Bookmarks the given post. - * - * @param post - * The post to bookmark - */ - public void bookmark(Post post) { - bookmarkPost(post.getId()); - } - - /** * Bookmarks the post with the given ID. * * @param id - * The ID of the post to bookmark + * The ID of the post to bookmark */ public void bookmarkPost(String id) { synchronized (bookmarkedPosts) { @@ -1632,7 +1155,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Removes the given post from the bookmarks. * * @param post - * The post to unbookmark + * The post to unbookmark */ public void unbookmark(Post post) { unbookmarkPost(post.getId()); @@ -1642,7 +1165,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Removes the post with the given ID from the bookmarks. * * @param id - * The ID of the post to unbookmark + * The ID of the post to unbookmark */ public void unbookmarkPost(String id) { synchronized (bookmarkedPosts) { @@ -1651,52 +1174,10 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } /** - * Creates a new reply. - * - * @param sone - * The Sone that creates the reply - * @param post - * The post that this reply refers to - * @param text - * The text of the reply - * @return The created reply - */ - public PostReply createReply(Sone sone, Post post, String text) { - checkNotNull(text, "text must not be null"); - checkArgument(text.trim().length() > 0, "text must not be empty"); - if (!sone.isLocal()) { - logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone)); - return null; - } - PostReplyBuilder postReplyBuilder = postReplyBuilderFactory.newPostReplyBuilder(); - postReplyBuilder.randomId().from(sone).to(post.getId()).currentTime().withText(text.trim()); - final PostReply reply = postReplyBuilder.build(); - synchronized (replies) { - replies.put(reply.getId(), reply); - } - synchronized (knownReplies) { - eventBus.post(new NewPostReplyFoundEvent(reply)); - } - sone.addReply(reply); - touchConfiguration(); - localElementTicker.schedule(new Runnable() { - - /** - * {@inheritDoc} - */ - @Override - public void run() { - markReplyKnown(reply); - } - }, 10, TimeUnit.SECONDS); - return reply; - } - - /** * Deletes the given reply. * * @param reply - * The reply to delete + * The reply to delete */ public void deleteReply(PostReply reply) { Sone sone = reply.getSone(); @@ -1704,90 +1185,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply)); return; } - synchronized (replies) { - replies.remove(reply.getId()); - } - synchronized (knownReplies) { - markReplyKnown(reply); - knownReplies.remove(reply.getId()); - } - sone.removeReply(reply); - touchConfiguration(); - } - - /** - * Marks the given reply as known, if it is currently not a known reply - * (according to {@link Reply#isKnown()}). - * - * @param reply - * The reply to mark as known - */ - public void markReplyKnown(PostReply reply) { - reply.setKnown(true); - synchronized (knownReplies) { - eventBus.post(new MarkPostReplyKnownEvent(reply)); - if (knownReplies.add(reply.getId())) { - touchConfiguration(); - } - } - } - - /** - * Creates a new top-level album for the given Sone. - * - * @param sone - * The Sone to create the album for - * @return The new album - */ - public Album createAlbum(Sone sone) { - return createAlbum(sone, null); - } - - /** - * Creates a new album for the given Sone. - * - * @param sone - * The Sone to create the album for - * @param parent - * The parent of the album (may be {@code null} to create a - * top-level album) - * @return The new album - */ - public Album createAlbum(Sone sone, Album parent) { - Album album = new Album(); - synchronized (albums) { - albums.put(album.getId(), album); - } - album.setSone(sone); - if (parent != null) { - parent.addAlbum(album); - } else { - sone.addAlbum(album); - } - return album; - } - - /** - * Deletes the given album. The owner of the album has to be a local Sone, - * and the album has to be {@link Album#isEmpty() empty} to be deleted. - * - * @param album - * The album to remove - */ - public void deleteAlbum(Album album) { - checkNotNull(album, "album must not be null"); - checkArgument(album.getSone().isLocal(), "album’s Sone must be a local Sone"); - if (!album.isEmpty()) { - return; - } - if (album.getParent() == null) { - album.getSone().removeAlbum(album); - } else { - album.getParent().removeAlbum(album); - } - synchronized (albums) { - albums.remove(album.getId()); - } + postReplyUpdated().get().replyUpdated(reply); + database.removePostReply(reply); touchConfiguration(); } @@ -1795,11 +1194,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Creates a new image. * * @param sone - * The Sone creating the image + * The Sone creating the image * @param album - * The album the image will be inserted into + * The album the image will be inserted into * @param temporaryImage - * The temporary image to create the image from + * The temporary image to create the image from * @return The newly created image */ public Image createImage(Sone sone, Album album, TemporaryImage temporaryImage) { @@ -1808,31 +1207,24 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, checkNotNull(temporaryImage, "temporaryImage must not be null"); checkArgument(sone.isLocal(), "sone must be a local Sone"); checkArgument(sone.equals(album.getSone()), "album must belong to the given Sone"); - Image image = new Image(temporaryImage.getId()).setSone(sone).setCreationTime(System.currentTimeMillis()); - album.addImage(image); - synchronized (images) { - images.put(image.getId(), image); - } + Image image = album.newImageBuilder().withId(temporaryImage.getId()).sized(temporaryImage.getWidth(), temporaryImage.getHeight()).build(imageCreated()); imageInserter.insertImage(temporaryImage, image); return image; } /** - * Deletes the given image. This method will also delete a matching - * temporary image. + * Deletes the given image. This method will also delete a matching temporary + * image. * - * @see #deleteTemporaryImage(TemporaryImage) * @param image - * The image to delete + * The image to delete + * @see #deleteTemporaryImage(String) */ public void deleteImage(Image image) { checkNotNull(image, "image must not be null"); checkArgument(image.getSone().isLocal(), "image must belong to a local Sone"); deleteTemporaryImage(image.getId()); - image.getAlbum().removeImage(image); - synchronized (images) { - images.remove(image.getId()); - } + image.remove(); touchConfiguration(); } @@ -1840,14 +1232,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Creates a new temporary image. * * @param mimeType - * The MIME type of the temporary image + * The MIME type of the temporary image * @param imageData - * The encoded data of the image + * The encoded data of the image * @return The temporary image */ - public TemporaryImage createTemporaryImage(String mimeType, byte[] imageData) { - TemporaryImage temporaryImage = new TemporaryImage(); - temporaryImage.setMimeType(mimeType).setImageData(imageData); + public TemporaryImage createTemporaryImage(String mimeType, byte[] imageData, int width, int height) { + TemporaryImage temporaryImage = new TemporaryImage(mimeType, imageData, width, height); synchronized (temporaryImages) { temporaryImages.put(temporaryImage.getId(), temporaryImage); } @@ -1855,37 +1246,25 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } /** - * Deletes the given temporary image. - * - * @param temporaryImage - * The temporary image to delete - */ - public void deleteTemporaryImage(TemporaryImage temporaryImage) { - checkNotNull(temporaryImage, "temporaryImage must not be null"); - deleteTemporaryImage(temporaryImage.getId()); - } - - /** * Deletes the temporary image with the given ID. * * @param imageId - * The ID of the temporary image to delete + * The ID of the temporary image to delete */ public void deleteTemporaryImage(String imageId) { checkNotNull(imageId, "imageId must not be null"); synchronized (temporaryImages) { temporaryImages.remove(imageId); } - Image image = getImage(imageId, false); - if (image != null) { - imageInserter.cancelImageInsert(image); + Optional image = getImage(imageId); + if (image.isPresent()) { + imageInserter.cancelImageInsert(image.get()); } } /** - * Notifies the core that the configuration, either of the core or of a - * single local Sone, has changed, and that the configuration should be - * saved. + * Notifies the core that the configuration, either of the core or of a single + * local Sone, has changed, and that the configuration should be saved. */ public void touchConfiguration() { lastConfigurationUpdate = System.currentTimeMillis(); @@ -1895,9 +1274,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, // SERVICE METHODS // - /** - * Starts the core. - */ @Override public void serviceStart() { loadConfiguration(); @@ -1905,11 +1281,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, identityManager.start(); webOfTrustUpdater.init(); webOfTrustUpdater.start(); + database.start(); } - /** - * {@inheritDoc} - */ @Override public void serviceRun() { long lastSaved = System.currentTimeMillis(); @@ -1926,9 +1300,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** - * Stops the core. - */ @Override public void serviceStop() { localElementTicker.shutdownNow(); @@ -1939,9 +1310,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } saveConfiguration(); + database.stop(); webOfTrustUpdater.stop(); updateChecker.stop(); soneDownloader.stop(); + soneDownloaders.shutdown(); identityManager.stop(); } @@ -1954,7 +1327,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Sone, such as the friends list and similar, private options. * * @param sone - * The Sone to save + * The Sone to save */ private synchronized void saveSone(Sone sone) { if (!sone.isLocal()) { @@ -1997,7 +1370,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, 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.getStringValue(postPrefix + "/Recipient").setValue(post.getRecipientId().orNull()); configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime()); configuration.getStringValue(postPrefix + "/Text").setValue(post.getText()); } @@ -2008,7 +1381,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, for (PostReply reply : sone.getReplies()) { String replyPrefix = sonePrefix + "/Replies/" + replyCounter++; configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId()); - configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId()); + configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId()); configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime()); configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText()); } @@ -2036,7 +1409,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null); /* save albums. first, collect in a flat structure, top-level first. */ - List albums = sone.getAllAlbums(); + List albums = from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList(); int albumCounter = 0; for (Album album : albums) { @@ -2044,8 +1417,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, 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() == null ? null : album.getParent().getId()); - configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId()); + configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId()); + configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage().transform(GET_ID).orNull()); } configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null); @@ -2075,7 +1448,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewPosts").getReal()); configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewReplies").getReal()); configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").getReal()); - configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions(). getEnumOption("ShowCustomAvatars").get().name()); + configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions().getEnumOption("ShowCustomAvatars").get().name()); configuration.save(); @@ -2087,9 +1460,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** - * Saves the current options. - */ + /** Saves the current options. */ private void saveConfiguration() { synchronized (configuration) { if (storingConfiguration) { @@ -2126,8 +1497,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /* save Sone following times. */ soneCounter = 0; synchronized (soneFollowingTimes) { - for (Entry soneFollowingTime : soneFollowingTimes.entrySet()) { - configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(soneFollowingTime.getKey().getId()); + for (Entry soneFollowingTime : soneFollowingTimes.entrySet()) { + configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(soneFollowingTime.getKey()); configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").setValue(soneFollowingTime.getValue()); ++soneCounter; } @@ -2135,22 +1506,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } /* save known posts. */ - int postCounter = 0; - synchronized (knownPosts) { - 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 (knownReplies) { - for (String knownReplyId : knownReplies) { - configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId); - } - configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null); - } + database.save(); /* save bookmarked posts. */ int bookmarkedPostCounter = 0; @@ -2166,6 +1522,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } catch (ConfigurationException ce1) { logger.log(Level.SEVERE, "Could not store configuration!", ce1); + } catch (DatabaseException de1) { + logger.log(Level.SEVERE, "Could not save database!", de1); } finally { synchronized (configuration) { storingConfiguration = false; @@ -2173,10 +1531,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** - * Loads the configuration. - */ - @SuppressWarnings("unchecked") + /** Loads the configuration. */ private void loadConfiguration() { /* create options. */ options.addIntegerOption("InsertionDelay", new DefaultOption(60, new IntegerRangePredicate(0, Integer.MAX_VALUE), new OptionWatcher() { @@ -2189,8 +1544,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, })); options.addIntegerOption("PostsPerPage", new DefaultOption(10, new IntegerRangePredicate(1, Integer.MAX_VALUE))); options.addIntegerOption("ImagesPerPage", new DefaultOption(9, new IntegerRangePredicate(1, Integer.MAX_VALUE))); - options.addIntegerOption("CharactersPerPost", new DefaultOption(400, Predicates. or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1)))); - options.addIntegerOption("PostCutOffLength", new DefaultOption(200, Predicates. or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1)))); + options.addIntegerOption("CharactersPerPost", new DefaultOption(400, Predicates.or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1)))); + options.addIntegerOption("PostCutOffLength", new DefaultOption(200, Predicates.or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1)))); options.addBooleanOption("RequireFullAccess", new DefaultOption(false)); options.addIntegerOption("PositiveTrust", new DefaultOption(75, new IntegerRangePredicate(0, 100))); options.addIntegerOption("NegativeTrust", new DefaultOption(-25, new IntegerRangePredicate(-100, 100))); @@ -2245,41 +1600,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, break; } long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE); - Sone followedSone = getSone(soneId); - if (followedSone == null) { - logger.log(Level.WARNING, String.format("Ignoring Sone with invalid ID: %s", soneId)); - } else { - synchronized (soneFollowingTimes) { - soneFollowingTimes.put(getSone(soneId), time); - } + synchronized (soneFollowingTimes) { + soneFollowingTimes.put(soneId, time); } ++soneCounter; } - /* load known posts. */ - int postCounter = 0; - while (true) { - String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null); - if (knownPostId == null) { - break; - } - synchronized (knownPosts) { - knownPosts.add(knownPostId); - } - } - - /* load known replies. */ - int replyCounter = 0; - while (true) { - String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null); - if (knownReplyId == null) { - break; - } - synchronized (knownReplies) { - knownReplies.add(knownReplyId); - } - } - /* load bookmarked posts. */ int bookmarkedPostCounter = 0; while (true) { @@ -2295,11 +1621,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } /** - * Loads an {@link Integer} configuration value for the option with the - * given name, logging validation failures. + * Loads an {@link Integer} configuration value for the option with the given + * name, logging validation failures. * * @param optionName - * The name of the option to load + * The name of the option to load */ private void loadConfigurationValue(String optionName) { try { @@ -2313,14 +1639,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Notifies the core that a new {@link OwnIdentity} was added. * * @param ownIdentityAddedEvent - * The event + * The event */ @Subscribe public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) { OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity(); logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity)); if (ownIdentity.hasContext("Sone")) { - trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet())); + database.storeIdentity(ownIdentity); addLocalSone(ownIdentity); } } @@ -2329,26 +1655,27 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Notifies the core that an {@link OwnIdentity} was removed. * * @param ownIdentityRemovedEvent - * The event + * The event */ @Subscribe public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) { OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity(); logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity)); - trustedIdentities.remove(ownIdentity); + trustedIdentities.removeAll(ownIdentity); } /** * Notifies the core that a new {@link Identity} was added. * * @param identityAddedEvent - * The event + * The event */ @Subscribe public void identityAdded(IdentityAddedEvent identityAddedEvent) { Identity identity = identityAddedEvent.identity(); logger.log(Level.FINEST, String.format("Adding Identity: %s", identity)); - trustedIdentities.get(identityAddedEvent.ownIdentity()).add(identity); + trustedIdentities.put(identityAddedEvent.ownIdentity(), identity); + database.storeIdentity(identity); addRemoteSone(identity); } @@ -2356,21 +1683,21 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Notifies the core that an {@link Identity} was updated. * * @param identityUpdatedEvent - * The event + * The event */ @Subscribe public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) { final Identity identity = identityUpdatedEvent.identity(); + database.storeIdentity(identity); soneDownloaders.execute(new Runnable() { @Override @SuppressWarnings("synthetic-access") public void run() { - Sone sone = getRemoteSone(identity.getId(), false); - sone.setIdentity(identity); - sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition())); - soneDownloader.addSone(sone); - soneDownloader.fetchSone(sone); + Optional sone = getRemoteSone(identity.getId()); + sone.get().modify().setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.get().getLatestEdition())).update(); + soneDownloader.addSone(sone.get()); + soneDownloader.fetchSone(sone.get()); } }); } @@ -2379,15 +1706,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * Notifies the core that an {@link Identity} was removed. * * @param identityRemovedEvent - * The event + * The event */ @Subscribe public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) { OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity(); Identity identity = identityRemovedEvent.identity(); - trustedIdentities.get(ownIdentity).remove(identity); + trustedIdentities.remove(ownIdentity, identity); boolean foundIdentity = false; - for (Entry> trustedIdentity : trustedIdentities.entrySet()) { + for (Entry> trustedIdentity : trustedIdentities.asMap().entrySet()) { if (trustedIdentity.getKey().equals(ownIdentity)) { continue; } @@ -2399,45 +1726,99 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /* some local identity still trusts this identity, don’t remove. */ return; } - Sone sone = getSone(identity.getId(), false); - if (sone == null) { + Optional sone = getSone(identity.getId()); + if (!sone.isPresent()) { /* TODO - we don’t have the Sone anymore. should this happen? */ return; } - synchronized (posts) { - synchronized (knownPosts) { - for (Post post : sone.getPosts()) { - posts.remove(post.getId()); - eventBus.post(new PostRemovedEvent(post)); - } - } + database.removePosts(sone.get()); + for (Post post : sone.get().getPosts()) { + eventBus.post(new PostRemovedEvent(post)); } - synchronized (replies) { - synchronized (knownReplies) { - for (PostReply reply : sone.getReplies()) { - replies.remove(reply.getId()); - eventBus.post(new PostReplyRemovedEvent(reply)); - } - } + database.removePostReplies(sone.get()); + for (PostReply reply : sone.get().getReplies()) { + eventBus.post(new PostReplyRemovedEvent(reply)); } synchronized (sones) { sones.remove(identity.getId()); } - eventBus.post(new SoneRemovedEvent(sone)); + eventBus.post(new SoneRemovedEvent(sone.get())); } /** * Deletes the temporary image. * * @param imageInsertFinishedEvent - * The event + * The event */ @Subscribe public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) { logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri())); - imageInsertFinishedEvent.image().setKey(imageInsertFinishedEvent.resultingUri().toString()); + imageInsertFinishedEvent.image().modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update(); deleteTemporaryImage(imageInsertFinishedEvent.image().getId()); touchConfiguration(); } + public Optional postCreated() { + return Optional.of(new PostCreated() { + @Override + public void postCreated(final Post post) { + if (post.isKnown()) { + return; + } + eventBus.post(new NewPostFoundEvent(post)); + if (post.getSone().isLocal()) { + localElementTicker.schedule(new Runnable() { + @Override + public void run() { + markPostKnown(post); + } + }, 10, TimeUnit.SECONDS); + } + } + }); + } + + public Optional postReplyCreated() { + return Optional.of(new PostReplyCreated() { + @Override + public void postReplyCreated(final PostReply postReply) { + if (postReply.isKnown()) { + return; + } + eventBus.post(new NewPostReplyFoundEvent(postReply)); + if (postReply.getSone().isLocal()) { + localElementTicker.schedule(new Runnable() { + + /** + * {@inheritDoc} + */ + @Override + public void run() { + postReplyUpdated().get().replyUpdated(postReply); + } + }, 10, TimeUnit.SECONDS); + } + } + }); + } + + public Optional> postReplyUpdated() { + return Optional.>of(new ReplyUpdated() { + @Override + public void replyUpdated(PostReply reply) { + eventBus.post(new MarkPostReplyKnownEvent(reply)); + } + }); + } + + public Optional imageCreated() { + return Optional.of(new ImageCreated() { + @Override + public void imageCreated(Image image) { + /* nothing happens here yet. */ + } + }); + } + }