X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=fd3b1d1a474eb297c757daaee7f03a8cc623b2fb;hp=d20549f4e4ac5e37e162b367f2e80b982ba803f8;hb=58497297d2b9a18cd2877a226870acfe9e8837af;hpb=f71df6b5b23b33abd64551c405316f76eb12d91f

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index d20549f..fd3b1d1 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -643,40 +643,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return newAlbum;
 	}
 
-	/**
-	 * 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) {
-		Optional<Image> image = database.getImage(imageId);
-		if (image.isPresent()) {
-			return image.get();
-		}
-		if (!create) {
-			return null;
-		}
-		Image newImage = database.newImageBuilder().withId(imageId).build();
-		database.storeImage(newImage);
-		return newImage;
+	public Optional<Image> getImage(String imageId) {
+		return database.getImage(imageId);
 	}
 
 	/**
@@ -1290,7 +1258,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		/* load avatar. */
 		String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
 		if (avatarId != null) {
-			profile.setAvatar(getImage(avatarId, false));
+			profile.setAvatar(getImage(avatarId).orNull());
 		}
 
 		/* load options. */
@@ -1700,9 +1668,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (temporaryImages) {
 			temporaryImages.remove(imageId);
 		}
-		Image image = getImage(imageId, false);
-		if (image != null) {
-			imageInserter.cancelImageInsert(image);
+		Optional<Image> image = getImage(imageId);
+		if (image.isPresent()) {
+			imageInserter.cancelImageInsert(image.get());
 		}
 	}