X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=4001f46dcb9d8ca177cf4d9f17b26852f8a2a8dc;hp=66dd23f1f3d2db3841bcfceabca58e20a182701e;hb=f44aa96bb0b188ffcb33b6c7fbdc5a86815d04b7;hpb=480691a26222e035e53bda56029524e160fdf898

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 66dd23f..4001f46 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -46,6 +46,7 @@ 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.data.impl.PostImpl;
 import net.pterodactylus.sone.fcp.FcpInterface;
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
 import net.pterodactylus.sone.freenet.wot.Identity;
@@ -561,7 +562,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (posts) {
 			Post post = posts.get(postId);
 			if ((post == null) && create) {
-				post = new Post(postId);
+				post = new PostImpl(postId);
 				posts.put(postId, post);
 			}
 			return post;
@@ -1599,7 +1600,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
 			return null;
 		}
-		final Post post = new Post(sone, time, text);
+		final Post post = new PostImpl(sone, time, text);
 		if (recipient != null) {
 			post.setRecipient(recipient);
 		}
@@ -2164,6 +2165,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
 			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
 			configuration.getIntValue("Option/PostsPerPage").setValue(options.getIntegerOption("PostsPerPage").getReal());
+			configuration.getIntValue("Option/ImagesPerPage").setValue(options.getIntegerOption("ImagesPerPage").getReal());
 			configuration.getIntValue("Option/CharactersPerPost").setValue(options.getIntegerOption("CharactersPerPost").getReal());
 			configuration.getIntValue("Option/PostCutOffLength").setValue(options.getIntegerOption("PostCutOffLength").getReal());
 			configuration.getBooleanValue("Option/RequireFullAccess").setValue(options.getBooleanOption("RequireFullAccess").getReal());
@@ -2250,6 +2252,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 		}));
 		options.addIntegerOption("PostsPerPage", new DefaultOption<Integer>(10, new IntegerRangeValidator(1, Integer.MAX_VALUE)));
+		options.addIntegerOption("ImagesPerPage", new DefaultOption<Integer>(9, new IntegerRangeValidator(1, Integer.MAX_VALUE)));
 		options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(400, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
 		options.addIntegerOption("PostCutOffLength", new DefaultOption<Integer>(200, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
 		options.addBooleanOption("RequireFullAccess", new DefaultOption<Boolean>(false));
@@ -2290,6 +2293,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 		loadConfigurationValue("InsertionDelay");
 		loadConfigurationValue("PostsPerPage");
+		loadConfigurationValue("ImagesPerPage");
 		loadConfigurationValue("CharactersPerPost");
 		loadConfigurationValue("PostCutOffLength");
 		options.getBooleanOption("RequireFullAccess").set(configuration.getBooleanValue("Option/RequireFullAccess").getValue(null));
@@ -2673,6 +2677,39 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		}
 
 		/**
+		 * Returns the number of images to show per page.
+		 *
+		 * @return The number of images to show per page
+		 */
+		public int getImagesPerPage() {
+			return options.getIntegerOption("ImagesPerPage").get();
+		}
+
+		/**
+		 * Validates the number of images per page.
+		 *
+		 * @param imagesPerPage
+		 *            The number of images per page
+		 * @return {@code true} if the number of images per page was valid,
+		 *         {@code false} otherwise
+		 */
+		public boolean validateImagesPerPage(Integer imagesPerPage) {
+			return options.getIntegerOption("ImagesPerPage").validate(imagesPerPage);
+		}
+
+		/**
+		 * Sets the number of images per page.
+		 *
+		 * @param imagesPerPage
+		 *            The number of images per page
+		 * @return This preferences object
+		 */
+		public Preferences setImagesPerPage(Integer imagesPerPage) {
+			options.getIntegerOption("ImagesPerPage").set(imagesPerPage);
+			return this;
+		}
+
+		/**
 		 * Returns the number of characters per post, or <code>-1</code> if the
 		 * posts should not be cut off.
 		 *