X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=2bf7381f11b4417179ed2523574dca1a9abc0190;hb=927f9d885b134b7d4f45a68c42c5700b3c75cdbe;hp=58962c431dad0e8fa20fbbad0614d2d4bbf63691;hpb=f467b490759abac38d5a0c24cc6cda8df09ff1a7;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 58962c4..2bf7381 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -88,6 +88,7 @@ import net.pterodactylus.util.template.TemplateFactory;
 import net.pterodactylus.util.template.TemplateProvider;
 import net.pterodactylus.util.template.XmlFilter;
 import net.pterodactylus.util.thread.Ticker;
+import net.pterodactylus.util.version.Version;
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContainer;
@@ -141,6 +142,9 @@ public class WebInterface implements CoreListener {
 	/** The “Sone locked” notification. */
 	private final ListNotification<Sone> lockedSonesNotification;
 
+	/** The “new version” notification. */
+	private final TemplateNotification newVersionNotification;
+
 	/**
 	 * Creates a new web interface.
 	 *
@@ -189,6 +193,9 @@ public class WebInterface implements CoreListener {
 
 		Template lockedSonesTemplate = templateFactory.createTemplate(createReader("/templates/notify/lockedSonesNotification.html"));
 		lockedSonesNotification = new ListNotification<Sone>("sones-locked-notification", "sones", lockedSonesTemplate);
+
+		Template newVersionTemplate = templateFactory.createTemplate(createReader("/templates/notify/newVersionNotification.html"));
+		newVersionNotification = new TemplateNotification("new-version-notification", newVersionTemplate);
 	}
 
 	//
@@ -246,7 +253,22 @@ public class WebInterface implements CoreListener {
 	 *         currently logged in
 	 */
 	public Sone getCurrentSone(ToadletContext toadletContext) {
-		return getCurrentSone(getCurrentSession(toadletContext));
+		return getCurrentSone(toadletContext, true);
+	}
+
+	/**
+	 * Returns the currently logged in Sone.
+	 *
+	 * @param toadletContext
+	 *            The toadlet context
+	 * @param create
+	 *            {@code true} to create a new session if no session exists,
+	 *            {@code false} to not create a new session
+	 * @return The currently logged in Sone, or {@code null} if no Sone is
+	 *         currently logged in
+	 */
+	public Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
+		return getCurrentSone(getCurrentSession(toadletContext, create));
 	}
 
 	/**
@@ -451,6 +473,7 @@ public class WebInterface implements CoreListener {
 		Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
 		Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
 		Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
+		Template deleteProfileFieldTemplate = templateFactory.createTemplate(createReader("/templates/deleteProfileField.html"));
 		Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
 		Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
 		Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html"));
@@ -475,6 +498,7 @@ public class WebInterface implements CoreListener {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteProfileFieldPage(deleteProfileFieldTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this)));
@@ -647,7 +671,7 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void postRemoved(Post post) {
-		/* TODO */
+		newPostNotification.remove(post);
 	}
 
 	/**
@@ -655,7 +679,7 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void replyRemoved(Reply reply) {
-		/* TODO */
+		newReplyNotification.remove(reply);
 	}
 
 	/**
@@ -669,6 +693,7 @@ public class WebInterface implements CoreListener {
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				lockedSonesNotification.add(sone);
+				lockedSonesTickerObjects.remove(sone);
 				notificationManager.addNotification(lockedSonesNotification);
 			}
 		}, "Sone Locked Notification");
@@ -680,12 +705,18 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void soneUnlocked(Sone sone) {
-		Object tickerObject = lockedSonesTickerObjects.remove(sone);
-		if (tickerObject == null) {
-			return;
-		}
 		lockedSonesNotification.remove(sone);
-		Ticker.getInstance().deregisterEvent(tickerObject);
+		Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(sone));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateFound(Version version, long releaseTime) {
+		newVersionNotification.set("version", version);
+		newVersionNotification.set("releaseTime", releaseTime);
+		notificationManager.addNotification(newVersionNotification);
 	}
 
 	/**