import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
private Set<String> knownPosts = new HashSet<String>();
/** All replies. */
- private Map<String, Reply> replies = new HashMap<String, Reply>();
+ private Map<String, PostReply> replies = new HashMap<String, PostReply>();
/** All new replies. */
private Set<String> newReplies = new HashSet<String>();
* The ID of the reply to get
* @return The reply
*/
- public Reply getReply(String replyId) {
+ public PostReply getReply(String replyId) {
return getReply(replyId, true);
}
* to return {@code null} if no reply can be found
* @return The reply, or {@code null} if there is no such reply
*/
- public Reply getReply(String replyId, boolean create) {
+ public PostReply getReply(String replyId, boolean create) {
synchronized (replies) {
- Reply reply = replies.get(replyId);
+ PostReply reply = replies.get(replyId);
if (create && (reply == null)) {
- reply = new Reply(replyId);
+ reply = new PostReply(replyId);
replies.put(replyId, reply);
}
return reply;
* The post to get all replies for
* @return All replies for the given post
*/
- public List<Reply> getReplies(Post post) {
+ public List<PostReply> getReplies(Post post) {
Set<Sone> sones = getSones();
- List<Reply> replies = new ArrayList<Reply>();
+ List<PostReply> replies = new ArrayList<PostReply>();
for (Sone sone : sones) {
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
if (reply.getPost().equals(post)) {
replies.add(reply);
}
* The reply to get the liking Sones for
* @return The Sones that like the given reply
*/
- public Set<Sone> getLikes(Reply reply) {
+ public Set<Sone> getLikes(PostReply reply) {
Set<Sone> sones = new HashSet<Sone>();
for (Sone sone : getSones()) {
if (sone.getLikedReplyIds().contains(reply.getId())) {
}
synchronized (replies) {
if (!soneRescueMode) {
- for (Reply reply : storedSone.getReplies()) {
+ for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
coreListenerManager.fireReplyRemoved(reply);
}
}
}
- Set<Reply> storedReplies = storedSone.getReplies();
+ Set<PostReply> storedReplies = storedSone.getReplies();
synchronized (newReplies) {
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
reply.setSone(storedSone);
if (!storedReplies.contains(reply) && !knownReplies.contains(reply.getId())) {
newReplies.add(reply.getId());
for (Post post : sone.getPosts()) {
storedSone.addPost(post);
}
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
storedSone.addReply(reply);
}
for (String likedPostId : sone.getLikedPostIds()) {
}
/* load replies. */
- Set<Reply> replies = new HashSet<Reply>();
+ Set<PostReply> replies = new HashSet<PostReply>();
while (true) {
String replyPrefix = sonePrefix + "/Replies/" + replies.size();
String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null);
}
}
synchronized (newReplies) {
- for (Reply reply : replies) {
+ for (PostReply reply : replies) {
knownReplies.add(reply.getId());
}
}
* The text of the reply
* @return The created reply
*/
- public Reply createReply(Sone sone, Post post, String text) {
+ public PostReply createReply(Sone sone, Post post, String text) {
return createReply(sone, post, System.currentTimeMillis(), text);
}
* The text of the reply
* @return The created reply
*/
- public Reply createReply(Sone sone, Post post, long time, String text) {
+ public PostReply createReply(Sone sone, Post post, long time, String text) {
if (!isLocalSone(sone)) {
logger.log(Level.FINE, "Tried to create reply for non-local Sone: %s", sone);
return null;
}
- final Reply reply = new Reply(sone, post, System.currentTimeMillis(), text);
+ final PostReply reply = new PostReply(sone, post, System.currentTimeMillis(), text);
synchronized (replies) {
replies.put(reply.getId(), reply);
}
* @param reply
* The reply to delete
*/
- public void deleteReply(Reply reply) {
+ public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
if (!isLocalSone(sone)) {
logger.log(Level.FINE, "Tried to delete non-local reply: %s", reply);
* @param reply
* The reply to mark as known
*/
- public void markReplyKnown(Reply reply) {
+ public void markReplyKnown(PostReply reply) {
synchronized (newReplies) {
if (newReplies.remove(reply.getId())) {
knownReplies.add(reply.getId());
/* save replies. */
int replyCounter = 0;
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId());
}
synchronized (replies) {
synchronized (newReplies) {
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
newReplies.remove(reply.getId());
coreListenerManager.fireReplyRemoved(reply);
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.version.Version;
* @param reply
* The new reply
*/
- public void newReplyFound(Reply reply);
+ public void newReplyFound(PostReply reply);
/**
* Notifies a listener that the given Sone is now marked as known.
* @param reply
* The known reply
*/
- public void markReplyKnown(Reply reply);
+ public void markReplyKnown(PostReply reply);
/**
* Notifies a listener that the given Sone was removed.
* @param reply
* The removed reply
*/
- public void replyRemoved(Reply reply);
+ public void replyRemoved(PostReply reply);
/**
* Notifies a listener when a Sone was locked.
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.event.AbstractListenerManager;
import net.pterodactylus.util.version.Version;
/**
* Notifies all listeners that a new reply has been found.
*
- * @see CoreListener#newReplyFound(Reply)
+ * @see CoreListener#newReplyFound(PostReply)
* @param reply
* The new reply
*/
- void fireNewReplyFound(Reply reply) {
+ void fireNewReplyFound(PostReply reply) {
for (CoreListener coreListener : getListeners()) {
coreListener.newReplyFound(reply);
}
* @param reply
* The known reply
*/
- void fireMarkReplyKnown(Reply reply) {
+ void fireMarkReplyKnown(PostReply reply) {
for (CoreListener coreListener : getListeners()) {
coreListener.markReplyKnown(reply);
}
/**
* Notifies all listener that the given reply was removed.
*
- * @see CoreListener#replyRemoved(Reply)
+ * @see CoreListener#replyRemoved(PostReply)
* @param reply
* The removed reply
*/
- void fireReplyRemoved(Reply reply) {
+ void fireReplyRemoved(PostReply reply) {
for (CoreListener coreListener : getListeners()) {
coreListener.replyRemoved(reply);
}
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
-import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.collection.Pair;
import net.pterodactylus.util.io.Closer;
/* parse replies. */
SimpleXML repliesXml = soneXml.getNode("replies");
- Set<Reply> replies = new HashSet<Reply>();
+ Set<PostReply> replies = new HashSet<PostReply>();
if (repliesXml == null) {
/* TODO - mark Sone as bad. */
logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone });
import net.pterodactylus.sone.core.Core.SoneStatus;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.StringBucket;
soneProperties.put("insertUri", sone.getInsertUri());
soneProperties.put("profile", sone.getProfile());
soneProperties.put("posts", new ListBuilder<Post>(new ArrayList<Post>(sone.getPosts())).sort(Post.TIME_COMPARATOR).get());
- soneProperties.put("replies", new ListBuilder<Reply>(new ArrayList<Reply>(sone.getReplies())).sort(new ReverseComparator<Reply>(Reply.TIME_COMPARATOR)).get());
+ soneProperties.put("replies", new ListBuilder<PostReply>(new ArrayList<PostReply>(sone.getReplies())).sort(new ReverseComparator<Reply<?>>(Reply.TIME_COMPARATOR)).get());
soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
soneProperties.put("albums", sone.getAllAlbums());
--- /dev/null
+/*
+ * Sone - PostReply.java - Copyright © 2010–2011 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.data;
+
+import java.util.UUID;
+
+/**
+ * A reply is like a {@link Post} but can never be posted on its own, it always
+ * refers to another {@link Post}.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class PostReply extends Reply<PostReply> {
+
+ /** The ID of the reply. */
+ private final UUID id;
+
+ /** The Sone that posted this reply. */
+ private volatile Sone sone;
+
+ /** The Post this reply refers to. */
+ private volatile Post post;
+
+ /** The time of the reply. */
+ private volatile long time;
+
+ /** The text of the reply. */
+ private volatile String text;
+
+ /**
+ * Creates a new reply.
+ *
+ * @param id
+ * The ID of the reply
+ */
+ public PostReply(String id) {
+ this(id, null, null, 0, null);
+ }
+
+ /**
+ * Creates a new reply.
+ *
+ * @param sone
+ * The sone that posted the reply
+ * @param post
+ * The post to reply to
+ * @param text
+ * The text of the reply
+ */
+ public PostReply(Sone sone, Post post, String text) {
+ this(sone, post, System.currentTimeMillis(), text);
+ }
+
+ /**
+ * Creates a new reply-
+ *
+ * @param sone
+ * The sone that posted the reply
+ * @param post
+ * The post to reply to
+ * @param time
+ * The time of the reply
+ * @param text
+ * The text of the reply
+ */
+ public PostReply(Sone sone, Post post, long time, String text) {
+ this(UUID.randomUUID().toString(), sone, post, time, text);
+ }
+
+ /**
+ * Creates a new reply-
+ *
+ * @param sone
+ * The sone that posted the reply
+ * @param id
+ * The ID of the reply
+ * @param post
+ * The post to reply to
+ * @param time
+ * The time of the reply
+ * @param text
+ * The text of the reply
+ */
+ public PostReply(String id, Sone sone, Post post, long time, String text) {
+ this.id = UUID.fromString(id);
+ this.sone = sone;
+ this.post = post;
+ this.time = time;
+ this.text = text;
+ }
+
+ //
+ // ACCESSORS
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getId() {
+ return id.toString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Sone getSone() {
+ return sone;
+ }
+
+ /**
+ * Sets the Sone that posted this reply.
+ *
+ * @param sone
+ * The Sone that posted this reply
+ * @return This reply (for method chaining)
+ */
+ public PostReply setSone(Sone sone) {
+ this.sone = sone;
+ return this;
+ }
+
+ /**
+ * Returns the post this reply refers to.
+ *
+ * @return The post this reply refers to
+ */
+ public Post getPost() {
+ return post;
+ }
+
+ /**
+ * Sets the post this reply refers to.
+ *
+ * @param post
+ * The post this reply refers to
+ * @return This reply (for method chaining)
+ */
+ public PostReply setPost(Post post) {
+ this.post = post;
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public long getTime() {
+ return time;
+ }
+
+ /**
+ * Sets the time of this reply.
+ *
+ * @param time
+ * The time of this reply (in milliseconds since Jan 1, 1970 UTC)
+ * @return This reply (for method chaining)
+ */
+ public PostReply setTime(long time) {
+ this.time = time;
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * Sets the text of this reply.
+ *
+ * @param text
+ * The text of this reply
+ * @return This reply (for method chaining)
+ */
+ public PostReply setText(String text) {
+ this.text = text;
+ return this;
+ }
+
+ //
+ // OBJECT METHODS
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode() {
+ return id.hashCode();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof PostReply)) {
+ return false;
+ }
+ PostReply reply = (PostReply) object;
+ return reply.id.equals(id);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return getClass().getName() + "[id=" + id + ",sone=" + sone + ",post=" + post + ",time=" + time + ",text=" + text + "]";
+ }
+
+}
/*
- * Sone - Reply.java - Copyright © 2010 David Roden
+ * Sone - Reply.java - Copyright © 2011 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
package net.pterodactylus.sone.data;
import java.util.Comparator;
-import java.util.UUID;
import net.pterodactylus.util.filter.Filter;
/**
- * A reply is like a {@link Post} but can never be posted on its own, it always
- * refers to another {@link Post}.
+ * Abstract base class for all replies.
*
+ * @param <T>
+ * The type of the reply
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class Reply {
+public abstract class Reply<T extends Reply<T>> {
/** Comparator that sorts replies ascending by time. */
- public static final Comparator<Reply> TIME_COMPARATOR = new Comparator<Reply>() {
+ public static final Comparator<Reply<?>> TIME_COMPARATOR = new Comparator<Reply<?>>() {
+ /**
+ * {@inheritDoc}
+ */
@Override
- public int compare(Reply leftReply, Reply rightReply) {
+ public int compare(Reply<?> leftReply, Reply<?> rightReply) {
return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
}
};
/** Filter for replies with timestamps from the future. */
- public static final Filter<Reply> FUTURE_REPLIES_FILTER = new Filter<Reply>() {
+ public static final Filter<Reply<?>> FUTURE_REPLY_FILTER = new Filter<Reply<?>>() {
+ /**
+ * {@inheritDoc}
+ */
@Override
- public boolean filterObject(Reply reply) {
+ public boolean filterObject(Reply<?> reply) {
return reply.getTime() <= System.currentTimeMillis();
}
};
- /** The ID of the reply. */
- private final UUID id;
-
- /** The Sone that posted this reply. */
- private volatile Sone sone;
-
- /** The Post this reply refers to. */
- private volatile Post post;
-
- /** The time of the reply. */
- private volatile long time;
-
- /** The text of the reply. */
- private volatile String text;
-
- /**
- * Creates a new reply.
- *
- * @param id
- * The ID of the reply
- */
- public Reply(String id) {
- this(id, null, null, 0, null);
- }
-
- /**
- * Creates a new reply.
- *
- * @param sone
- * The sone that posted the reply
- * @param post
- * The post to reply to
- * @param text
- * The text of the reply
- */
- public Reply(Sone sone, Post post, String text) {
- this(sone, post, System.currentTimeMillis(), text);
- }
-
- /**
- * Creates a new reply-
- *
- * @param sone
- * The sone that posted the reply
- * @param post
- * The post to reply to
- * @param time
- * The time of the reply
- * @param text
- * The text of the reply
- */
- public Reply(Sone sone, Post post, long time, String text) {
- this(UUID.randomUUID().toString(), sone, post, time, text);
- }
-
- /**
- * Creates a new reply-
- *
- * @param sone
- * The sone that posted the reply
- * @param id
- * The ID of the reply
- * @param post
- * The post to reply to
- * @param time
- * The time of the reply
- * @param text
- * The text of the reply
- */
- public Reply(String id, Sone sone, Post post, long time, String text) {
- this.id = UUID.fromString(id);
- this.sone = sone;
- this.post = post;
- this.time = time;
- this.text = text;
- }
-
- //
- // ACCESSORS
- //
-
/**
* Returns the ID of the reply.
*
* @return The ID of the reply
*/
- public String getId() {
- return id.toString();
- }
+ public abstract String getId();
/**
* Returns the Sone that posted this reply.
*
* @return The Sone that posted this reply
*/
- public Sone getSone() {
- return sone;
- }
-
- /**
- * Sets the Sone that posted this reply.
- *
- * @param sone
- * The Sone that posted this reply
- * @return This reply (for method chaining)
- */
- public Reply setSone(Sone sone) {
- this.sone = sone;
- return this;
- }
-
- /**
- * Returns the post this reply refers to.
- *
- * @return The post this reply refers to
- */
- public Post getPost() {
- return post;
- }
-
- /**
- * Sets the post this reply refers to.
- *
- * @param post
- * The post this reply refers to
- * @return This reply (for method chaining)
- */
- public Reply setPost(Post post) {
- this.post = post;
- return this;
- }
+ public abstract Sone getSone();
/**
* Returns the time of the reply.
*
* @return The time of the reply (in milliseconds since Jan 1, 1970 UTC)
*/
- public long getTime() {
- return time;
- }
-
- /**
- * Sets the time of this reply.
- *
- * @param time
- * The time of this reply (in milliseconds since Jan 1, 1970 UTC)
- * @return This reply (for method chaining)
- */
- public Reply setTime(long time) {
- this.time = time;
- return this;
- }
+ public abstract long getTime();
/**
* Returns the text of the reply.
*
* @return The text of the reply
*/
- public String getText() {
- return text;
- }
-
- /**
- * Sets the text of this reply.
- *
- * @param text
- * The text of this reply
- * @return This reply (for method chaining)
- */
- public Reply setText(String text) {
- this.text = text;
- return this;
- }
-
- //
- // OBJECT METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object object) {
- if (!(object instanceof Reply)) {
- return false;
- }
- Reply reply = (Reply) object;
- return reply.id.equals(id);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- return getClass().getName() + "[id=" + id + ",sone=" + sone + ",post=" + post + ",time=" + time + ",text=" + text + "]";
- }
+ public abstract String getText();
}
private final Set<Post> posts = Collections.synchronizedSet(new HashSet<Post>());
/** All replies. */
- private final Set<Reply> replies = Collections.synchronizedSet(new HashSet<Reply>());
+ private final Set<PostReply> replies = Collections.synchronizedSet(new HashSet<PostReply>());
/** The IDs of all liked posts. */
private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
*
* @return All replies this Sone made
*/
- public synchronized Set<Reply> getReplies() {
+ public synchronized Set<PostReply> getReplies() {
return Collections.unmodifiableSet(replies);
}
* The new (and only) replies of this Sone
* @return This Sone (for method chaining)
*/
- public synchronized Sone setReplies(Collection<Reply> replies) {
+ public synchronized Sone setReplies(Collection<PostReply> replies) {
this.replies.clear();
this.replies.addAll(replies);
return this;
* @param reply
* The reply to add
*/
- public synchronized void addReply(Reply reply) {
+ public synchronized void addReply(PostReply reply) {
if (reply.getSone().equals(this)) {
replies.add(reply);
}
* @param reply
* The reply to remove
*/
- public synchronized void removeReply(Reply reply) {
+ public synchronized void removeReply(PostReply reply) {
if (reply.getSone().equals(this)) {
replies.remove(reply);
}
}
fingerprint.append(")");
- List<Reply> replies = new ArrayList<Reply>(getReplies());
+ List<PostReply> replies = new ArrayList<PostReply>(getReplies());
Collections.sort(replies, Reply.TIME_COMPARATOR);
fingerprint.append("Replies(");
- for (Reply reply : replies) {
+ for (PostReply reply : replies) {
fingerprint.append("Reply(").append(reply.getId()).append(')');
}
fingerprint.append(')');
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.Reply;
import net.pterodactylus.sone.data.Sone;
* 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 + "”.");
}
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));
}
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 + "."));
}
}
* {@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());
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
Sone sone = getSone(parameters, "Sone", true);
Post post = getPost(parameters, "Post");
String text = getString(parameters, "Text");
- Reply reply = getCore().createReply(sone, post, text);
+ PostReply reply = getCore().createReply(sone, post, text);
return new Response("ReplyCreated", new SimpleFieldSetBuilder().put("Reply", reply.getId()).get());
}
package net.pterodactylus.sone.fcp;
import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
import net.pterodactylus.sone.freenet.fcp.FcpException;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
/**
- * FCP command that deletes a {@link Reply}.
+ * FCP command that deletes a {@link PostReply}.
*
- * @see Core#deleteReply(Reply)
+ * @see Core#deleteReply(PostReply)
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class DeleteReplyCommand extends AbstractSoneCommand {
*/
@Override
public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
- Reply reply = getReply(parameters, "Reply");
+ PostReply reply = getReply(parameters, "Reply");
if (!getCore().isLocalSone(reply.getSone())) {
return new ErrorResponse(401, "Not allowed.");
}
package net.pterodactylus.sone.fcp;
import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
import net.pterodactylus.sone.freenet.fcp.FcpException;
*/
@Override
public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
- Reply reply = getReply(parameters, "Reply");
+ PostReply reply = getReply(parameters, "Reply");
Sone sone = getSone(parameters, "Sone", true);
sone.addLikedReplyId(reply.getId());
return new Response("ReplyLiked", new SimpleFieldSetBuilder().put("LikeCount", getCore().getLikes(reply).size()).get());
import java.util.List;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
filteredNotifications.add(filteredNotification);
}
} else if (notification.getId().equals("new-reply-notification")) {
- ListNotification<Reply> filteredNotification = filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
+ ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
if (filteredNotification != null) {
filteredNotifications.add(filteredNotification);
}
* @return The filtered new-reply notification, or {@code null} if the
* notification should be removed
*/
- public static ListNotification<Reply> filterNewReplyNotification(ListNotification<Reply> newReplyNotification, Sone currentSone) {
+ public static ListNotification<PostReply> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
if (currentSone == null) {
return null;
}
- List<Reply> newReplies = new ArrayList<Reply>();
- for (Reply reply : newReplyNotification.getElements()) {
+ List<PostReply> newReplies = new ArrayList<PostReply>();
+ for (PostReply reply : newReplyNotification.getElements()) {
if (isReplyVisible(currentSone, reply)) {
newReplies.add(reply);
}
if (newReplies.size() == newReplyNotification.getElements().size()) {
return newReplyNotification;
}
- ListNotification<Reply> filteredNotification = new ListNotification<Reply>(newReplyNotification);
+ ListNotification<PostReply> filteredNotification = new ListNotification<PostReply>(newReplyNotification);
filteredNotification.setElements(newReplies);
filteredNotification.setLastUpdateTime(newReplyNotification.getLastUpdatedTime());
return filteredNotification;
* @return {@code true} if the reply is considered visible, {@code false}
* otherwise
*/
- public static boolean isReplyVisible(Sone sone, Reply reply) {
+ public static boolean isReplyVisible(Sone sone, PostReply reply) {
Validation.begin().isNotNull("Reply", reply).check();
Post post = reply.getPost();
if (post == null) {
public Object get(TemplateContext templateContext, Object object, String member) {
Post post = (Post) object;
if ("replies".equals(member)) {
- return Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLIES_FILTER);
+ return Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLY_FILTER);
} else if (member.equals("likes")) {
return core.getLikes(post);
} else if (member.equals("liked")) {
package net.pterodactylus.sone.template;
import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.template.Accessor;
*/
@Override
public Object get(TemplateContext templateContext, Object object, String member) {
- Reply reply = (Reply) object;
+ PostReply reply = (PostReply) object;
if ("likes".equals(member)) {
return core.getLikes(reply);
} else if (member.equals("liked")) {
import java.util.Set;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.template.Filter;
import net.pterodactylus.util.template.TemplateContext;
@Override
public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
@SuppressWarnings("unchecked")
- List<Reply> allReplies = (List<Reply>) data;
+ List<PostReply> allReplies = (List<PostReply>) data;
Map<Post, Set<Sone>> postSones = new HashMap<Post, Set<Sone>>();
- Map<Post, Set<Reply>> postReplies = new HashMap<Post, Set<Reply>>();
- for (Reply reply : allReplies) {
+ Map<Post, Set<PostReply>> postReplies = new HashMap<Post, Set<PostReply>>();
+ for (PostReply reply : allReplies) {
Post post = reply.getPost();
Set<Sone> sones = postSones.get(post);
if (sones == null) {
postSones.put(post, sones);
}
sones.add(reply.getSone());
- Set<Reply> replies = postReplies.get(post);
+ Set<PostReply> replies = postReplies.get(post);
if (replies == null) {
- replies = new HashSet<Reply>();
+ replies = new HashSet<PostReply>();
postReplies.put(post, replies);
}
replies.add(reply);
package net.pterodactylus.sone.web;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
String replyId = request.getHttpRequest().getPartAsStringFailsafe("reply", 36);
- Reply reply = webInterface.getCore().getReply(replyId);
+ PostReply reply = webInterface.getCore().getReply(replyId);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
if (request.getMethod() == Method.POST) {
if (!webInterface.getCore().isLocalSone(reply.getSone())) {
import java.util.StringTokenizer;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.page.FreenetRequest;
}
webInterface.getCore().markPostKnown(post);
} else if (type.equals("reply")) {
- Reply reply = webInterface.getCore().getReply(id, false);
+ PostReply reply = webInterface.getCore().getReply(id, false);
if (reply == null) {
continue;
}
import java.util.logging.Logger;
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;
if (post.getRecipient() != null) {
postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(post.getRecipient()));
}
- for (Reply reply : Filters.filteredList(webInterface.getCore().getReplies(post), Reply.FUTURE_REPLIES_FILTER)) {
+ for (PostReply reply : Filters.filteredList(webInterface.getCore().getReplies(post), Reply.FUTURE_REPLY_FILTER)) {
postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(reply.getSone()));
postString.append(' ').append(reply.getText());
}
import java.util.Set;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.web.page.FreenetRequest;
Pagination<Post> postPagination = new Pagination<Post>(sonePosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
templateContext.set("postPagination", postPagination);
templateContext.set("posts", postPagination.getItems());
- Set<Reply> replies = sone.getReplies();
- final Map<Post, List<Reply>> repliedPosts = new HashMap<Post, List<Reply>>();
- for (Reply reply : replies) {
+ Set<PostReply> replies = sone.getReplies();
+ final Map<Post, List<PostReply>> repliedPosts = new HashMap<Post, List<PostReply>>();
+ for (PostReply reply : replies) {
Post post = reply.getPost();
if (repliedPosts.containsKey(post) || sone.equals(post.getSone()) || (sone.equals(post.getRecipient()))) {
continue;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.L10nFilter;
private final ListNotification<Post> newPostNotification;
/** The “new reply” notification. */
- private final ListNotification<Reply> newReplyNotification;
+ private final ListNotification<PostReply> newReplyNotification;
/** The invisible “local post” notification. */
private final ListNotification<Post> localPostNotification;
/** The invisible “local reply” notification. */
- private final ListNotification<Reply> localReplyNotification;
+ private final ListNotification<PostReply> localReplyNotification;
/** The “you have been mentioned” notification. */
private final ListNotification<Post> mentionNotification;
localPostNotification = new ListNotification<Post>("local-post-notification", "posts", localPostNotificationTemplate, false);
Template newReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
- newReplyNotification = new ListNotification<Reply>("new-reply-notification", "replies", newReplyNotificationTemplate, false);
+ newReplyNotification = new ListNotification<PostReply>("new-reply-notification", "replies", newReplyNotificationTemplate, false);
Template localReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
- localReplyNotification = new ListNotification<Reply>("local-reply-notification", "replies", localReplyNotificationTemplate, false);
+ localReplyNotification = new ListNotification<PostReply>("local-reply-notification", "replies", localReplyNotificationTemplate, false);
Template mentionNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/mentionNotification.html"));
mentionNotification = new ListNotification<Post>("mention-notification", "posts", mentionNotificationTemplate, false);
*
* @return The new replies
*/
- public Set<Reply> getNewReplies() {
- return new SetBuilder<Reply>().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).get();
+ public Set<PostReply> getNewReplies() {
+ return new SetBuilder<PostReply>().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).get();
}
/**
* {@inheritDoc}
*/
@Override
- public void newReplyFound(Reply reply) {
+ public void newReplyFound(PostReply reply) {
boolean isLocal = getCore().isLocalSone(reply.getSone());
if (isLocal) {
localReplyNotification.add(reply);
* {@inheritDoc}
*/
@Override
- public void markReplyKnown(Reply reply) {
+ public void markReplyKnown(PostReply reply) {
newReplyNotification.remove(reply);
localReplyNotification.remove(reply);
mentionNotification.remove(reply.getPost());
* {@inheritDoc}
*/
@Override
- public void replyRemoved(Reply reply) {
+ public void replyRemoved(PostReply reply) {
newReplyNotification.remove(reply);
localReplyNotification.remove(reply);
}
package net.pterodactylus.sone.web.ajax;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.text.TextFilter;
import net.pterodactylus.sone.web.WebInterface;
return createErrorJsonObject("invalid-post-id");
}
text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
- Reply reply = webInterface.getCore().createReply(sender, post, text);
+ PostReply reply = webInterface.getCore().createReply(sender, post, text);
return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.getId());
}
package net.pterodactylus.sone.web.ajax;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
@Override
protected JsonObject createJsonObject(FreenetRequest request) {
String replyId = request.getHttpRequest().getParam("reply");
- Reply reply = webInterface.getCore().getReply(replyId);
+ PostReply reply = webInterface.getCore().getReply(replyId);
if (reply == null) {
return createErrorJsonObject("invalid-reply-id");
}
import java.util.Set;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.web.WebInterface;
Set<Sone> sones = webInterface.getCore().getLikes(post);
return createSuccessJsonObject().put("likes", sones.size()).put("sones", getSones(sones));
} else if ("reply".equals(type)) {
- Reply reply = webInterface.getCore().getReply(id);
+ PostReply reply = webInterface.getCore().getReply(id);
Set<Sone> sones = webInterface.getCore().getLikes(reply);
return createSuccessJsonObject().put("likes", sones.size()).put("sones", getSones(sones));
}
import java.io.StringWriter;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.main.SonePlugin;
import net.pterodactylus.sone.notify.ListNotification;
if ("new-post-notification".equals(notificationId)) {
notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone, false);
} else if ("new-reply-notification".equals(notificationId)) {
- notification = ListNotificationFilters.filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
+ notification = ListNotificationFilters.filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
} else if ("mention-notification".equals(notificationId)) {
notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone, false);
}
import java.io.StringWriter;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
@Override
protected JsonObject createJsonObject(FreenetRequest request) {
String replyId = request.getHttpRequest().getParam("reply");
- Reply reply = webInterface.getCore().getReply(replyId);
+ PostReply reply = webInterface.getCore().getReply(replyId);
if ((reply == null) || (reply.getSone() == null)) {
return createErrorJsonObject("invalid-reply-id");
}
* The currently logged in Sone (to store in the template)
* @return The JSON representation of the reply
*/
- private JsonObject createJsonReply(FreenetRequest request, Reply reply, Sone currentSone) {
+ private JsonObject createJsonReply(FreenetRequest request, PostReply reply, Sone currentSone) {
JsonObject jsonReply = new JsonObject();
jsonReply.put("id", reply.getId());
jsonReply.put("postId", reply.getPost().getId());
import java.util.Set;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.notify.ListNotificationFilters;
import net.pterodactylus.sone.template.SoneAccessor;
jsonPosts.add(jsonPost);
}
/* load new replies. */
- Set<Reply> newReplies = webInterface.getNewReplies();
+ Set<PostReply> newReplies = webInterface.getNewReplies();
if (currentSone != null) {
- newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+ newReplies = Filters.filteredSet(newReplies, new Filter<PostReply>() {
@Override
- public boolean filterObject(Reply reply) {
+ public boolean filterObject(PostReply reply) {
return ListNotificationFilters.isReplyVisible(currentSone, reply);
}
});
}
/* remove replies to unknown posts. */
- newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+ newReplies = Filters.filteredSet(newReplies, new Filter<PostReply>() {
@Override
- public boolean filterObject(Reply reply) {
+ public boolean filterObject(PostReply reply) {
return (reply.getPost() != null) && (reply.getPost().getSone() != null);
}
});
JsonArray jsonReplies = new JsonArray();
- for (Reply reply : newReplies) {
+ for (PostReply reply : newReplies) {
JsonObject jsonReply = new JsonObject();
jsonReply.put("id", reply.getId());
jsonReply.put("sone", reply.getSone().getId());
import java.util.Date;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
if (allIds.length() > 0) {
String[] ids = allIds.split(",");
for (String id : ids) {
- Reply reply = webInterface.getCore().getReply(id, false);
+ PostReply reply = webInterface.getCore().getReply(id, false);
if (reply == null) {
continue;
}
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
}
core.markPostKnown(post);
} else if (type.equals("reply")) {
- Reply reply = core.getReply(id, false);
+ PostReply reply = core.getReply(id, false);
if (reply == null) {
continue;
}
projects / Sone.git / commitdiff