X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=b42fc34a68a153776f5de99f30d540b082df0ab0;hb=d7ddf7e18617dd738a7e1df7931c5e4dcd7803aa;hp=d24f497df8316e5283913713a0d7394014bd7a01;hpb=1e79a3900f383fae900d3027de3c45bf1853ff15;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 d24f497..b42fc34 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
@@ -1009,6 +1029,9 @@ 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));
 		sone.addFriend("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
 		touchConfiguration();
 		return sone;
@@ -1065,6 +1088,90 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
+	 * Lets the given local Sone follow the Sone with the given ID.
+	 *
+	 * @param sone
+	 *            The local Sone that should follow another Sone
+	 * @param soneId
+	 *            The ID of the Sone to follow
+	 */
+	public void followSone(Sone sone, String soneId) {
+		Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
+		followSone(sone, getSone(soneId));
+	}
+
+	/**
+	 * Lets the given local Sone follow the other given Sone. If the given Sone
+	 * was not followed by any local Sone before, this will mark all elements of
+	 * the followed Sone as read that have been created before the current
+	 * moment.
+	 *
+	 * @param sone
+	 *            The local Sone that should follow the other Sone
+	 * @param followedSone
+	 *            The Sone that should be followed
+	 */
+	public void followSone(Sone sone, Sone followedSone) {
+		Validation.begin().isNotNull("Sone", sone).isNotNull("Followed Sone", followedSone).check();
+		sone.addFriend(followedSone.getId());
+		synchronized (soneFollowingTimes) {
+			if (!soneFollowingTimes.containsKey(followedSone)) {
+				long now = System.currentTimeMillis();
+				soneFollowingTimes.put(followedSone, now);
+				for (Post post : followedSone.getPosts()) {
+					if (post.getTime() < now) {
+						markPostKnown(post);
+					}
+				}
+				for (PostReply reply : followedSone.getReplies()) {
+					if (reply.getTime() < now) {
+						markReplyKnown(reply);
+					}
+				}
+			}
+		}
+		touchConfiguration();
+	}
+
+	/**
+	 * Lets the given local Sone unfollow the Sone with the given ID.
+	 *
+	 * @param sone
+	 *            The local Sone that should unfollow another Sone
+	 * @param soneId
+	 *            The ID of the Sone being unfollowed
+	 */
+	public void unfollowSone(Sone sone, String soneId) {
+		Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
+		unfollowSone(sone, getSone(soneId, false));
+	}
+
+	/**
+	 * Lets the given local Sone unfollow the other given Sone. If the given
+	 * local Sone is the last local Sone that followed the given Sone, its
+	 * following time will be removed.
+	 *
+	 * @param sone
+	 *            The local Sone that should unfollow another Sone
+	 * @param unfollowedSone
+	 *            The Sone being unfollowed
+	 */
+	public void unfollowSone(Sone sone, Sone unfollowedSone) {
+		Validation.begin().isNotNull("Sone", sone).isNotNull("Unfollowed Sone", unfollowedSone).check();
+		sone.removeFriend(unfollowedSone.getId());
+		boolean unfollowedSoneStillFollowed = false;
+		for (Sone localSone : getLocalSones()) {
+			unfollowedSoneStillFollowed |= localSone.hasFriend(unfollowedSone.getId());
+		}
+		if (!unfollowedSoneStillFollowed) {
+			synchronized (soneFollowingTimes) {
+				soneFollowingTimes.remove(unfollowedSone);
+			}
+		}
+		touchConfiguration();
+	}
+
+	/**
 	 * Retrieves the trust relationship from the origin to the target. If the
 	 * trust relationship can not be retrieved, {@code null} is returned.
 	 *
@@ -1344,6 +1451,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		/* 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();
@@ -1506,6 +1616,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) {
@@ -2132,6 +2245,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 			/* 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();
@@ -2184,6 +2300,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) {
@@ -2300,6 +2427,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) {