Add “localOnly” parameter to getSone().

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / AbstractSoneCommand.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index 8c4085c..87a76e2 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -79,15 +79,18 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         * @param parameterName
         *            The name under which the Sone ID is stored in the simple field
         *            set
+        * @param localOnly
+        *            {@code true} to only return local Sones, {@code false} to
+        *            return any Sones
         * @return The Sone
         * @throws FcpException
         *             if there is no Sone ID stored under the given parameter name,
         *             or if the Sone ID is invalid
         */
-       protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
+       protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly) throws FcpException {
                try {
                        String soneId = simpleFieldSet.getString(parameterName);
-                       Sone sone = core.getSone(soneId, false);
+                       Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false);
                        if (sone == null) {
                                throw new FcpException("Could not load Sone from “" + soneId + "”.");
                        }
@@ -124,6 +127,32 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
        }
 
        /**
+        * Returns a reply whose ID is a parameter in the given simple field set.
+        *
+        * @param simpleFieldSet
+        *            The simple field set containing the ID of the reply
+        * @param parameterName
+        *            The name under which the reply ID is stored in the simple
+        *            field set
+        * @return The reply
+        * @throws FcpException
+        *             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 {
+               try {
+                       String replyId = simpleFieldSet.getString(parameterName);
+                       Reply reply = core.getReply(replyId, false);
+                       if (reply == null) {
+                               throw new FcpException("Could not load reply from “" + replyId + "”.");
+                       }
+                       return reply;
+               } catch (FSParseException fspe1) {
+                       throw new FcpException("Could not reply ID from “" + parameterName + "”.", fspe1);
+               }
+       }
+
+       /**
         * Creates a simple field set from the given collection of Sones.
         *
         * @param sones
@@ -172,6 +201,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                }
                postBuilder.put(prefix + "Time", post.getTime());
                postBuilder.put(prefix + "Text", post.getText());
+               postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
 
                if (includeReplies) {
                        List<Reply> replies = core.getReplies(post);