X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=b25d8e3e1f6ea76fa58683b6b9684ef92b379e3c;hb=73ca2937b9fe41f637e22d721f54a8cefb75b580;hp=c39158208ba8ccdce636cca3265895d455f3fea0;hpb=61fea0173ef87542cae35247e6356ef36f2664d3;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 c391582..b25d8e3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -59,6 +59,7 @@ import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.service.AbstractService;
+import net.pterodactylus.util.thread.NamedThreadFactory;
 import net.pterodactylus.util.thread.Ticker;
 import net.pterodactylus.util.validation.EqualityValidator;
 import net.pterodactylus.util.validation.IntegerRangeValidator;
@@ -108,7 +109,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	private final ImageInserter imageInserter;
 
 	/** Sone downloader thread-pool. */
-	private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10);
+	private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10, new NamedThreadFactory("Sone Downloader %2$d"));
 
 	/** The update checker. */
 	private final UpdateChecker updateChecker;
@@ -608,18 +609,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 	/**
 	 * Returns the reply with the given ID. If there is no reply with the given
-	 * ID yet, a new one is created.
-	 *
-	 * @param replyId
-	 *            The ID of the reply to get
-	 * @return The reply
-	 */
-	public PostReply getReply(String replyId) {
-		return getReply(replyId, true);
-	}
-
-	/**
-	 * Returns the reply with the given ID. If there is no reply with the given
 	 * ID yet, a new one is created, unless {@code create} is false in which
 	 * case {@code null} is returned.
 	 *
@@ -630,7 +619,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *            to return {@code null} if no reply can be found
 	 * @return The reply, or {@code null} if there is no such reply
 	 */
-	public PostReply getReply(String replyId, boolean create) {
+	public PostReply getPostReply(String replyId, boolean create) {
 		synchronized (replies) {
 			PostReply reply = replies.get(replyId);
 			if (create && (reply == null)) {
@@ -1160,8 +1149,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 						if (!storedPosts.contains(post)) {
 							if (post.getTime() < getSoneFollowingTime(sone)) {
 								knownPosts.add(post.getId());
+								post.setKnown(true);
 							} else if (!knownPosts.contains(post.getId())) {
-								sone.setKnown(false);
 								coreListenerManager.fireNewPostFound(post);
 							}
 						}
@@ -1185,8 +1174,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 						if (!storedReplies.contains(reply)) {
 							if (reply.getTime() < getSoneFollowingTime(sone)) {
 								knownReplies.add(reply.getId());
+								reply.setKnown(true);
 							} else if (!knownReplies.contains(reply.getId())) {
-								reply.setKnown(false);
 								coreListenerManager.fireNewReplyFound(reply);
 							}
 						}
@@ -1381,7 +1370,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				logger.log(Level.WARNING, "Invalid reply found, aborting load!");
 				return;
 			}
-			replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
+			replies.add(getPostReply(replyId, true).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
 		}
 
 		/* load post likes. */
@@ -1579,6 +1568,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 * @return The created post
 	 */
 	public Post createPost(Sone sone, Sone recipient, long time, String text) {
+		Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.length(), 0).check();
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
 			return null;
@@ -1719,6 +1709,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 * @return The created reply
 	 */
 	public PostReply createReply(Sone sone, Post post, long time, String text) {
+		Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.trim().length(), 0).check();
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
 			return null;
@@ -2412,7 +2403,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
-		new Thread(new Runnable() {
+		soneDownloaders.execute(new Runnable() {
 
 			@Override
 			@SuppressWarnings("synthetic-access")
@@ -2423,7 +2414,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				soneDownloader.addSone(sone);
 				soneDownloader.fetchSone(sone);
 			}
-		}).start();
+		});
 	}
 
 	/**