X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=f55931813298b26ecbc3532f6e85a39e950b92d1;hb=8b25ea98d342ed2e3e80914448156145a3e6757d;hp=fd4365e9f6cd3f6c033705ce3030d2a6dd787585;hpb=2a38345ba7eb550e3ad84d3f38ed84ee0333c4fd;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 fd4365e..f559318 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -21,43 +21,62 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.core.CoreListener;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Reply;
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.ListNotification;
+import net.pterodactylus.sone.template.CollectionAccessor;
+import net.pterodactylus.sone.template.CssClassNameFilter;
import net.pterodactylus.sone.template.GetPagePlugin;
+import net.pterodactylus.sone.template.IdentityAccessor;
+import net.pterodactylus.sone.template.NotificationManagerAccessor;
import net.pterodactylus.sone.template.PostAccessor;
import net.pterodactylus.sone.template.ReplyAccessor;
import net.pterodactylus.sone.template.RequestChangeFilter;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.template.SubstringFilter;
-import net.pterodactylus.sone.web.ajax.BlacklistSoneAjaxPage;
-import net.pterodactylus.sone.web.ajax.BlockSoneAjaxPage;
+import net.pterodactylus.sone.web.ajax.CreatePostAjaxPage;
+import net.pterodactylus.sone.web.ajax.CreateReplyAjaxPage;
import net.pterodactylus.sone.web.ajax.DeletePostAjaxPage;
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.GetSoneStatusPage;
+import net.pterodactylus.sone.web.ajax.GetPostAjaxPage;
+import net.pterodactylus.sone.web.ajax.GetReplyAjaxPage;
+import net.pterodactylus.sone.web.ajax.GetStatusAjaxPage;
import net.pterodactylus.sone.web.ajax.GetTranslationPage;
import net.pterodactylus.sone.web.ajax.LikeAjaxPage;
-import net.pterodactylus.sone.web.ajax.UnblacklistSoneAjaxPage;
-import net.pterodactylus.sone.web.ajax.UnblockSoneAjaxPage;
+import net.pterodactylus.sone.web.ajax.LockSoneAjaxPage;
+import net.pterodactylus.sone.web.ajax.MarkPostAsKnownPage;
+import net.pterodactylus.sone.web.ajax.MarkReplyAsKnownPage;
import net.pterodactylus.sone.web.ajax.UnfollowSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.UnlikeAjaxPage;
+import net.pterodactylus.sone.web.ajax.UnlockSoneAjaxPage;
import net.pterodactylus.sone.web.page.PageToadlet;
import net.pterodactylus.sone.web.page.PageToadletFactory;
import net.pterodactylus.sone.web.page.StaticPage;
import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.service.AbstractService;
+import net.pterodactylus.util.notify.Notification;
+import net.pterodactylus.util.notify.NotificationManager;
+import net.pterodactylus.util.notify.TemplateNotification;
import net.pterodactylus.util.template.DateFilter;
import net.pterodactylus.util.template.DefaultTemplateFactory;
import net.pterodactylus.util.template.MatchFilter;
@@ -68,8 +87,11 @@ import net.pterodactylus.util.template.TemplateException;
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 freenet.clients.http.SessionManager;
+import freenet.clients.http.SessionManager.Session;
import freenet.clients.http.ToadletContainer;
+import freenet.clients.http.ToadletContext;
import freenet.l10n.BaseL10n;
/**
@@ -78,11 +100,14 @@ import freenet.l10n.BaseL10n;
*
* @author David âBombeâ Roden
*/
-public class WebInterface extends AbstractService {
+public class WebInterface implements CoreListener {
/** The logger. */
private static final Logger logger = Logging.getLogger(WebInterface.class);
+ /** The notification manager. */
+ private final NotificationManager notificationManager = new NotificationManager();
+
/** The Sone plugin. */
private final SonePlugin sonePlugin;
@@ -92,6 +117,30 @@ public class WebInterface extends AbstractService {
/** The form password. */
private final String formPassword;
+ /** The template factory. */
+ private DefaultTemplateFactory templateFactory;
+
+ /** The ânew Soneâ notification. */
+ private final ListNotification newSoneNotification;
+
+ /** The ânew postâ notification. */
+ private final ListNotification newPostNotification;
+
+ /** The ânew replyâ notification. */
+ private final ListNotification newReplyNotification;
+
+ /** The ârescuing Soneâ notification. */
+ private final ListNotification rescuingSonesNotification;
+
+ /** The âSone rescuedâ notification. */
+ private final ListNotification sonesRescuedNotification;
+
+ /** Sone locked notification ticker objects. */
+ private final Map lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap());
+
+ /** The âSone lockedâ notification. */
+ private final ListNotification lockedSonesNotification;
+
/**
* Creates a new web interface.
*
@@ -99,9 +148,47 @@ public class WebInterface extends AbstractService {
* The Sone plugin
*/
public WebInterface(SonePlugin sonePlugin) {
- super("Sone Web Interface", false);
this.sonePlugin = sonePlugin;
formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
+
+ templateFactory = new DefaultTemplateFactory();
+ templateFactory.addAccessor(Object.class, new ReflectionAccessor());
+ templateFactory.addAccessor(Collection.class, new CollectionAccessor());
+ templateFactory.addAccessor(Sone.class, new SoneAccessor(getCore()));
+ templateFactory.addAccessor(Post.class, new PostAccessor(getCore(), templateFactory));
+ templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore(), templateFactory));
+ templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));
+ templateFactory.addAccessor(NotificationManager.class, new NotificationManagerAccessor());
+ templateFactory.addFilter("date", new DateFilter());
+ templateFactory.addFilter("l10n", new L10nFilter(getL10n()));
+ templateFactory.addFilter("substring", new SubstringFilter());
+ templateFactory.addFilter("xml", new XmlFilter());
+ templateFactory.addFilter("change", new RequestChangeFilter());
+ templateFactory.addFilter("match", new MatchFilter());
+ templateFactory.addFilter("css", new CssClassNameFilter());
+ templateFactory.addPlugin("getpage", new GetPagePlugin());
+ templateFactory.addPlugin("paginate", new PaginationPlugin());
+ templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
+ templateFactory.addTemplateObject("formPassword", formPassword);
+
+ /* create notifications. */
+ Template newSoneNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newSoneNotification.html"));
+ newSoneNotification = new ListNotification("new-sone-notification", "sones", newSoneNotificationTemplate);
+
+ Template newPostNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newPostNotification.html"));
+ newPostNotification = new ListNotification("new-post-notification", "posts", newPostNotificationTemplate);
+
+ Template newReplyNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/newReplyNotification.html"));
+ newReplyNotification = new ListNotification("new-replies-notification", "replies", newReplyNotificationTemplate);
+
+ Template rescuingSonesTemplate = templateFactory.createTemplate(createReader("/templates/notify/rescuingSonesNotification.html"));
+ rescuingSonesNotification = new ListNotification("sones-being-rescued-notification", "sones", rescuingSonesTemplate);
+
+ Template sonesRescuedTemplate = templateFactory.createTemplate(createReader("/templates/notify/sonesRescuedNotification.html"));
+ sonesRescuedNotification = new ListNotification("sones-rescued-notification", "sones", sonesRescuedTemplate);
+
+ Template lockedSonesTemplate = templateFactory.createTemplate(createReader("/templates/notify/lockedSonesNotification.html"));
+ lockedSonesNotification = new ListNotification("sones-locked-notification", "sones", lockedSonesTemplate);
}
//
@@ -113,16 +200,121 @@ public class WebInterface extends AbstractService {
*
* @return The Sone core
*/
- public Core core() {
+ public Core getCore() {
return sonePlugin.core();
}
/**
+ * Returns the current session, creating a new session if there is no
+ * current session.
+ *
+ * @param toadletContenxt
+ * The toadlet context
+ * @return The current session, or {@code null} if there is no current
+ * session
+ */
+ public Session getCurrentSession(ToadletContext toadletContenxt) {
+ return getCurrentSession(toadletContenxt, true);
+ }
+
+ /**
+ * Returns the current session, creating a new session if there is no
+ * current session and {@code create} is {@code true}.
+ *
+ * @param toadletContenxt
+ * The toadlet context
+ * @param create
+ * {@code true} to create a new session if there is no current
+ * session, {@code false} otherwise
+ * @return The current session, or {@code null} if there is no current
+ * session
+ */
+ public Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
+ Session session = getSessionManager().useSession(toadletContenxt);
+ if (create && (session == null)) {
+ session = getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
+ }
+ return session;
+ }
+
+ /**
+ * Returns the currently logged in Sone.
+ *
+ * @param toadletContext
+ * The toadlet context
+ * @return The currently logged in Sone, or {@code null} if no Sone is
+ * currently logged in
+ */
+ public Sone getCurrentSone(ToadletContext 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));
+ }
+
+ /**
+ * Returns the currently logged in Sone.
+ *
+ * @param session
+ * The session
+ * @return The currently logged in Sone, or {@code null} if no Sone is
+ * currently logged in
+ */
+ public Sone getCurrentSone(Session session) {
+ if (session == null) {
+ return null;
+ }
+ String soneId = (String) session.getAttribute("Sone.CurrentSone");
+ if (soneId == null) {
+ return null;
+ }
+ return getCore().getLocalSone(soneId, false);
+ }
+
+ /**
+ * Sets the currently logged in Sone.
+ *
+ * @param toadletContext
+ * The toadlet context
+ * @param sone
+ * The Sone to set as currently logged in
+ */
+ public void setCurrentSone(ToadletContext toadletContext, Sone sone) {
+ Session session = getCurrentSession(toadletContext);
+ if (sone == null) {
+ session.removeAttribute("Sone.CurrentSone");
+ } else {
+ session.setAttribute("Sone.CurrentSone", sone.getId());
+ }
+ }
+
+ /**
+ * Returns the notification manager.
+ *
+ * @return The notification manager
+ */
+ public NotificationManager getNotifications() {
+ return notificationManager;
+ }
+
+ /**
* Returns the l10n helper of the node.
*
* @return The nodeâs l10n helper
*/
- public BaseL10n l10n() {
+ public BaseL10n getL10n() {
return sonePlugin.l10n().getBase();
}
@@ -131,13 +323,8 @@ public class WebInterface extends AbstractService {
*
* @return The nodeâs session manager
*/
- public SessionManager sessionManager() {
- try {
- return sonePlugin.pluginRespirator().getSessionManager(new URI("/"));
- } catch (URISyntaxException use1) {
- logger.log(Level.SEVERE, "Could not get Session Manager!", use1);
- return null;
- }
+ public SessionManager getSessionManager() {
+ return sonePlugin.pluginRespirator().getSessionManager("Sone");
}
/**
@@ -145,28 +332,123 @@ public class WebInterface extends AbstractService {
*
* @return The form password
*/
- public String formPassword() {
+ public String getFormPassword() {
return formPassword;
}
+ /**
+ * Returns the posts that have been announced as new in the
+ * {@link #newPostNotification}.
+ *
+ * @return The new posts
+ */
+ public Set getNewPosts() {
+ return new HashSet(newPostNotification.getElements());
+ }
+
+ /**
+ * Returns the replies that have been announced as new in the
+ * {@link #newReplyNotification}.
+ *
+ * @return The new replies
+ */
+ public Set getNewReplies() {
+ return new HashSet(newReplyNotification.getElements());
+ }
+
+ /**
+ * Sets whether the current start of the plugin is the first start. It is
+ * considered a first start if the configuration file does not exist.
+ *
+ * @param firstStart
+ * {@code true} if no configuration file existed when Sone was
+ * loaded, {@code false} otherwise
+ */
+ public void setFirstStart(boolean firstStart) {
+ if (firstStart) {
+ Template firstStartNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/firstStartNotification.html"));
+ Notification firstStartNotification = new TemplateNotification("first-start-notification", firstStartNotificationTemplate);
+ notificationManager.addNotification(firstStartNotification);
+ }
+ }
+
+ /**
+ * Sets whether Sone was started with a fresh configuration file.
+ *
+ * @param newConfig
+ * {@code true} if Sone was started with a fresh configuration,
+ * {@code false} if the existing configuration could be read
+ */
+ public void setNewConfig(boolean newConfig) {
+ if (newConfig && !hasFirstStartNotification()) {
+ Template configNotReadNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/configNotReadNotification.html"));
+ Notification configNotReadNotification = new TemplateNotification("config-not-read-notification", configNotReadNotificationTemplate);
+ notificationManager.addNotification(configNotReadNotification);
+ }
+ }
+
//
- // SERVICE METHODS
+ // PRIVATE ACCESSORS
//
/**
- * {@inheritDoc}
+ * Returns whether the first start notification is currently displayed.
+ *
+ * @return {@code true} if the first-start notification is currently
+ * displayed, {@code false} otherwise
*/
- @Override
- protected void serviceStart() {
+ private boolean hasFirstStartNotification() {
+ return notificationManager.getNotification("first-start-notification") != null;
+ }
+
+ //
+ // ACTIONS
+ //
+
+ /**
+ * Starts the web interface and registers all toadlets.
+ */
+ public void start() {
registerToadlets();
+
+ /* notification templates. */
+ Template startupNotificationTemplate = templateFactory.createTemplate(createReader("/templates/notify/startupNotification.html"));
+
+ final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
+ notificationManager.addNotification(startupNotification);
+
+ Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() {
+
+ @Override
+ public void run() {
+ 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");
}
/**
- * {@inheritDoc}
+ * Stops the web interface and unregisters all toadlets.
*/
- @Override
- protected void serviceStop() {
+ public void stop() {
unregisterToadlets();
+ Ticker.getInstance().stop();
}
//
@@ -177,97 +459,74 @@ public class WebInterface extends AbstractService {
* Register all toadlets.
*/
private void registerToadlets() {
- DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
- templateFactory.addAccessor(Object.class, new ReflectionAccessor());
- templateFactory.addAccessor(Sone.class, new SoneAccessor(core()));
- templateFactory.addAccessor(Post.class, new PostAccessor(core()));
- templateFactory.addAccessor(Reply.class, new ReplyAccessor(core()));
- templateFactory.addFilter("date", new DateFilter());
- templateFactory.addFilter("l10n", new L10nFilter(l10n()));
- templateFactory.addFilter("substring", new SubstringFilter());
- templateFactory.addFilter("xml", new XmlFilter());
- templateFactory.addFilter("change", new RequestChangeFilter());
- templateFactory.addFilter("match", new MatchFilter());
- templateFactory.addPlugin("getpage", new GetPagePlugin());
- templateFactory.addPlugin("paginate", new PaginationPlugin());
- templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
- templateFactory.addTemplateObject("formPassword", formPassword);
-
Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html"));
Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html"));
- Template addSoneTemplate = templateFactory.createTemplate(createReader("/templates/addSone.html"));
- Template loadSoneTemplate = templateFactory.createTemplate(createReader("/templates/loadSone.html"));
Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html"));
Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html"));
- Template importSoneTemplate = templateFactory.createTemplate(createReader("/templates/importSone.html"));
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 backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml"));
Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
- Template blockSoneTemplate = templateFactory.createTemplate(createReader("/templates/blockSone.html"));
- Template unblockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblockSone.html"));
Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html"));
Template unlikePostTemplate = templateFactory.createTemplate(createReader("/templates/unlike.html"));
Template deletePostTemplate = templateFactory.createTemplate(createReader("/templates/deletePost.html"));
Template deleteReplyTemplate = templateFactory.createTemplate(createReader("/templates/deleteReply.html"));
+ Template lockSoneTemplate = templateFactory.createTemplate(createReader("/templates/lockSone.html"));
+ Template unlockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unlockSone.html"));
Template followSoneTemplate = templateFactory.createTemplate(createReader("/templates/followSone.html"));
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 dismissNotificationTemplate = templateFactory.createTemplate(createReader("/templates/dismissNotification.html"));
Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html"));
- Template blacklistTemplate = templateFactory.createTemplate(createReader("/templates/blacklist.html"));
- Template blacklistSoneTemplate = templateFactory.createTemplate(createReader("/templates/blacklistSone.html"));
- Template unblacklistSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblacklistSone.html"));
Template aboutTemplate = templateFactory.createTemplate(createReader("/templates/about.html"));
- Template helpTemplate = templateFactory.createTemplate(createReader("/templates/help.html"));
+ Template postTemplate = templateFactory.createTemplate(createReader("/templates/include/viewPost.html"));
+ Template replyTemplate = templateFactory.createTemplate(createReader("/templates/include/viewReply.html"));
PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new ImportSonePage(importSoneTemplate, this), "ImportSone"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new LoadSonePage(loadSoneTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new AddSonePage(addSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BackupProfilePage(backupProfileTemplate, 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)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlockSonePage(blockSoneTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSonePage(unblockSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LikePage(likePostTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikePage(unlikePostTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyPage(deleteReplyTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new LockSonePage(lockSoneTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlockSonePage(unlockSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSonePage(unfollowSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteSonePage(deleteSoneTemplate, this), "DeleteSone"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistPage(blacklistTemplate, this), "Blacklist"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistSonePage(blacklistSoneTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblacklistSonePage(unblacklistSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("help.html", helpTemplate, "Page.Help.Title", this), "Help"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.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 GetSoneStatusPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new GetStatusAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new GetReplyAjaxPage(this, replyTemplate)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new GetPostAjaxPage(this, postTemplate)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new MarkPostAsKnownPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new MarkReplyAsKnownPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new LockSoneAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlockSoneAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSoneAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlockSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BlacklistSoneAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblacklistSoneAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LikeAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikeAjaxPage(this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new GetLikesAjaxPage(this)));
@@ -311,6 +570,139 @@ public class WebInterface extends AbstractService {
}
}
+ //
+ // CORELISTENER METHODS
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void rescuingSone(Sone sone) {
+ rescuingSonesNotification.add(sone);
+ notificationManager.addNotification(rescuingSonesNotification);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void rescuedSone(Sone sone) {
+ rescuingSonesNotification.remove(sone);
+ sonesRescuedNotification.add(sone);
+ notificationManager.addNotification(sonesRescuedNotification);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void newSoneFound(Sone sone) {
+ newSoneNotification.add(sone);
+ if (!hasFirstStartNotification()) {
+ notificationManager.addNotification(newSoneNotification);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void newPostFound(Post post) {
+ newPostNotification.add(post);
+ if (!hasFirstStartNotification()) {
+ notificationManager.addNotification(newPostNotification);
+ } else {
+ getCore().markPostKnown(post);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void newReplyFound(Reply reply) {
+ if (reply.getPost().getSone() == null) {
+ return;
+ }
+ newReplyNotification.add(reply);
+ if (!hasFirstStartNotification()) {
+ notificationManager.addNotification(newReplyNotification);
+ } else {
+ getCore().markReplyKnown(reply);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void markSoneKnown(Sone sone) {
+ newSoneNotification.remove(sone);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void markPostKnown(Post post) {
+ newPostNotification.remove(post);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void markReplyKnown(Reply reply) {
+ newReplyNotification.remove(reply);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void postRemoved(Post post) {
+ newPostNotification.remove(post);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void replyRemoved(Reply reply) {
+ newReplyNotification.remove(reply);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void soneLocked(final Sone sone) {
+ Object tickerObject = Ticker.getInstance().registerEvent(System.currentTimeMillis() + (5 * 60) * 1000, new Runnable() {
+
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() {
+ lockedSonesNotification.add(sone);
+ notificationManager.addNotification(lockedSonesNotification);
+ }
+ }, "Sone Locked Notification");
+ lockedSonesTickerObjects.put(sone, tickerObject);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void soneUnlocked(Sone sone) {
+ Object tickerObject = lockedSonesTickerObjects.remove(sone);
+ if (tickerObject == null) {
+ return;
+ }
+ lockedSonesNotification.remove(sone);
+ Ticker.getInstance().deregisterEvent(tickerObject);
+ }
+
/**
* Template provider implementation that uses
* {@link WebInterface#createReader(String)} to load templates for
@@ -321,6 +713,7 @@ public class WebInterface extends AbstractService {
private class ClassPathTemplateProvider implements TemplateProvider {
/** The template factory. */
+ @SuppressWarnings("hiding")
private final TemplateFactory templateFactory;
/**
@@ -354,4 +747,5 @@ public class WebInterface extends AbstractService {
}
}
+
}