X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=f68fec21d401ac5cb04813de9ec7bc219bc7b78b;hb=d233a386e5e8417e500265f57a3911053f813923;hp=0002e2c4c0631e759e60933a97f981a795fe8611;hpb=5b6767cdd9eece7d2a08f52016b3e35340d1f22f;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 0002e2c..f68fec2 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -37,6 +37,8 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.L10nFilter;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.notify.NewPostNotification;
+import net.pterodactylus.sone.notify.NewReplyNotification;
 import net.pterodactylus.sone.notify.NewSoneNotification;
 import net.pterodactylus.sone.template.CollectionAccessor;
 import net.pterodactylus.sone.template.CssClassNameFilter;
@@ -54,6 +56,7 @@ import net.pterodactylus.sone.web.ajax.DeleteReplyAjaxPage;
 import net.pterodactylus.sone.web.ajax.DismissNotificationAjaxPage;
 import net.pterodactylus.sone.web.ajax.FollowSoneAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetLikesAjaxPage;
+import net.pterodactylus.sone.web.ajax.GetNotificationsAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetReplyAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetSoneStatusPage;
 import net.pterodactylus.sone.web.ajax.GetTranslationPage;
@@ -110,6 +113,12 @@ public class WebInterface implements CoreListener {
 	/** The “new Sone” notification. */
 	private final NewSoneNotification newSoneNotification;
 
+	/** The “new post” notification. */
+	private final NewPostNotification newPostNotification;
+
+	/** The “new reply” notification. */
+	private final NewReplyNotification newReplyNotification;
+
 	/**
 	 * Creates a new web interface.
 	 *
@@ -143,6 +152,12 @@ public class WebInterface implements CoreListener {
 		/* create notifications. */
 		Template newSoneNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newSoneNotification.html"));
 		newSoneNotification = new NewSoneNotification(newSoneNotificationTemplate);
+
+		Template newPostNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newPostNotification.html"));
+		newPostNotification = new NewPostNotification(newPostNotificationTemplate);
+
+		Template newReplyNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newReplyNotification.html"));
+		newReplyNotification = new NewReplyNotification(newReplyNotificationTemplate);
 	}
 
 	//
@@ -212,7 +227,7 @@ public class WebInterface implements CoreListener {
 		/* notification templates. */
 		Template startupNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/startupNotification.html"));
 
-		final TemplateNotification startupNotification = new TemplateNotification(startupNotificationTemplate);
+		final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
 		notificationManager.addNotification(startupNotification);
 
 		Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() {
@@ -222,6 +237,23 @@ public class WebInterface implements CoreListener {
 				startupNotification.dismiss();
 			}
 		}, "Sone Startup Notification Remover");
+
+		Template wotMissingNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/wotMissingNotification.html"));
+		final TemplateNotification wotMissingNotification = new TemplateNotification("wot-missing-notification", wotMissingNotificationTemplate);
+		Ticker.getInstance().registerEvent(System.currentTimeMillis() + (15 * 1000), new Runnable() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				if (getCore().getIdentityManager().isConnected()) {
+					wotMissingNotification.dismiss();
+				} else {
+					notificationManager.addNotification(wotMissingNotification);
+				}
+				Ticker.getInstance().registerEvent(System.currentTimeMillis() + (15 * 1000), this, "Sone WoT Connector Checker");
+			}
+
+		}, "Sone WoT Connector Checker");
 	}
 
 	/**
@@ -229,6 +261,7 @@ public class WebInterface implements CoreListener {
 	 */
 	public void stop() {
 		unregisterToadlets();
+		Ticker.getInstance().stop();
 	}
 
 	//
@@ -256,7 +289,6 @@ public class WebInterface implements CoreListener {
 		Template unfollowSoneTemplate = templateFactory.createTemplate(createReader("/templates/unfollowSone.html"));
 		Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html"));
 		Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html"));
-		Template wotPluginMissingTemplate = templateFactory.createTemplate(createReader("/templates/wotPluginMissing.html"));
 		Template dismissNotificationTemplate = templateFactory.createTemplate(createReader("/templates/dismissNotification.html"));
 		Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
 		Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html"));
@@ -284,12 +316,12 @@ public class WebInterface implements CoreListener {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("wotPluginMissing.html", wotPluginMissingTemplate, "Page.WotPluginMissing.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationPage(dismissNotificationTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("javascript/", "/static/javascript/", "text/javascript")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("images/", "/static/images/", "image/png")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetNotificationsAjaxPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationAjaxPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetSoneStatusPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyAjaxPage(this)));
@@ -359,7 +391,8 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newPostFound(Post post) {
-		/* TODO */
+		newPostNotification.addPost(post);
+		notificationManager.addNotification(newPostNotification);
 	}
 
 	/**
@@ -367,7 +400,11 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newReplyFound(Reply reply) {
-		/* TODO */
+		if (reply.getPost().getSone() == null) {
+			return;
+		}
+		newReplyNotification.addReply(reply);
+		notificationManager.addNotification(newReplyNotification);
 	}
 
 	/**
@@ -386,7 +423,10 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void markPostKnown(Post post) {
-		/* TODO */
+		newPostNotification.removePost(post);
+		if (newPostNotification.isEmpty()) {
+			newPostNotification.dismiss();
+		}
 	}
 
 	/**
@@ -394,7 +434,10 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void markReplyKnown(Reply reply) {
-		/* TODO */
+		newReplyNotification.removeReply(reply);
+		if (newReplyNotification.isEmpty()) {
+			newReplyNotification.dismiss();
+		}
 	}
 
 	/**