From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 11 Apr 2011 08:05:13 +0000 (+0200)
Subject: Add “localOnly” parameter to getSone().
X-Git-Tag: 0.6.5^2~39^2~12
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=58ba9d9a5ac37dc2e08d3d0bce762b3f93bc8de8;p=Sone.git

Add “localOnly” parameter to getSone().
---

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index b183121..87a76e2 100644
--- 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 + "”.");
 			}
diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index 3331c4f..d4b175c 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
@@ -54,7 +54,7 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 	 */
 	@Override
 	public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
-		Sone sone = getSone(parameters, "Sone");
+		Sone sone = getSone(parameters, "Sone", true);
 		int startPost = getInt(parameters, "StartPost", 0);
 		int maxPosts = getInt(parameters, "MaxPosts", -1);
 
diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java
index 24362d9..6a3b07e 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java
@@ -50,7 +50,7 @@ public class GetPostsCommand extends AbstractSoneCommand {
 	 */
 	@Override
 	public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
-		Sone sone = getSone(parameters, "Sone");
+		Sone sone = getSone(parameters, "Sone", false);
 		int startPost = getInt(parameters, "StartPost", 0);
 		int maxPosts = getInt(parameters, "MaxPosts", -1);
 		List<Post> posts = sone.getPosts();
diff --git a/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java
index 2147682..34b8516 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java
@@ -48,7 +48,7 @@ public class LikePostCommand extends AbstractSoneCommand {
 	@Override
 	public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
 		Post post = getPost(parameters, "Post");
-		Sone sone = getSone(parameters, "Sone");
+		Sone sone = getSone(parameters, "Sone", true);
 		sone.addLikedPostId(post.getId());
 		return new Response("PostLiked", new SimpleFieldSetBuilder().put("LikeCount", getCore().getLikes(post).size()).get());
 	}
diff --git a/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java b/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java
index a9795b2..53e4c02 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java
@@ -48,7 +48,7 @@ public class LikeReplyCommand extends AbstractSoneCommand {
 	@Override
 	public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
 		Reply reply = getReply(parameters, "Reply");
-		Sone sone = getSone(parameters, "Sone");
+		Sone sone = getSone(parameters, "Sone", true);
 		sone.addLikedReplyId(reply.getId());
 		return new Response("ReplyLiked", new SimpleFieldSetBuilder().put("LikeCount", getCore().getLikes(reply).size()).get());
 	}