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;
/* synchronize access on itself. */
private final Map<Sone, SoneStatus> soneStatuses = new HashMap<Sone, SoneStatus>();
+ /** The times Sones were followed. */
+ private final Map<Sone, Long> soneFollowingTimes = new HashMap<Sone, Long>();
+
/** Locked local Sones. */
/* synchronize on itself. */
private final Set<Sone> lockedSones = new HashSet<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())) {
}
Sone sone = addLocalSone(ownIdentity);
sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
+ sone.getOptions().addBooleanOption("EnableSoneInsertNotifications", new DefaultOption<Boolean>(false));
+ sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption<Boolean>(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption<Boolean>(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption<Boolean>(true));
sone.addFriend("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
touchConfiguration();
return sone;
}
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()) {
/* initialize options. */
sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
sone.getOptions().addBooleanOption("EnableSoneInsertNotifications", new DefaultOption<Boolean>(false));
+ sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption<Boolean>(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption<Boolean>(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption<Boolean>(true));
/* load Sone. */
String sonePrefix = "Sone/" + sone.getId();
}
/* 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);
/* load options. */
sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").set(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
+ sone.getOptions().getBooleanOption("ShowNotification/NewSones").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null));
+ sone.getOptions().getBooleanOption("ShowNotification/NewPosts").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null));
+ sone.getOptions().getBooleanOption("ShowNotification/NewReplies").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null));
/* if we’re still here, Sone was loaded successfully. */
synchronized (sone) {
}
}
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());
logger.log(Level.INFO, "Saving Sone: %s", sone);
try {
- ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
-
/* save Sone into configuration. */
String sonePrefix = "Sone/" + sone.getId();
configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
/* 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());
configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
/* save albums. first, collect in a flat structure, top-level first. */
- List<Album> albums = Sone.flattenAlbums(sone.getAlbums());
+ List<Album> albums = sone.getAllAlbums();
int albumCounter = 0;
for (Album album : albums) {
/* save options. */
configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").setValue(sone.getOptions().getBooleanOption("AutoFollow").getReal());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewSones").getReal());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewPosts").getReal());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewReplies").getReal());
configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").getReal());
configuration.save();
+
+ ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+
logger.log(Level.INFO, "Sone %s saved.", sone);
} catch (ConfigurationException ce1) {
logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
}
+ /* save Sone following times. */
+ soneCounter = 0;
+ synchronized (soneFollowingTimes) {
+ for (Entry<Sone, Long> soneFollowingTime : soneFollowingTimes.entrySet()) {
+ configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(soneFollowingTime.getKey().getId());
+ configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").setValue(soneFollowingTime.getValue());
+ ++soneCounter;
+ }
+ configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(null);
+ }
+
/* save known posts. */
int postCounter = 0;
synchronized (newPosts) {
}));
options.addIntegerOption("PostsPerPage", new DefaultOption<Integer>(10, new IntegerRangeValidator(1, Integer.MAX_VALUE)));
- options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(200, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
+ options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(400, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
options.addIntegerOption("PostCutOffLength", new DefaultOption<Integer>(200, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
options.addBooleanOption("RequireFullAccess", new DefaultOption<Boolean>(false));
options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75, new IntegerRangeValidator(0, 100)));
}
}
+ /* load Sone following times. */
+ soneCounter = 0;
+ while (true) {
+ String soneId = configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").getValue(null);
+ if (soneId == null) {
+ break;
+ }
+ long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
+ synchronized (soneFollowingTimes) {
+ soneFollowingTimes.put(getSone(soneId), time);
+ }
+ ++soneCounter;
+ }
+
/* load known posts. */
int postCounter = 0;
while (true) {
}
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);