X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommand.java;h=3a246c30334cfc0cb6e29a2ea5cdba29ee616414;hb=85aa9c556ef8ac726694f0077a4f8df0bc912e5f;hp=d88872ee9b2d83ad9698ab9c6f12951d665480ed;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index d88872e..3a246c3 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -22,10 +22,11 @@ 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.data.Profile.Field;
 import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
 import net.pterodactylus.sone.freenet.fcp.AbstractCommand;
 import net.pterodactylus.sone.freenet.fcp.Command;
@@ -205,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 + "”.");
 			}
@@ -305,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));
 		}
 
@@ -334,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 + "."));
 			}
 		}
 
@@ -351,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());