X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommand.java;h=baa3129e4f7f723cad8634ba212ab0d0157721c1;hb=f10d40f746f6c7c716f783da11791d28c1117447;hp=a66fdaee6d5f93d31779419476c6378a6e9553c5;hpb=959c51e271d7da6566ecd13b912ede0d5e627b3d;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 a66fdae..baa3129 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -119,8 +119,8 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	}
 
 	protected Optional<Sone> getOptionalSone(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
-		String soneId = getMandatoryParameter(simpleFieldSet, parameterName);
-		return core.getSone(soneId);
+		String soneId = getString(simpleFieldSet, parameterName, null);
+		return (soneId == null) ? Optional.<Sone>absent() : core.getSone(soneId);
 	}
 
 	protected Sone getMandatoryLocalSone(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
@@ -289,7 +289,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 		}
 		postBuilder.put(prefix + "Time", post.getTime());
 		postBuilder.put(prefix + "Text", encodeString(post.getText()));
-		postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
+		postBuilder.put(encodeLikes(post.getLikes(), prefix + "Likes."));
 
 		return postBuilder;
 	}