X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=b838216860d0593ac5a8d6badf959cb63d067a33;hb=358a9a2ab0ead0cc4dd86e3b97fa387ec958ec01;hp=459431ced7ee5dc24b9e8f8a775f7ead52aa48cf;hpb=94041feaf2a141b8c75725301f06d7e4bc617a12;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 459431c..b838216 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -18,9 +18,13 @@
 package net.pterodactylus.sone.core;
 
 import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -36,6 +40,7 @@ import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
+import freenet.client.FetchResult;
 import freenet.keys.FreenetURI;
 
 /**
@@ -137,6 +142,15 @@ public class Core extends AbstractService {
 	}
 
 	/**
+	 * Returns all known sones.
+	 *
+	 * @return All known sones
+	 */
+	public Collection<Sone> getKnownSones() {
+		return soneCache.values();
+	}
+
+	/**
 	 * Creates a new post.
 	 *
 	 * @param sone
@@ -161,7 +175,43 @@ public class Core extends AbstractService {
 	 * @return The created post
 	 */
 	public Post createPost(Sone sone, long time, String text) {
-		return getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text);
+		Post post = getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text);
+		sone.addPost(post);
+		return post;
+	}
+
+	/**
+	 * Creates a reply.
+	 *
+	 * @param sone
+	 *            The Sone that posts the reply
+	 * @param post
+	 *            The post the reply refers to
+	 * @param text
+	 *            The text of the reply
+	 * @return The created reply
+	 */
+	public Reply createReply(Sone sone, Post post, String text) {
+		return createReply(sone, post, System.currentTimeMillis(), text);
+	}
+
+	/**
+	 * Creates a reply.
+	 *
+	 * @param sone
+	 *            The Sone that posts the reply
+	 * @param post
+	 *            The post the reply refers to
+	 * @param time
+	 *            The time of the post
+	 * @param text
+	 *            The text of the reply
+	 * @return The created reply
+	 */
+	public Reply createReply(Sone sone, Post post, long time, String text) {
+		Reply reply = getReply(UUID.randomUUID().toString()).setSone(sone).setPost(post).setTime(time).setText(text);
+		sone.addReply(reply);
+		return reply;
 	}
 
 	//
@@ -169,6 +219,18 @@ public class Core extends AbstractService {
 	//
 
 	/**
+	 * Adds a Sone to watch for updates. The Sone needs to be completely
+	 * initialized.
+	 *
+	 * @param sone
+	 *            The Sone to watch for updates
+	 */
+	public void addSone(Sone sone) {
+		soneCache.put(sone.getId(), sone);
+		soneDownloader.addSone(sone);
+	}
+
+	/**
 	 * Adds the given Sone.
 	 *
 	 * @param sone
@@ -176,28 +238,13 @@ public class Core extends AbstractService {
 	 */
 	public void addLocalSone(Sone sone) {
 		if (localSones.add(sone)) {
-			soneCache.put(sone.getId(), sone);
 			SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
 			soneInserter.start();
-			soneDownloader.addSone(sone);
 			soneInserters.put(sone, soneInserter);
 		}
 	}
 
 	/**
-	 * Adds a remote Sone so that it is watched for updates.
-	 *
-	 * @param sone
-	 *            The sone to watch
-	 */
-	public void addSone(Sone sone) {
-		if (!soneCache.containsKey(sone.getId())) {
-			soneCache.put(sone.getId(), sone);
-		}
-		soneDownloader.addSone(sone);
-	}
-
-	/**
 	 * Creates a new Sone at a random location.
 	 *
 	 * @param name
@@ -244,7 +291,7 @@ public class Core extends AbstractService {
 		Sone sone;
 		try {
 			logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, finalRequestUri, finalInsertUri });
-			sone = new Sone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
+			sone = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
 			sone.setProfile(new Profile());
 			/* set modification counter to 1 so it is inserted immediately. */
 			sone.setModificationCounter(1);
@@ -256,6 +303,22 @@ public class Core extends AbstractService {
 	}
 
 	/**
+	 * Loads the Sone from the given request URI.
+	 *
+	 * @param requestUri
+	 *            The request URI to load the Sone from
+	 */
+	public void loadSone(String requestUri) {
+		try {
+			FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" });
+			FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+			soneDownloader.parseSone(null, fetchResult, realRequestUri);
+		} catch (MalformedURLException mue1) {
+			logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
+		}
+	}
+
+	/**
 	 * Deletes the given Sone from this plugin instance.
 	 *
 	 * @param sone
@@ -297,6 +360,33 @@ public class Core extends AbstractService {
 		return replyCache.get(replyId);
 	}
 
+	/**
+	 * Gets all replies to the given post, sorted by date, oldest first.
+	 *
+	 * @param post
+	 *            The post the replies refer to
+	 * @return The sorted list of replies for the post
+	 */
+	public List<Reply> getReplies(Post post) {
+		List<Reply> replies = new ArrayList<Reply>();
+		for (Reply reply : replyCache.values()) {
+			if (reply.getPost().equals(post)) {
+				replies.add(reply);
+			}
+		}
+		Collections.sort(replies, new Comparator<Reply>() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public int compare(Reply leftReply, Reply rightReply) {
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
+			}
+		});
+		return replies;
+	}
+
 	//
 	// SERVICE METHODS
 	//
@@ -353,8 +443,7 @@ public class Core extends AbstractService {
 				profile.setFirstName(firstName);
 				profile.setMiddleName(middleName);
 				profile.setLastName(lastName);
-				Sone sone = new Sone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
-				soneCache.put(id, sone);
+				Sone sone = getSone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
 				sone.setProfile(profile);
 				int postId = 0;
 				do {
@@ -375,15 +464,11 @@ public class Core extends AbstractService {
 					if (replyId == null) {
 						break;
 					}
-					Sone replySone = getSone(configuration.getStringValue(replyPrefix + "/Sone/ID").getValue(null));
-					String replySoneKey = configuration.getStringValue(replyPrefix + "/Sone/Key").getValue(null);
-					String replySoneName = configuration.getStringValue(replyPrefix + "/Sone/Name").getValue(null);
-					replySone.setRequestUri(new FreenetURI(replySoneKey)).setName(replySoneName);
-					Post replyPost = postCache.get(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
+					Post replyPost = getPost(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
 					long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue(null);
 					String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
-					Reply reply = getReply(replyId).setSone(replySone).setPost(replyPost).setTime(replyTime).setText(replyText);
-					replyCache.put(replyId, reply);
+					Reply reply = getReply(replyId).setSone(sone).setPost(replyPost).setTime(replyTime).setText(replyText);
+					sone.addReply(reply);
 				} while (true);
 
 				/* load friends. */
@@ -398,8 +483,8 @@ public class Core extends AbstractService {
 					String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null);
 					String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null);
 					friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName);
-					addSone(friendSone);
-					sone.addFriend(sone);
+					soneDownloader.addSone(friendSone);
+					sone.addFriend(friendSone);
 				}
 
 				sone.setModificationCounter(modificationCounter);
@@ -447,9 +532,6 @@ public class Core extends AbstractService {
 				for (Reply reply : sone.getReplies()) {
 					String replyPrefix = sonePrefix + "/Reply." + replyId++;
 					configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
-					configuration.getStringValue(replyPrefix + "/Sone/ID").setValue(reply.getSone().getId());
-					configuration.getStringValue(replyPrefix + "/Sone/Key").setValue(reply.getSone().getRequestUri().toString());
-					configuration.getStringValue(replyPrefix + "/Sone/Name").setValue(reply.getSone().getName());
 					configuration.getStringValue(replyPrefix + "/Post").setValue(reply.getPost().getId());
 					configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
 					configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());