projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace JSON return object with Kotlin version
[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
368f49a
..
98a43ab
100644
(file)
--- 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 - AbstractSoneCommand.java - Copyright © 2011–201
3
David Roden
+ * Sone - AbstractSoneCommand.java - Copyright © 2011–201
6
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
*
* 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
@@
-25,7
+25,6
@@
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.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;
import net.pterodactylus.sone.freenet.fcp.AbstractCommand;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
import net.pterodactylus.sone.freenet.fcp.AbstractCommand;
@@
-33,12
+32,11
@@
import net.pterodactylus.sone.freenet.fcp.Command;
import net.pterodactylus.sone.freenet.fcp.FcpException;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.freenet.fcp.FcpException;
import net.pterodactylus.sone.template.SoneAccessor;
-import com.google.common.base.Optional;
-import com.google.common.collect.Collections2;
-
import freenet.node.FSParseException;
import freenet.support.SimpleFieldSet;
import freenet.node.FSParseException;
import freenet.support.SimpleFieldSet;
+import com.google.common.base.Optional;
+
/**
* Abstract base implementation of a {@link Command} with Sone-related helper
* methods.
/**
* Abstract base implementation of a {@link Command} with Sone-related helper
* methods.
@@
-114,7
+112,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
* @return The encoded text
*/
protected static String encodeString(String text) {
* @return The encoded text
*/
protected static String encodeString(String text) {
- return text.replaceAll("\\\\", "\\\\").replaceAll("\n", "\\\\n").replaceAll("\r", "\\\\r");
+ return text.replaceAll("\\\\", "\\\\
\\\\
").replaceAll("\n", "\\\\n").replaceAll("\r", "\\\\r");
}
/**
}
/**
@@
-134,7
+132,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
* or if the Sone ID is invalid
*/
protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly) throws FcpException {
* or if the Sone ID is invalid
*/
protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly) throws FcpException {
- return getSone(simpleFieldSet, parameterName, localOnly, true);
+ return getSone(simpleFieldSet, parameterName, localOnly, true)
.get()
;
}
/**
}
/**
@@
-158,13
+156,13
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
* or if {@code mandatory} is {@code true} and the Sone ID is
* invalid
*/
* or if {@code mandatory} is {@code true} and the Sone ID is
* invalid
*/
- protected
Sone
getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly, boolean mandatory) throws FcpException {
+ protected
Optional<Sone>
getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly, boolean mandatory) throws FcpException {
String soneId = simpleFieldSet.get(parameterName);
if (mandatory && (soneId == null)) {
throw new FcpException("Could not load Sone ID from “" + parameterName + "”.");
}
String soneId = simpleFieldSet.get(parameterName);
if (mandatory && (soneId == null)) {
throw new FcpException("Could not load Sone ID from “" + parameterName + "”.");
}
-
Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false
);
- if (
mandatory && (sone == null
)) {
+
Optional<Sone> sone = core.getSone(soneId
);
+ if (
(mandatory && !sone.isPresent()) || (sone.isPresent() && localOnly && !sone.get().isLocal()
)) {
throw new FcpException("Could not load Sone from “" + soneId + "”.");
}
return sone;
throw new FcpException("Could not load Sone from “" + soneId + "”.");
}
return sone;
@@
-236,14
+234,15
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
* such as if the Sone is followed by the local Sone
* @return The simple field set containing the given Sone
*/
* such as if the Sone is followed by the local Sone
* @return The simple field set containing the given Sone
*/
- protected static SimpleFieldSet encodeSone(Sone sone, String prefix,
Sone
localSone) {
+ protected static SimpleFieldSet encodeSone(Sone sone, String prefix,
Optional<Sone>
localSone) {
SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
+ soneBuilder.put(prefix + "ID", sone.getId());
soneBuilder.put(prefix + "Name", sone.getName());
soneBuilder.put(prefix + "NiceName", SoneAccessor.getNiceName(sone));
soneBuilder.put(prefix + "LastUpdated", sone.getTime());
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())));
+ if (localSone
.isPresent()
) {
+ soneBuilder.put(prefix + "Followed", String.valueOf(localSone.
get().
hasFriend(sone.getId())));
}
Profile profile = sone.getProfile();
soneBuilder.put(prefix + "Field.Count", profile.getFields().size());
}
Profile profile = sone.getProfile();
soneBuilder.put(prefix + "Field.Count", profile.getFields().size());
@@
-274,10
+273,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
soneBuilder.put(prefix + "Count", sones.size());
for (Sone sone : sones) {
String sonePrefix = prefix + soneIndex++ + ".";
soneBuilder.put(prefix + "Count", sones.size());
for (Sone sone : sones) {
String sonePrefix = prefix + soneIndex++ + ".";
- soneBuilder.put(sonePrefix + "ID", sone.getId());
- soneBuilder.put(sonePrefix + "Name", sone.getName());
- soneBuilder.put(sonePrefix + "NiceName", SoneAccessor.getNiceName(sone));
- soneBuilder.put(sonePrefix + "Time", sone.getTime());
+ soneBuilder.put(encodeSone(sone, sonePrefix, Optional.<Sone>absent()));
}
return soneBuilder.get();
}
return soneBuilder.get();
@@
-301,15
+297,15
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
postBuilder.put(prefix + "ID", post.getId());
postBuilder.put(prefix + "Sone", post.getSone().getId());
postBuilder.put(prefix + "ID", post.getId());
postBuilder.put(prefix + "Sone", post.getSone().getId());
- if (post.getRecipient
() != null
) {
- postBuilder.put(prefix + "Recipient", post.getRecipient
().getId
());
+ if (post.getRecipient
Id().isPresent()
) {
+ postBuilder.put(prefix + "Recipient", post.getRecipient
Id().get
());
}
postBuilder.put(prefix + "Time", post.getTime());
postBuilder.put(prefix + "Text", encodeString(post.getText()));
postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
if (includeReplies) {
}
postBuilder.put(prefix + "Time", post.getTime());
postBuilder.put(prefix + "Text", encodeString(post.getText()));
postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
if (includeReplies) {
- List<PostReply> replies = core.getReplies(post);
+ List<PostReply> replies = core.getReplies(post
.getId()
);
postBuilder.put(encodeReplies(replies, prefix));
}
postBuilder.put(encodeReplies(replies, prefix));
}
@@
-337,9
+333,6
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
for (Post post : posts) {
String postPrefix = prefix + postIndex++;
postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
for (Post post : posts) {
String postPrefix = prefix + postIndex++;
postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
- if (includeReplies) {
- postBuilder.put(encodeReplies(Collections2.filter(core.getReplies(post), Reply.FUTURE_REPLY_FILTER), postPrefix + "."));
- }
}
return postBuilder.get();
}
return postBuilder.get();
@@
-355,7
+348,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
* {@code null})
* @return The simple field set containing the replies
*/
* {@code null})
* @return The simple field set containing the replies
*/
- protected
static
SimpleFieldSet encodeReplies(Collection<? extends PostReply> replies, String prefix) {
+ protected SimpleFieldSet encodeReplies(Collection<? extends PostReply> replies, String prefix) {
SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
int replyIndex = 0;
SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
int replyIndex = 0;
@@
-366,6
+359,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
replyBuilder.put(replyPrefix + "Sone", reply.getSone().getId());
replyBuilder.put(replyPrefix + "Time", reply.getTime());
replyBuilder.put(replyPrefix + "Text", encodeString(reply.getText()));
replyBuilder.put(replyPrefix + "Sone", reply.getSone().getId());
replyBuilder.put(replyPrefix + "Time", reply.getTime());
replyBuilder.put(replyPrefix + "Text", encodeString(reply.getText()));
+ replyBuilder.put(encodeLikes(core.getLikes(reply), replyPrefix + "Likes."));
}
return replyBuilder.get();
}
return replyBuilder.get();