X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ed34ef2d4e7260cff984a62604aeb0b0c22a1366;hp=2112e18b96b40d592376bc54fc73067bc73b3ca7;hb=c3240e5c85d0cd49e346939f864cf93fa36daed0;hpb=b3d8b88791743298e897d7f5400304a54f6e2ba4
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 2112e18..ed34ef2 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -44,6 +44,8 @@ import net.pterodactylus.sone.data.Reply;
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;
@@ -73,26 +75,6 @@ import freenet.keys.FreenetURI;
*/
public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
- /**
- * Enumeration for the possible states of a {@link Sone}.
- *
- * @author David âBombeâ Roden
- */
- 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);
@@ -132,10 +114,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/** The FCP interface. */
private volatile FcpInterface fcpInterface;
- /** The Sonesâ statuses. */
- /* synchronize access on itself. */
- private final Map soneStatuses = new HashMap();
-
/** The times Sones were followed. */
private final Map soneFollowingTimes = new HashMap();
@@ -159,11 +137,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/* synchronize access on this on itself. */
private Map remoteSones = new HashMap();
- /** All new Sones. */
- private Set newSones = new HashSet();
-
/** All known Sones. */
- /* synchronize access on {@link #newSones}. */
private Set knownSones = new HashSet();
/** All posts. */
@@ -305,33 +279,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * 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
@@ -487,7 +434,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if ((sone == null) && create) {
sone = new Sone(id);
localSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
}
return sone;
}
@@ -509,17 +455,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @param id
* The ID of the remote Sone to get
- * @return The Sone with the given ID
- */
- public Sone getRemoteSone(String id) {
- return getRemoteSone(id, true);
- }
-
- /**
- * Returns the remote Sone with the given ID.
- *
- * @param id
- * The ID of the remote Sone to get
* @param create
* {@code true} to always create a Sone, {@code false} to return
* {@code null} if no Sone with the given ID exists
@@ -528,10 +463,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public Sone getRemoteSone(String id, boolean create) {
synchronized (remoteSones) {
Sone sone = remoteSones.get(id);
- if ((sone == null) && create) {
+ if ((sone == null) && create && (id != null) && (id.length() == 43)) {
sone = new Sone(id);
remoteSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
}
return sone;
}
@@ -566,19 +500,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * 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
@@ -956,29 +877,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * Adds a local Sone from the given ID which has to be the ID of an own
- * identity.
- *
- * @param id
- * The ID of an own identity to add a Sone for
- * @return The added (or already existing) Sone
- */
- public Sone addLocalSone(String id) {
- synchronized (localSones) {
- if (localSones.containsKey(id)) {
- logger.log(Level.FINE, "Tried to add known local Sone: %s", id);
- return localSones.get(id);
- }
- OwnIdentity ownIdentity = identityManager.getOwnIdentity(id);
- if (ownIdentity == null) {
- logger.log(Level.INFO, "Invalid Sone ID: %s", id);
- return null;
- }
- return addLocalSone(ownIdentity);
- }
- }
-
- /**
* Adds a local Sone from the given own identity.
*
* @param ownIdentity
@@ -1005,7 +903,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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;
@@ -1032,6 +930,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption(true));
sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption(true));
sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption(true));
+ sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption(ShowCustomAvatars.NEVER));
+
followSone(sone, getSone("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI"));
touchConfiguration();
return sone;
@@ -1050,17 +950,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
return null;
}
synchronized (remoteSones) {
- final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+ final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
boolean newSone = sone.getRequestUri() == null;
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()) {
@@ -1070,9 +968,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
}
}
- remoteSones.put(identity.getId(), sone);
soneDownloader.addSone(sone);
- setSoneStatus(sone, SoneStatus.unknown);
soneDownloaders.execute(new Runnable() {
@Override
@@ -1096,6 +992,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
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));
}
@@ -1302,9 +1203,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (newPosts) {
for (Post post : sone.getPosts()) {
post.setSone(storedSone);
- if (!storedPosts.contains(post) && !knownPosts.contains(post.getId())) {
- newPosts.add(post.getId());
- coreListenerManager.fireNewPostFound(post);
+ if (!storedPosts.contains(post)) {
+ if (post.getTime() < getSoneFollowingTime(sone)) {
+ knownPosts.add(post.getId());
+ } else if (!knownPosts.contains(post.getId())) {
+ newPosts.add(post.getId());
+ coreListenerManager.fireNewPostFound(post);
+ }
}
posts.put(post.getId(), post);
}
@@ -1323,9 +1228,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (newReplies) {
for (PostReply reply : sone.getReplies()) {
reply.setSone(storedSone);
- if (!storedReplies.contains(reply) && !knownReplies.contains(reply.getId())) {
- newReplies.add(reply.getId());
- coreListenerManager.fireNewReplyFound(reply);
+ if (!storedReplies.contains(reply)) {
+ if (reply.getTime() < getSoneFollowingTime(sone)) {
+ knownReplies.add(reply.getId());
+ } else if (!knownReplies.contains(reply.getId())) {
+ newReplies.add(reply.getId());
+ coreListenerManager.fireNewReplyFound(reply);
+ }
}
replies.put(reply.getId(), reply);
}
@@ -1425,12 +1334,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* 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();
}
}
@@ -1453,6 +1363,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption(true));
sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption(true));
sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption(true));
+ sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption(ShowCustomAvatars.NEVER));
/* load Sone. */
String sonePrefix = "Sone/" + sone.getId();
@@ -1464,7 +1375,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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));
@@ -1612,12 +1523,19 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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(). 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) {
@@ -1633,7 +1551,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
sone.setAlbums(topLevelAlbums);
soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
}
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String friend : friends) {
knownSones.add(friend);
}
@@ -1771,8 +1689,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public void markPostKnown(Post post) {
synchronized (newPosts) {
- if (newPosts.remove(post.getId())) {
- knownPosts.add(post.getId());
+ newPosts.remove(post.getId());
+ if (knownPosts.add(post.getId())) {
coreListenerManager.fireMarkPostKnown(post);
touchConfiguration();
}
@@ -1911,8 +1829,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public void markReplyKnown(PostReply reply) {
synchronized (newReplies) {
- if (newReplies.remove(reply.getId())) {
- knownReplies.add(reply.getId());
+ newReplies.remove(reply.getId());
+ if (knownReplies.add(reply.getId())) {
coreListenerManager.fireMarkReplyKnown(reply);
touchConfiguration();
}
@@ -2157,6 +2075,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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;
@@ -2250,6 +2169,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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(). getEnumOption("ShowCustomAvatars").get().name());
configuration.save();
@@ -2294,7 +2214,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/* save known Sones. */
int soneCounter = 0;
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String knownSoneId : knownSones) {
configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
}
@@ -2423,7 +2343,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (knownSoneId == null) {
break;
}
- synchronized (newSones) {
+ synchronized (knownSones) {
knownSones.add(knownSoneId);
}
}
@@ -2436,8 +2356,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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;
}
@@ -2557,7 +2482,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
@Override
@SuppressWarnings("synthetic-access")
public void run() {
- Sone sone = getRemoteSone(identity.getId());
+ Sone sone = getRemoteSone(identity.getId(), false);
sone.setIdentity(identity);
sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
soneDownloader.addSone(sone);
@@ -2611,10 +2536,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (remoteSones) {
remoteSones.remove(identity.getId());
}
- synchronized (newSones) {
- newSones.remove(identity.getId());
- coreListenerManager.fireSoneRemoved(sone);
- }
+ coreListenerManager.fireSoneRemoved(sone);
}
//