X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommand.java;h=23f63a330fd32cf86da62c133c9d2098c1271e9d;hp=b9ff03ce780c34a9f5a525d11bb85d6441d715a5;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=b04f97f923dcae625ee2aaa15491c75864936b82

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index b9ff03c..23f63a3 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -1,5 +1,5 @@
 /*
- * Sone - AbstractSoneCommand.java - Copyright © 2011–2013 David Roden
+ * Sone - AbstractSoneCommand.java - Copyright © 2011–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Profile.Field;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
 import net.pterodactylus.sone.freenet.fcp.AbstractCommand;
@@ -33,16 +32,14 @@ import net.pterodactylus.sone.freenet.fcp.Command;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.sone.template.SoneAccessor;
 
-import com.google.common.collect.Collections2;
-
 import freenet.node.FSParseException;
 import freenet.support.SimpleFieldSet;
 
+import com.google.common.base.Optional;
+
 /**
  * Abstract base implementation of a {@link Command} with Sone-related helper
  * methods.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public abstract class AbstractSoneCommand extends AbstractCommand {
 
@@ -113,7 +110,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 * @return The encoded text
 	 */
 	protected static String encodeString(String text) {
-		return text.replaceAll("\\\\", "\\\\").replaceAll("\n", "\\\\n").replaceAll("\r", "\\\\r");
+		return text.replaceAll("\\\\", "\\\\\\\\").replaceAll("\n", "\\\\n").replaceAll("\r", "\\\\r");
 	}
 
 	/**
@@ -133,7 +130,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 *             or if the Sone ID is invalid
 	 */
 	protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly) throws FcpException {
-		return getSone(simpleFieldSet, parameterName, localOnly, true);
+		return getSone(simpleFieldSet, parameterName, localOnly, true).get();
 	}
 
 	/**
@@ -157,16 +154,16 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 *             or if {@code mandatory} is {@code true} and the Sone ID is
 	 *             invalid
 	 */
-	protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly, boolean mandatory) throws FcpException {
+	protected Optional<Sone> getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly, boolean mandatory) throws FcpException {
 		String soneId = simpleFieldSet.get(parameterName);
 		if (mandatory && (soneId == null)) {
 			throw new FcpException("Could not load Sone ID from “" + parameterName + "”.");
 		}
-		Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false);
-		if (mandatory && (sone == null)) {
+		Sone sone = core.getSone(soneId);
+		if ((mandatory && (sone == null)) || ((sone != null) && localOnly && !sone.isLocal())) {
 			throw new FcpException("Could not load Sone from “" + soneId + "”.");
 		}
-		return sone;
+		return Optional.fromNullable(sone);
 	}
 
 	/**
@@ -211,7 +208,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	protected PostReply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
 		try {
 			String replyId = simpleFieldSet.getString(parameterName);
-			PostReply reply = core.getPostReply(replyId, false);
+			PostReply reply = core.getPostReply(replyId);
 			if (reply == null) {
 				throw new FcpException("Could not load reply from “" + replyId + "”.");
 			}
@@ -235,14 +232,15 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 *            such as if the Sone is followed by the local Sone
 	 * @return The simple field set containing the given Sone
 	 */
-	protected static SimpleFieldSet encodeSone(Sone sone, String prefix, Sone localSone) {
+	protected static SimpleFieldSet encodeSone(Sone sone, String prefix, Optional<Sone> localSone) {
 		SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
 
+		soneBuilder.put(prefix + "ID", sone.getId());
 		soneBuilder.put(prefix + "Name", sone.getName());
 		soneBuilder.put(prefix + "NiceName", SoneAccessor.getNiceName(sone));
 		soneBuilder.put(prefix + "LastUpdated", sone.getTime());
-		if (localSone != null) {
-			soneBuilder.put(prefix + "Followed", String.valueOf(localSone.hasFriend(sone.getId())));
+		if (localSone.isPresent()) {
+			soneBuilder.put(prefix + "Followed", String.valueOf(localSone.get().hasFriend(sone.getId())));
 		}
 		Profile profile = sone.getProfile();
 		soneBuilder.put(prefix + "Field.Count", profile.getFields().size());
@@ -273,10 +271,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 		soneBuilder.put(prefix + "Count", sones.size());
 		for (Sone sone : sones) {
 			String sonePrefix = prefix + soneIndex++ + ".";
-			soneBuilder.put(sonePrefix + "ID", sone.getId());
-			soneBuilder.put(sonePrefix + "Name", sone.getName());
-			soneBuilder.put(sonePrefix + "NiceName", SoneAccessor.getNiceName(sone));
-			soneBuilder.put(sonePrefix + "Time", sone.getTime());
+			soneBuilder.put(encodeSone(sone, sonePrefix, Optional.<Sone>absent()));
 		}
 
 		return soneBuilder.get();
@@ -300,15 +295,15 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 
 		postBuilder.put(prefix + "ID", post.getId());
 		postBuilder.put(prefix + "Sone", post.getSone().getId());
-		if (post.getRecipient() != null) {
-			postBuilder.put(prefix + "Recipient", post.getRecipient().getId());
+		if (post.getRecipientId().isPresent()) {
+			postBuilder.put(prefix + "Recipient", post.getRecipientId().get());
 		}
 		postBuilder.put(prefix + "Time", post.getTime());
 		postBuilder.put(prefix + "Text", encodeString(post.getText()));
 		postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
 
 		if (includeReplies) {
-			List<PostReply> replies = core.getReplies(post);
+			List<PostReply> replies = core.getReplies(post.getId());
 			postBuilder.put(encodeReplies(replies, prefix));
 		}
 
@@ -336,9 +331,6 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 		for (Post post : posts) {
 			String postPrefix = prefix + postIndex++;
 			postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
-			if (includeReplies) {
-				postBuilder.put(encodeReplies(Collections2.filter(core.getReplies(post), Reply.FUTURE_REPLY_FILTER), postPrefix + "."));
-			}
 		}
 
 		return postBuilder.get();
@@ -354,7 +346,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 *            {@code null})
 	 * @return The simple field set containing the replies
 	 */
-	protected static SimpleFieldSet encodeReplies(Collection<? extends PostReply> replies, String prefix) {
+	protected SimpleFieldSet encodeReplies(Collection<? extends PostReply> replies, String prefix) {
 		SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
 
 		int replyIndex = 0;
@@ -365,6 +357,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 			replyBuilder.put(replyPrefix + "Sone", reply.getSone().getId());
 			replyBuilder.put(replyPrefix + "Time", reply.getTime());
 			replyBuilder.put(replyPrefix + "Text", encodeString(reply.getText()));
+			replyBuilder.put(encodeLikes(core.getLikes(reply), replyPrefix + "Likes."));
 		}
 
 		return replyBuilder.get();