X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9269ea61c58c58a4f32300d4da312ffa94c86864;hb=16172b8d60c485ac52907ba45a354b754bce53e5;hp=f3927d928f7e441fe47a8135d4c2eefaf4437579;hpb=c5fff3247c8a680f816db28df64d6439779f5c82;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index f3927d9..9269ea6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -154,9 +154,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The trust updater. */
 	private final WebOfTrustUpdater webOfTrustUpdater;
 
-	/** The FCP interface. */
-	private volatile FcpInterface fcpInterface;
-
 	/** The times Sones were followed. */
 	private final Map<String, Long> soneFollowingTimes = new HashMap<String, Long>();
 
@@ -178,10 +175,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The post database. */
 	private final Database database;
 
-	/** All bookmarked posts. */
-	/* synchronize access on itself. */
-	private final Set<String> bookmarkedPosts = new HashSet<String>();
-
 	/** Trusted identities, sorted by own identities. */
 	private final Multimap<OwnIdentity, Identity> trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.<OwnIdentity, Identity>create());
 
@@ -281,16 +274,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Sets the FCP interface to use.
-	 *
-	 * @param fcpInterface
-	 *            The FCP interface to use
-	 */
-	public void setFcpInterface(FcpInterface fcpInterface) {
-		this.fcpInterface = fcpInterface;
-	}
-
-	/**
 	 * Returns the Sone rescuer for the given local Sone.
 	 *
 	 * @param sone
@@ -521,21 +504,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *         otherwise
 	 */
 	public boolean isBookmarked(Post post) {
-		return isPostBookmarked(post.getId());
-	}
-
-	/**
-	 * 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
-	 */
-	public boolean isPostBookmarked(String id) {
-		synchronized (bookmarkedPosts) {
-			return bookmarkedPosts.contains(id);
-		}
+		return database.isPostBookmarked(post);
 	}
 
 	/**
@@ -544,16 +513,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return All bookmarked posts
 	 */
 	public Set<Post> getBookmarkedPosts() {
-		Set<Post> posts = new HashSet<Post>();
-		synchronized (bookmarkedPosts) {
-			for (String bookmarkedPostId : bookmarkedPosts) {
-				Optional<Post> post = getPost(bookmarkedPostId);
-				if (post.isPresent()) {
-					posts.add(post.get());
-				}
-			}
-		}
-		return posts;
+		return database.getBookmarkedPosts();
 	}
 
 	public AlbumBuilder albumBuilder() {
@@ -679,7 +639,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), 0L));
 		sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 		sone.setKnown(true);
-		/* TODO - load posts ’n stuff */
 		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
@@ -1220,16 +1179,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 	}
 
-	/**
-	 * Bookmarks the post with the given ID.
-	 *
-	 * @param id
-	 *            The ID of the post to bookmark
-	 */
-	public void bookmarkPost(String id) {
-		synchronized (bookmarkedPosts) {
-			bookmarkedPosts.add(id);
-		}
+	public void bookmarkPost(Post post) {
+		database.bookmarkPost(post);
 	}
 
 	/**
@@ -1238,20 +1189,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @param post
 	 *            The post to unbookmark
 	 */
-	public void unbookmark(Post post) {
-		unbookmarkPost(post.getId());
-	}
-
-	/**
-	 * Removes the post with the given ID from the bookmarks.
-	 *
-	 * @param id
-	 *            The ID of the post to unbookmark
-	 */
-	public void unbookmarkPost(String id) {
-		synchronized (bookmarkedPosts) {
-			bookmarkedPosts.remove(id);
-		}
+	public void unbookmarkPost(Post post) {
+		database.unbookmarkPost(post);
 	}
 
 	/**
@@ -1677,10 +1616,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 
 			/* save bookmarked posts. */
 			int bookmarkedPostCounter = 0;
-			synchronized (bookmarkedPosts) {
-				for (String bookmarkedPostId : bookmarkedPosts) {
-					configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(bookmarkedPostId);
-				}
+			for (Post bookmarkedPost : getBookmarkedPosts()) {
+				configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(bookmarkedPost.getId());
 			}
 			configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(null);
 
@@ -1737,9 +1674,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			if (bookmarkedPostId == null) {
 				break;
 			}
-			synchronized (bookmarkedPosts) {
-				bookmarkedPosts.add(bookmarkedPostId);
-			}
+			database.bookmarkPost(bookmarkedPostId);
 		}
 
 	}