X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommand.java;h=502cb36f416a7d5b71ecf83dd82204839aa26d2d;hp=1294b4356ab40df16c558b665c2e7449c6644667;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=689c7065471aedd7f3830e012bb82ca8a0fa697d

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index 1294b43..502cb36 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 - FcpInterface.java - Copyright © 2011 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2012 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
@@ -22,6 +22,9 @@ import java.util.List;
 
 import net.pterodactylus.sone.core.Core;
 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;
@@ -203,10 +206,10 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 *             if there is no reply ID stored under the given parameter
 	 *             name, or if the reply ID is invalid
 	 */
-	protected Reply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
+	protected PostReply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
 		try {
 			String replyId = simpleFieldSet.getString(parameterName);
-			Reply reply = core.getReply(replyId, false);
+			PostReply reply = core.getReply(replyId, false);
 			if (reply == null) {
 				throw new FcpException("Could not load reply from “" + replyId + "”.");
 			}
@@ -217,6 +220,41 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	}
 
 	/**
+	 * Creates a simple field set from the given Sone, including {@link Profile}
+	 * information.
+	 *
+	 * @param sone
+	 *            The Sone to encode
+	 * @param prefix
+	 *            The prefix for the field names (may be empty but not {@code
+	 *            null})
+	 * @param localSone
+	 *            An optional local Sone that is used for Sone-specific data,
+	 *            such as if the Sone is followed by the local Sone
+	 * @return The simple field set containing the given Sone
+	 */
+	protected SimpleFieldSet encodeSone(Sone sone, String prefix, Sone localSone) {
+		SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
+
+		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())));
+		}
+		Profile profile = sone.getProfile();
+		soneBuilder.put(prefix + "Field.Count", profile.getFields().size());
+		int fieldIndex = 0;
+		for (Field field : profile.getFields()) {
+			soneBuilder.put(prefix + "Field." + fieldIndex + ".Name", field.getName());
+			soneBuilder.put(prefix + "Field." + fieldIndex + ".Value", field.getValue());
+			++fieldIndex;
+		}
+
+		return soneBuilder.get();
+	}
+
+	/**
 	 * Creates a simple field set from the given collection of Sones.
 	 *
 	 * @param sones
@@ -268,7 +306,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 		postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
 
 		if (includeReplies) {
-			List<Reply> replies = core.getReplies(post);
+			List<PostReply> replies = core.getReplies(post);
 			postBuilder.put(encodeReplies(replies, prefix));
 		}
 
@@ -297,7 +335,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 			String postPrefix = prefix + postIndex++;
 			postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
 			if (includeReplies) {
-				postBuilder.put(encodeReplies(Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLIES_FILTER), postPrefix + "."));
+				postBuilder.put(encodeReplies(Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLY_FILTER), postPrefix + "."));
 			}
 		}
 
@@ -314,12 +352,12 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	 *            {@code null})
 	 * @return The simple field set containing the replies
 	 */
-	protected SimpleFieldSet encodeReplies(Collection<? extends Reply> replies, String prefix) {
+	protected SimpleFieldSet encodeReplies(Collection<? extends PostReply> replies, String prefix) {
 		SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
 
 		int replyIndex = 0;
 		replyBuilder.put(prefix + "Replies.Count", replies.size());
-		for (Reply reply : replies) {
+		for (PostReply reply : replies) {
 			String replyPrefix = prefix + "Replies." + replyIndex++ + ".";
 			replyBuilder.put(replyPrefix + "ID", reply.getId());
 			replyBuilder.put(replyPrefix + "Sone", reply.getSone().getId());