X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1c9d6681a20bee0c0308003787930c84ab02ef0b;hb=ad70977c3d0ca6a9b360de9300ba91475d2eb6a2;hp=ad96ab0b7dc25c2b5f3914c7a75c7aa1539abe3b;hpb=b61436dafcb3eaae98c2352d188aaacb063031d0;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 ad96ab0..1c9d668 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1223,6 +1223,22 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					}
 				}
 			}
+			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);
+						}
+					}
+				}
+			}
 			synchronized (storedSone) {
 				if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
 					storedSone.setTime(sone.getTime());
@@ -1242,6 +1258,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					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());
@@ -2009,8 +2028,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 		logger.log(Level.INFO, "Saving Sone: %s", sone);
 		try {
-			((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
-
 			/* save Sone into configuration. */
 			String sonePrefix = "Sone/" + sone.getId();
 			configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
@@ -2078,7 +2095,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
 			/* save albums. first, collect in a flat structure, top-level first. */
-			List<Album> albums = Sone.flattenAlbums(sone.getAlbums());
+			List<Album> albums = sone.getAllAlbums();
 
 			int albumCounter = 0;
 			for (Album album : albums) {
@@ -2116,6 +2133,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").getReal());
 
 			configuration.save();
+
+			((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
@@ -2142,6 +2162,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
 			configuration.getIntValue("Option/PostsPerPage").setValue(options.getIntegerOption("PostsPerPage").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());
 			configuration.getIntValue("Option/PositiveTrust").setValue(options.getIntegerOption("PositiveTrust").getReal());
 			configuration.getIntValue("Option/NegativeTrust").setValue(options.getIntegerOption("NegativeTrust").getReal());
@@ -2215,7 +2236,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 		}));
 		options.addIntegerOption("PostsPerPage", new DefaultOption<Integer>(10, new IntegerRangeValidator(1, Integer.MAX_VALUE)));
-		options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(200, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
+		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));
 		options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75, new IntegerRangeValidator(0, 100)));
 		options.addIntegerOption("NegativeTrust", new DefaultOption<Integer>(-25, new IntegerRangeValidator(-100, 100)));
@@ -2255,6 +2277,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		loadConfigurationValue("InsertionDelay");
 		loadConfigurationValue("PostsPerPage");
 		loadConfigurationValue("CharactersPerPost");
+		loadConfigurationValue("PostCutOffLength");
 		options.getBooleanOption("RequireFullAccess").set(configuration.getBooleanValue("Option/RequireFullAccess").getValue(null));
 		loadConfigurationValue("PositiveTrust");
 		loadConfigurationValue("NegativeTrust");
@@ -2657,6 +2680,39 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		}
 
 		/**
+		 * Returns the number of characters the shortened post should have.
+		 *
+		 * @return The number of characters of the snippet
+		 */
+		public int getPostCutOffLength() {
+			return options.getIntegerOption("PostCutOffLength").get();
+		}
+
+		/**
+		 * Validates the number of characters after which to cut off the post.
+		 *
+		 * @param postCutOffLength
+		 *            The number of characters of the snippet
+		 * @return {@code true} if the number of characters of the snippet is
+		 *         valid, {@code false} otherwise
+		 */
+		public boolean validatePostCutOffLength(Integer postCutOffLength) {
+			return options.getIntegerOption("PostCutOffLength").validate(postCutOffLength);
+		}
+
+		/**
+		 * Sets the number of characters the shortened post should have.
+		 *
+		 * @param postCutOffLength
+		 *            The number of characters of the snippet
+		 * @return This preferences
+		 */
+		public Preferences setPostCutOffLength(Integer postCutOffLength) {
+			options.getIntegerOption("PostCutOffLength").set(postCutOffLength);
+			return this;
+		}
+
+		/**
 		 * Returns whether Sone requires full access to be even visible.
 		 *
 		 * @return {@code true} if Sone requires full access, {@code false}