X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5564c37f22510157db5f22cf57cb3ed01c865058;hb=045fc6957de36dc6c35af39fe79c559b6cec62d1;hp=12294480019d16fb3a87f1b1f41863f5927d0b8b;hpb=5bcdc1b924c598b1e59551d44e2302ef29258dad;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 1229448..5564c37 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -229,6 +229,20 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.database = database;
 	}
 
+	@VisibleForTesting
+	protected Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, SoneDownloader soneDownloader, ImageInserter imageInserter, UpdateChecker updateChecker, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) {
+		super("Sone Core");
+		this.configuration = configuration;
+		this.freenetInterface = freenetInterface;
+		this.identityManager = identityManager;
+		this.soneDownloader = soneDownloader;
+		this.imageInserter = imageInserter;
+		this.updateChecker = updateChecker;
+		this.webOfTrustUpdater = webOfTrustUpdater;
+		this.eventBus = eventBus;
+		this.database = database;
+	}
+
 	//
 	// ACCESSORS
 	//
@@ -432,22 +446,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * 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.containsEntry(origin.getIdentity(), target.getIdentity());
-	}
-
-	/**
 	 * Returns a post builder.
 	 *
 	 * @return A new post builder
@@ -592,7 +590,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The ID of the album
 	 * @return The album with the given ID
 	 */
-	public Album getAlbum(String albumId) {
+	public Album getOrCreateAlbum(String albumId) {
 		return getAlbum(albumId, true);
 	}
 
@@ -1217,7 +1215,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album found, aborting load!");
 				return;
 			}
-			Album album = getAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
+			Album album = getOrCreateAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
 			if (albumParentId != null) {
 				Album parentAlbum = getAlbum(albumParentId, false);
 				if (parentAlbum == null) {
@@ -1315,34 +1313,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *
 	 * @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
@@ -1423,16 +1393,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * 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
@@ -1530,17 +1490,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * 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, sone.getRootAlbum());
-	}
-
-	/**
 	 * Creates a new album for the given Sone.
 	 *
 	 * @param sone
@@ -1604,7 +1553,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * Deletes the given image. This method will also delete a matching
 	 * temporary image.
 	 *
-	 * @see #deleteTemporaryImage(TemporaryImage)
+	 * @see #deleteTemporaryImage(String)
 	 * @param image
 	 *            The image to delete
 	 */
@@ -1636,17 +1585,6 @@ 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