X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5a80f3154529682e65e85a9e96852ba9461af59b;hb=abe29a1d19532ea1c13024cf78c5faf388287faf;hp=60101b4adc7aa5d980332c02a703f108ff720758;hpb=4f686e5c5ddcf94ffdf074b953493c148fb2ab32;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 60101b4..5a80f31 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Options.DefaultOption;
 import net.pterodactylus.sone.core.Options.Option;
 import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
@@ -39,9 +40,11 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
+import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.number.Numbers;
 import freenet.keys.FreenetURI;
 
@@ -87,6 +90,9 @@ public class Core implements IdentityListener {
 	/** Interface to freenet. */
 	private final FreenetInterface freenetInterface;
 
+	/** The notification manager. */
+	private final NotificationManager notificationManager = new NotificationManager();
+
 	/** The Sone downloader. */
 	private final SoneDownloader soneDownloader;
 
@@ -172,6 +178,15 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns the notification manager.
+	 *
+	 * @return The notification manager
+	 */
+	public NotificationManager getNotifications() {
+		return notificationManager;
+	}
+
+	/**
 	 * Returns the status of the given Sone.
 	 *
 	 * @param sone
@@ -301,9 +316,23 @@ public class Core implements IdentityListener {
 	 * @return The Sone with the given ID
 	 */
 	public Sone getLocalSone(String id) {
+		return getLocalSone(id, true);
+	}
+
+	/**
+	 * Returns the local Sone with the given ID, optionally creating a new Sone.
+	 *
+	 * @param id
+	 *            The ID of the Sone
+	 * @param create
+	 *            {@code true} to create a new Sone if none exists,
+	 *            {@code false} to return null if none exists
+	 * @return The Sone with the given ID, or {@code null}
+	 */
+	public Sone getLocalSone(String id, boolean create) {
 		synchronized (localSones) {
 			Sone sone = localSones.get(id);
-			if (sone == null) {
+			if ((sone == null) && create) {
 				sone = new Sone(id);
 				localSones.put(id, sone);
 			}
@@ -578,11 +607,12 @@ public class Core implements IdentityListener {
 			final Sone sone;
 			try {
 				sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
-				sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);
 				return null;
 			}
+			sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
+			sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 			/* TODO - load posts ’n stuff */
 			localSones.put(ownIdentity.getId(), sone);
 			SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
@@ -695,6 +725,7 @@ public class Core implements IdentityListener {
 			}
 			synchronized (storedSone) {
 				storedSone.setTime(sone.getTime());
+				storedSone.setClient(sone.getClient());
 				storedSone.setProfile(sone.getProfile());
 				storedSone.setPosts(sone.getPosts());
 				storedSone.setReplies(sone.getReplies());
@@ -1006,9 +1037,10 @@ public class Core implements IdentityListener {
 	 *            The post that this reply refers to
 	 * @param text
 	 *            The text of the reply
+	 * @return The created reply
 	 */
-	public void createReply(Sone sone, Post post, String text) {
-		createReply(sone, post, System.currentTimeMillis(), text);
+	public Reply createReply(Sone sone, Post post, String text) {
+		return createReply(sone, post, System.currentTimeMillis(), text);
 	}
 
 	/**
@@ -1022,11 +1054,12 @@ public class Core implements IdentityListener {
 	 *            The time of the reply
 	 * @param text
 	 *            The text of the reply
+	 * @return The created reply
 	 */
-	public void createReply(Sone sone, Post post, long time, String text) {
+	public Reply 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;
+			return null;
 		}
 		Reply reply = new Reply(sone, post, System.currentTimeMillis(), text);
 		synchronized (replies) {
@@ -1037,6 +1070,7 @@ public class Core implements IdentityListener {
 		}
 		sone.addReply(reply);
 		saveSone(sone);
+		return reply;
 	}
 
 	/**