X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=c5452368dd026e8ea30d43c3ef03ed1778e49a1f;hb=21f2757fa8afc1d121a34679727ebe1beb25440f;hp=aa5b820bf8b8af2a8dc118f8890f9d1f961f0d3a;hpb=1093595cd24e791cab88b3d7bfa963b1bae0f5ee;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index aa5b820..c545236 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -136,6 +136,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	/* 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>();
@@ -588,6 +591,23 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
+	 * Returns the time when the given was first followed by any local Sone.
+	 *
+	 * @param sone
+	 *            The Sone to get the time for
+	 * @return The time (in milliseconds since Jan 1, 1970) the Sone has first
+	 *         been followed, or {@link Long#MAX_VALUE}
+	 */
+	public long getSoneFollowingTime(Sone sone) {
+		synchronized (soneFollowingTimes) {
+			if (soneFollowingTimes.containsKey(sone)) {
+				return soneFollowingTimes.get(sone);
+			}
+			return Long.MAX_VALUE;
+		}
+	}
+
+	/**
 	 * Returns whether the target Sone is trusted by the origin Sone.
 	 *
 	 * @param origin
@@ -1008,6 +1028,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		}
 		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));
@@ -1511,6 +1532,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		/* 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) {
@@ -2192,6 +2216,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				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) {
@@ -2308,6 +2343,20 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			}
 		}
 
+		/* 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) {