import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.TemporaryImage;
import net.pterodactylus.sone.data.Profile.Field;
+import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
+import net.pterodactylus.sone.data.Sone.SoneStatus;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
import net.pterodactylus.sone.freenet.wot.Identity;
*/
public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
- /**
- * Enumeration for the possible states of a {@link Sone}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
- public enum SoneStatus {
-
- /** The Sone is unknown, i.e. not yet downloaded. */
- unknown,
-
- /** The Sone is idle, i.e. not being downloaded or inserted. */
- idle,
-
- /** The Sone is currently being inserted. */
- inserting,
-
- /** The Sone is currently being downloaded. */
- downloading,
- }
-
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
/** The FCP interface. */
private volatile FcpInterface fcpInterface;
- /** The Sones’ statuses. */
- /* 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>();
/* synchronize access on this on itself. */
private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
- /** All new Sones. */
- private Set<String> newSones = new HashSet<String>();
-
/** All known Sones. */
- /* synchronize access on {@link #newSones}. */
private Set<String> knownSones = new HashSet<String>();
/** All posts. */
private Map<String, Post> posts = new HashMap<String, Post>();
- /** All new posts. */
- private Set<String> newPosts = new HashSet<String>();
-
/** All known posts. */
- /* synchronize access on {@link #newPosts}. */
private Set<String> knownPosts = new HashSet<String>();
/** All replies. */
private Map<String, PostReply> replies = new HashMap<String, PostReply>();
- /** All new replies. */
- private Set<String> newReplies = new HashSet<String>();
-
/** All known replies. */
private Set<String> knownReplies = new HashSet<String>();
}
/**
- * Returns the status of the given Sone.
- *
- * @param sone
- * The Sone to get the status for
- * @return The status of the Sone
- */
- public SoneStatus getSoneStatus(Sone sone) {
- synchronized (soneStatuses) {
- return soneStatuses.get(sone);
- }
- }
-
- /**
- * Sets the status of the given Sone.
- *
- * @param sone
- * The Sone to set the status of
- * @param soneStatus
- * The status to set
- */
- public void setSoneStatus(Sone sone, SoneStatus soneStatus) {
- synchronized (soneStatuses) {
- soneStatuses.put(sone, soneStatus);
- }
- }
-
- /**
* Returns the Sone rescuer for the given local Sone.
*
* @param sone
if ((sone == null) && create) {
sone = new Sone(id);
localSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
}
return sone;
}
if ((sone == null) && create && (id != null) && (id.length() == 43)) {
sone = new Sone(id);
remoteSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
}
return sone;
}
}
/**
- * Returns whether the Sone with the given ID is a new Sone.
- *
- * @param soneId
- * The ID of the sone to check for
- * @return {@code true} if the given Sone is new, false otherwise
- */
- public boolean isNewSone(String soneId) {
- synchronized (newSones) {
- return !knownSones.contains(soneId) && newSones.contains(soneId);
- }
- }
-
- /**
* Returns whether the given Sone has been modified.
*
* @param sone
}
/**
- * Returns whether the given post ID is new.
- *
- * @param postId
- * The post ID
- * @return {@code true} if the post is considered to be new, {@code false}
- * otherwise
- */
- public boolean isNewPost(String postId) {
- synchronized (newPosts) {
- return !knownPosts.contains(postId) && newPosts.contains(postId);
- }
- }
-
- /**
* Returns all posts that have the given Sone as recipient.
*
* @see Post#getRecipient()
}
/**
- * Returns whether the reply with the given ID is new.
- *
- * @param replyId
- * The ID of the reply to check
- * @return {@code true} if the reply is considered to be new, {@code false}
- * otherwise
- */
- public boolean isNewReply(String replyId) {
- synchronized (newReplies) {
- return !knownReplies.contains(replyId) && newReplies.contains(replyId);
- }
- }
-
- /**
* Returns all Sones that have liked the given post.
*
* @param post
}
sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
+ sone.setKnown(true);
/* TODO - load posts ’n stuff */
localSones.put(ownIdentity.getId(), sone);
final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.addSoneInsertListener(this);
soneInserters.put(sone, soneInserter);
- setSoneStatus(sone, SoneStatus.idle);
+ sone.setStatus(SoneStatus.idle);
loadSone(sone);
soneInserter.start();
return sone;
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.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption<ShowCustomAvatars>(ShowCustomAvatars.NEVER));
+
followSone(sone, getSone("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI"));
touchConfiguration();
return sone;
sone.setRequestUri(getSoneUri(identity.getRequestUri()));
sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
if (newSone) {
- synchronized (newSones) {
+ synchronized (knownSones) {
newSone = !knownSones.contains(sone.getId());
- if (newSone) {
- newSones.add(sone.getId());
- }
}
+ sone.setKnown(!newSone);
if (newSone) {
coreListenerManager.fireNewSoneFound(sone);
for (Sone localSone : getLocalSones()) {
}
}
soneDownloader.addSone(sone);
- setSoneStatus(sone, SoneStatus.unknown);
soneDownloaders.execute(new Runnable() {
@Override
*/
public void followSone(Sone sone, String soneId) {
Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
+ Sone followedSone = getSone(soneId, true);
+ if (followedSone == null) {
+ logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
+ return;
+ }
followSone(sone, getSone(soneId));
}
}
}
List<Post> storedPosts = storedSone.getPosts();
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
- post.setSone(storedSone);
+ post.setSone(storedSone).setKnown(knownPosts.contains(post.getId()));
if (!storedPosts.contains(post)) {
if (post.getTime() < getSoneFollowingTime(sone)) {
knownPosts.add(post.getId());
} else if (!knownPosts.contains(post.getId())) {
- newPosts.add(post.getId());
+ sone.setKnown(false);
coreListenerManager.fireNewPostFound(post);
}
}
}
}
Set<PostReply> storedReplies = storedSone.getReplies();
- synchronized (newReplies) {
+ synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
- reply.setSone(storedSone);
+ reply.setSone(storedSone).setKnown(knownReplies.contains(reply.getId()));
if (!storedReplies.contains(reply)) {
if (reply.getTime() < getSoneFollowingTime(sone)) {
knownReplies.add(reply.getId());
} else if (!knownReplies.contains(reply.getId())) {
- newReplies.add(reply.getId());
+ reply.setKnown(false);
coreListenerManager.fireNewReplyFound(reply);
}
}
* The Sone to mark as known
*/
public void markSoneKnown(Sone sone) {
- synchronized (newSones) {
- if (newSones.remove(sone.getId())) {
+ if (!sone.isKnown()) {
+ sone.setKnown(true);
+ synchronized (knownSones) {
knownSones.add(sone.getId());
- coreListenerManager.fireMarkSoneKnown(sone);
- touchConfiguration();
}
+ coreListenerManager.fireMarkSoneKnown(sone);
+ touchConfiguration();
}
}
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.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption<ShowCustomAvatars>(ShowCustomAvatars.NEVER));
/* load Sone. */
String sonePrefix = "Sone/" + sone.getId();
String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
/* load profile. */
- Profile profile = new Profile();
+ Profile profile = new Profile(sone);
profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null));
profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null));
profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null));
album.addImage(image);
}
+ /* load avatar. */
+ String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
+ if (avatarId != null) {
+ profile.setAvatar(getImage(avatarId, false));
+ }
+
/* 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));
+ sone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").set(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name())));
/* if we’re still here, Sone was loaded successfully. */
synchronized (sone) {
sone.setAlbums(topLevelAlbums);
soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
}
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String friend : friends) {
knownSones.add(friend);
}
}
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (Post post : posts) {
knownPosts.add(post.getId());
}
}
- synchronized (newReplies) {
+ synchronized (knownReplies) {
for (PostReply reply : replies) {
knownReplies.add(reply.getId());
}
synchronized (posts) {
posts.put(post.getId(), post);
}
- synchronized (newPosts) {
- newPosts.add(post.getId());
- coreListenerManager.fireNewPostFound(post);
- }
+ coreListenerManager.fireNewPostFound(post);
sone.addPost(post);
touchConfiguration();
localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
posts.remove(post.getId());
}
coreListenerManager.firePostRemoved(post);
- synchronized (newPosts) {
- markPostKnown(post);
- knownPosts.remove(post.getId());
- }
+ markPostKnown(post);
touchConfiguration();
}
* The post to mark as known
*/
public void markPostKnown(Post post) {
- synchronized (newPosts) {
- if (newPosts.remove(post.getId())) {
- knownPosts.add(post.getId());
+ post.setKnown(true);
+ synchronized (knownPosts) {
+ if (knownPosts.add(post.getId())) {
coreListenerManager.fireMarkPostKnown(post);
touchConfiguration();
}
synchronized (replies) {
replies.put(reply.getId(), reply);
}
- synchronized (newReplies) {
- newReplies.add(reply.getId());
+ synchronized (knownReplies) {
coreListenerManager.fireNewReplyFound(reply);
}
sone.addReply(reply);
synchronized (replies) {
replies.remove(reply.getId());
}
- synchronized (newReplies) {
+ synchronized (knownReplies) {
markReplyKnown(reply);
knownReplies.remove(reply.getId());
}
* The reply to mark as known
*/
public void markReplyKnown(PostReply reply) {
- synchronized (newReplies) {
- if (newReplies.remove(reply.getId())) {
- knownReplies.add(reply.getId());
+ reply.setKnown(true);
+ synchronized (knownReplies) {
+ if (knownReplies.add(reply.getId())) {
coreListenerManager.fireMarkReplyKnown(reply);
touchConfiguration();
}
configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+ configuration.getStringValue(sonePrefix + "/Profile/Avatar").setValue(profile.getAvatar());
/* save profile fields. */
int fieldCounter = 0;
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.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get().name());
configuration.save();
/* save known Sones. */
int soneCounter = 0;
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String knownSoneId : knownSones) {
configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
}
/* save known posts. */
int postCounter = 0;
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (String knownPostId : knownPosts) {
configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
}
/* save known replies. */
int replyCounter = 0;
- synchronized (newReplies) {
+ synchronized (knownReplies) {
for (String knownReplyId : knownReplies) {
configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
}
if (knownSoneId == null) {
break;
}
- synchronized (newSones) {
+ synchronized (knownSones) {
knownSones.add(knownSoneId);
}
}
break;
}
long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
- synchronized (soneFollowingTimes) {
- soneFollowingTimes.put(getSone(soneId), time);
+ Sone followedSone = getSone(soneId);
+ if (followedSone == null) {
+ logger.log(Level.WARNING, String.format("Ignoring Sone with invalid ID: %s", soneId));
+ } else {
+ synchronized (soneFollowingTimes) {
+ soneFollowingTimes.put(getSone(soneId), time);
+ }
}
++soneCounter;
}
if (knownPostId == null) {
break;
}
- synchronized (newPosts) {
+ synchronized (knownPosts) {
knownPosts.add(knownPostId);
}
}
if (knownReplyId == null) {
break;
}
- synchronized (newReplies) {
+ synchronized (knownReplies) {
knownReplies.add(knownReplyId);
}
}
return;
}
synchronized (posts) {
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
- newPosts.remove(post.getId());
coreListenerManager.firePostRemoved(post);
}
}
}
synchronized (replies) {
- synchronized (newReplies) {
+ synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
- newReplies.remove(reply.getId());
coreListenerManager.fireReplyRemoved(reply);
}
}
synchronized (remoteSones) {
remoteSones.remove(identity.getId());
}
- synchronized (newSones) {
- newSones.remove(identity.getId());
- coreListenerManager.fireSoneRemoved(sone);
- }
+ coreListenerManager.fireSoneRemoved(sone);
}
//
*
* @param insertionDelay
* The insertion delay to validate
- * @return {@code true} if the given insertion delay was valid, {@code
- * false} otherwise
+ * @return {@code true} if the given insertion delay was valid,
+ * {@code false} otherwise
*/
public boolean validateInsertionDelay(Integer insertionDelay) {
return options.getIntegerOption("InsertionDelay").validate(insertionDelay);
projects / Sone.git / blobdiff