X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=e813179d3792afbca9204092f3f208ac4063dd1f;hb=5aaa1e1dc761fa0c8b6745b7b022c0a19d248c68;hp=188cc7f1258d6a3f9faf2e5ecb69fa906244eb53;hpb=1b525dcdbd58c5d73dd865e0f1b2b8cc6ddcc4eb;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 188cc7f..1e6e6fb 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -1,5 +1,5 @@
/*
- * Sone - WebInterface.java - Copyright © 2010â2012 David Roden
+ * Sone - WebInterface.java - Copyright © 2010â2019 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,60 +17,42 @@
package net.pterodactylus.sone.web;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
+import static com.google.common.collect.FluentIterable.from;
+import static java.util.logging.Logger.getLogger;
+
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.TimeZone;
import java.util.UUID;
-import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Named;
import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.core.CoreListener;
-import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.Image;
+import net.pterodactylus.sone.core.ElementLoader;
+import net.pterodactylus.sone.core.event.*;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Profile;
-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.freenet.wot.Trust;
+import net.pterodactylus.sone.freenet.Translation;
+import net.pterodactylus.sone.main.Loaders;
+import net.pterodactylus.sone.main.PluginHomepage;
+import net.pterodactylus.sone.main.PluginVersion;
+import net.pterodactylus.sone.main.PluginYear;
import net.pterodactylus.sone.main.SonePlugin;
import net.pterodactylus.sone.notify.ListNotification;
-import net.pterodactylus.sone.template.AlbumAccessor;
-import net.pterodactylus.sone.template.CollectionAccessor;
-import net.pterodactylus.sone.template.CssClassNameFilter;
-import net.pterodactylus.sone.template.HttpRequestAccessor;
-import net.pterodactylus.sone.template.IdentityAccessor;
-import net.pterodactylus.sone.template.ImageAccessor;
-import net.pterodactylus.sone.template.ImageLinkFilter;
-import net.pterodactylus.sone.template.JavascriptFilter;
+import net.pterodactylus.sone.notify.ListNotificationFilter;
+import net.pterodactylus.sone.notify.PostVisibilityFilter;
+import net.pterodactylus.sone.notify.ReplyVisibilityFilter;
+import net.pterodactylus.sone.template.LinkedElementRenderFilter;
import net.pterodactylus.sone.template.ParserFilter;
-import net.pterodactylus.sone.template.PostAccessor;
-import net.pterodactylus.sone.template.ProfileAccessor;
-import net.pterodactylus.sone.template.ReplyAccessor;
-import net.pterodactylus.sone.template.ReplyGroupFilter;
-import net.pterodactylus.sone.template.RequestChangeFilter;
-import net.pterodactylus.sone.template.SoneAccessor;
-import net.pterodactylus.sone.template.SubstringFilter;
-import net.pterodactylus.sone.template.TrustAccessor;
-import net.pterodactylus.sone.template.UniqueElementFilter;
-import net.pterodactylus.sone.template.UnknownDateFilter;
-import net.pterodactylus.sone.text.Part;
-import net.pterodactylus.sone.text.SonePart;
-import net.pterodactylus.sone.text.SoneTextParser;
+import net.pterodactylus.sone.template.RenderFilter;
+import net.pterodactylus.sone.template.ShortenFilter;
+import net.pterodactylus.sone.text.TimeTextConverter;
import net.pterodactylus.sone.web.ajax.BookmarkAjaxPage;
import net.pterodactylus.sone.web.ajax.CreatePostAjaxPage;
import net.pterodactylus.sone.web.ajax.CreateReplyAjaxPage;
@@ -78,103 +60,89 @@ import net.pterodactylus.sone.web.ajax.DeletePostAjaxPage;
import net.pterodactylus.sone.web.ajax.DeleteProfileFieldAjaxPage;
import net.pterodactylus.sone.web.ajax.DeleteReplyAjaxPage;
import net.pterodactylus.sone.web.ajax.DismissNotificationAjaxPage;
-import net.pterodactylus.sone.web.ajax.DistrustAjaxPage;
import net.pterodactylus.sone.web.ajax.EditAlbumAjaxPage;
import net.pterodactylus.sone.web.ajax.EditImageAjaxPage;
import net.pterodactylus.sone.web.ajax.EditProfileFieldAjaxPage;
import net.pterodactylus.sone.web.ajax.FollowSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.GetLikesAjaxPage;
+import net.pterodactylus.sone.web.ajax.GetLinkedElementAjaxPage;
import net.pterodactylus.sone.web.ajax.GetNotificationsAjaxPage;
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.GetTimesAjaxPage;
-import net.pterodactylus.sone.web.ajax.GetTranslationPage;
+import net.pterodactylus.sone.web.ajax.GetTranslationAjaxPage;
import net.pterodactylus.sone.web.ajax.LikeAjaxPage;
import net.pterodactylus.sone.web.ajax.LockSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.MarkAsKnownAjaxPage;
import net.pterodactylus.sone.web.ajax.MoveProfileFieldAjaxPage;
-import net.pterodactylus.sone.web.ajax.TrustAjaxPage;
import net.pterodactylus.sone.web.ajax.UnbookmarkAjaxPage;
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.ajax.UntrustAjaxPage;
import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.sone.web.page.PageToadlet;
-import net.pterodactylus.sone.web.page.PageToadletFactory;
-import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.sone.web.page.TemplateRenderer;
+import net.pterodactylus.sone.web.pages.*;
import net.pterodactylus.util.notify.Notification;
import net.pterodactylus.util.notify.NotificationManager;
import net.pterodactylus.util.notify.TemplateNotification;
-import net.pterodactylus.util.template.ClassPathTemplateProvider;
-import net.pterodactylus.util.template.CollectionSortFilter;
-import net.pterodactylus.util.template.ContainsFilter;
-import net.pterodactylus.util.template.DateFilter;
-import net.pterodactylus.util.template.FormatFilter;
-import net.pterodactylus.util.template.HtmlFilter;
-import net.pterodactylus.util.template.MatchFilter;
-import net.pterodactylus.util.template.ModFilter;
-import net.pterodactylus.util.template.PaginationFilter;
-import net.pterodactylus.util.template.ReflectionAccessor;
-import net.pterodactylus.util.template.ReplaceFilter;
-import net.pterodactylus.util.template.StoreFilter;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContextFactory;
-import net.pterodactylus.util.template.TemplateParser;
-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 net.pterodactylus.util.web.RedirectPage;
-import net.pterodactylus.util.web.StaticPage;
import net.pterodactylus.util.web.TemplatePage;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Inject;
-
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;
-import freenet.support.api.HTTPRequest;
+
+import com.codahale.metrics.*;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
/**
* Bundles functionality that a web interface of a Freenet plugin needs, e.g.
* references to l10n helpers.
- *
- * @author David âBombeâ Roden
*/
-public class WebInterface implements CoreListener {
+public class WebInterface implements SessionProvider {
/** The logger. */
- private static final Logger logger = Logging.getLogger(WebInterface.class);
+ private static final Logger logger = getLogger(WebInterface.class.getName());
+
+ /** The loaders for templates, pages, and classpath providers. */
+ private final Loaders loaders;
/** The notification manager. */
- private final NotificationManager notificationManager = new NotificationManager();
+ private final NotificationManager notificationManager;
/** The Sone plugin. */
private final SonePlugin sonePlugin;
- /** The registered toadlets. */
- private final List pageToadlets = new ArrayList();
-
/** The form password. */
private final String formPassword;
/** The template context factory. */
private final TemplateContextFactory templateContextFactory;
-
- /** The Sone text parser. */
- private final SoneTextParser soneTextParser;
+ private final TemplateRenderer templateRenderer;
/** The parser filter. */
private final ParserFilter parserFilter;
+ private final ShortenFilter shortenFilter;
+ private final RenderFilter renderFilter;
- /** The ânew Soneâ notification. */
- private final ListNotification newSoneNotification;
+ private final ListNotificationFilter listNotificationFilter;
+ private final PostVisibilityFilter postVisibilityFilter;
+ private final ReplyVisibilityFilter replyVisibilityFilter;
+
+ private final ElementLoader elementLoader;
+ private final LinkedElementRenderFilter linkedElementRenderFilter;
+ private final TimeTextConverter timeTextConverter = new TimeTextConverter();
+ private final L10nFilter l10nFilter;
+
+ private final PageToadletRegistry pageToadletRegistry;
+ private final MetricRegistry metricRegistry;
+ private final Translation translation;
/** The ânew postâ notification. */
private final ListNotification newPostNotification;
@@ -188,113 +156,47 @@ public class WebInterface implements CoreListener {
/** The invisible âlocal replyâ notification. */
private final ListNotification localReplyNotification;
- /** The âyou have been mentionedâ notification. */
- private final ListNotification mentionNotification;
-
/** Notifications for sone inserts. */
- private final Map soneInsertNotifications = new HashMap();
+ private final Map soneInsertNotifications = new HashMap<>();
- /** Sone locked notification ticker objects. */
- private final Map lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap());
-
- /** The âSone lockedâ notification. */
- private final ListNotification lockedSonesNotification;
-
- /** The ânew versionâ notification. */
- private final TemplateNotification newVersionNotification;
-
- /** The âinserting imagesâ notification. */
- private final ListNotification insertingImagesNotification;
-
- /** The âinserted imagesâ notification. */
- private final ListNotification insertedImagesNotification;
-
- /** The âimage insert failedâ notification. */
- private final ListNotification imageInsertFailedNotification;
-
- /**
- * Creates a new web interface.
- *
- * @param sonePlugin
- * The Sone plugin
- */
@Inject
- public WebInterface(SonePlugin sonePlugin) {
+ public WebInterface(SonePlugin sonePlugin, Loaders loaders, ListNotificationFilter listNotificationFilter,
+ PostVisibilityFilter postVisibilityFilter, ReplyVisibilityFilter replyVisibilityFilter,
+ ElementLoader elementLoader, TemplateContextFactory templateContextFactory,
+ TemplateRenderer templateRenderer,
+ ParserFilter parserFilter, ShortenFilter shortenFilter,
+ RenderFilter renderFilter,
+ LinkedElementRenderFilter linkedElementRenderFilter,
+ PageToadletRegistry pageToadletRegistry, MetricRegistry metricRegistry, Translation translation, L10nFilter l10nFilter,
+ NotificationManager notificationManager, @Named("newRemotePost") ListNotification newPostNotification,
+ @Named("newRemotePostReply") ListNotification newReplyNotification,
+ @Named("localPost") ListNotification localPostNotification,
+ @Named("localReply") ListNotification localReplyNotification) {
this.sonePlugin = sonePlugin;
+ this.loaders = loaders;
+ this.listNotificationFilter = listNotificationFilter;
+ this.postVisibilityFilter = postVisibilityFilter;
+ this.replyVisibilityFilter = replyVisibilityFilter;
+ this.elementLoader = elementLoader;
+ this.templateRenderer = templateRenderer;
+ this.parserFilter = parserFilter;
+ this.shortenFilter = shortenFilter;
+ this.renderFilter = renderFilter;
+ this.linkedElementRenderFilter = linkedElementRenderFilter;
+ this.pageToadletRegistry = pageToadletRegistry;
+ this.metricRegistry = metricRegistry;
+ this.l10nFilter = l10nFilter;
+ this.translation = translation;
+ this.notificationManager = notificationManager;
+ this.newPostNotification = newPostNotification;
+ this.newReplyNotification = newReplyNotification;
+ this.localPostNotification = localPostNotification;
+ this.localReplyNotification = localReplyNotification;
formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
- soneTextParser = new SoneTextParser(getCore(), getCore());
-
- templateContextFactory = new TemplateContextFactory();
- templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
- templateContextFactory.addAccessor(Collection.class, new CollectionAccessor());
- templateContextFactory.addAccessor(Sone.class, new SoneAccessor(getCore()));
- templateContextFactory.addAccessor(Post.class, new PostAccessor(getCore()));
- templateContextFactory.addAccessor(Reply.class, new ReplyAccessor(getCore()));
- templateContextFactory.addAccessor(Album.class, new AlbumAccessor());
- templateContextFactory.addAccessor(Image.class, new ImageAccessor());
- templateContextFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));
- templateContextFactory.addAccessor(Trust.class, new TrustAccessor());
- templateContextFactory.addAccessor(HTTPRequest.class, new HttpRequestAccessor());
- templateContextFactory.addAccessor(Profile.class, new ProfileAccessor(getCore()));
- templateContextFactory.addFilter("date", new DateFilter());
- templateContextFactory.addFilter("html", new HtmlFilter());
- templateContextFactory.addFilter("replace", new ReplaceFilter());
- templateContextFactory.addFilter("store", new StoreFilter());
- templateContextFactory.addFilter("l10n", new L10nFilter(this));
- templateContextFactory.addFilter("substring", new SubstringFilter());
- templateContextFactory.addFilter("xml", new XmlFilter());
- templateContextFactory.addFilter("change", new RequestChangeFilter());
- templateContextFactory.addFilter("match", new MatchFilter());
- templateContextFactory.addFilter("css", new CssClassNameFilter());
- templateContextFactory.addFilter("js", new JavascriptFilter());
- templateContextFactory.addFilter("parse", parserFilter = new ParserFilter(getCore(), templateContextFactory, soneTextParser));
- templateContextFactory.addFilter("unknown", new UnknownDateFilter(getL10n(), "View.Sone.Text.UnknownDate"));
- templateContextFactory.addFilter("format", new FormatFilter());
- templateContextFactory.addFilter("sort", new CollectionSortFilter());
- templateContextFactory.addFilter("image-link", new ImageLinkFilter(getCore(), templateContextFactory));
- templateContextFactory.addFilter("replyGroup", new ReplyGroupFilter());
- templateContextFactory.addFilter("in", new ContainsFilter());
- templateContextFactory.addFilter("unique", new UniqueElementFilter());
- templateContextFactory.addFilter("mod", new ModFilter());
- templateContextFactory.addFilter("paginate", new PaginationFilter());
- templateContextFactory.addProvider(TemplateProvider.TEMPLATE_CONTEXT_PROVIDER);
- templateContextFactory.addProvider(new ClassPathTemplateProvider(WebInterface.class, "/templates/"));
+
+ this.templateContextFactory = templateContextFactory;
templateContextFactory.addTemplateObject("webInterface", this);
templateContextFactory.addTemplateObject("formPassword", formPassword);
-
- /* create notifications. */
- Template newSoneNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newSoneNotification.html"));
- newSoneNotification = new ListNotification("new-sone-notification", "sones", newSoneNotificationTemplate, false);
-
- Template newPostNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newPostNotification.html"));
- newPostNotification = new ListNotification("new-post-notification", "posts", newPostNotificationTemplate, false);
-
- Template localPostNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newPostNotification.html"));
- localPostNotification = new ListNotification("local-post-notification", "posts", localPostNotificationTemplate, false);
-
- Template newReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
- newReplyNotification = new ListNotification("new-reply-notification", "replies", newReplyNotificationTemplate, false);
-
- Template localReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
- localReplyNotification = new ListNotification("local-reply-notification", "replies", localReplyNotificationTemplate, false);
-
- Template mentionNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/mentionNotification.html"));
- mentionNotification = new ListNotification("mention-notification", "posts", mentionNotificationTemplate, false);
-
- Template lockedSonesTemplate = TemplateParser.parse(createReader("/templates/notify/lockedSonesNotification.html"));
- lockedSonesNotification = new ListNotification("sones-locked-notification", "sones", lockedSonesTemplate);
-
- Template newVersionTemplate = TemplateParser.parse(createReader("/templates/notify/newVersionNotification.html"));
- newVersionNotification = new TemplateNotification("new-version-notification", newVersionTemplate);
-
- Template insertingImagesTemplate = TemplateParser.parse(createReader("/templates/notify/inserting-images-notification.html"));
- insertingImagesNotification = new ListNotification("inserting-images-notification", "images", insertingImagesTemplate);
-
- Template insertedImagesTemplate = TemplateParser.parse(createReader("/templates/notify/inserted-images-notification.html"));
- insertedImagesNotification = new ListNotification("inserted-images-notification", "images", insertedImagesTemplate);
-
- Template imageInsertFailedTemplate = TemplateParser.parse(createReader("/templates/notify/image-insert-failed-notification.html"));
- imageInsertFailedNotification = new ListNotification("image-insert-failed-notification", "images", imageInsertFailedTemplate);
}
//
@@ -306,6 +208,7 @@ public class WebInterface implements CoreListener {
*
* @return The Sone core
*/
+ @Nonnull
public Core getCore() {
return sonePlugin.core();
}
@@ -319,68 +222,32 @@ public class WebInterface implements CoreListener {
return templateContextFactory;
}
- /**
- * 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);
+ private Session getCurrentSessionWithoutCreation(ToadletContext toadletContenxt) {
+ return getSessionManager().useSession(toadletContenxt);
}
- /**
- * 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)) {
+ private Session getOrCreateCurrentSession(ToadletContext toadletContenxt) {
+ Session session = getCurrentSessionWithoutCreation(toadletContenxt);
+ if (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);
+ public Sone getCurrentSoneCreatingSession(ToadletContext toadletContext) {
+ Collection localSones = getCore().getLocalSones();
+ if (localSones.size() == 1) {
+ return localSones.iterator().next();
+ }
+ return getCurrentSone(getOrCreateCurrentSession(toadletContext));
}
- /**
- * 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) {
+ public Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
Collection localSones = getCore().getLocalSones();
if (localSones.size() == 1) {
return localSones.iterator().next();
}
- return getCurrentSone(getCurrentSession(toadletContext, create));
+ return getCurrentSone(getCurrentSessionWithoutCreation(toadletContext));
}
/**
@@ -391,7 +258,7 @@ public class WebInterface implements CoreListener {
* @return The currently logged in Sone, or {@code null} if no Sone is
* currently logged in
*/
- public Sone getCurrentSone(Session session) {
+ private Sone getCurrentSone(Session session) {
if (session == null) {
return null;
}
@@ -399,7 +266,13 @@ public class WebInterface implements CoreListener {
if (soneId == null) {
return null;
}
- return getCore().getLocalSone(soneId, false);
+ return getCore().getLocalSone(soneId);
+ }
+
+ @Override
+ @Nullable
+ public Sone getCurrentSone(@Nonnull ToadletContext toadletContext, boolean createSession) {
+ return createSession ? getCurrentSoneCreatingSession(toadletContext) : getCurrentSoneWithoutCreatingSession(toadletContext);
}
/**
@@ -410,8 +283,9 @@ public class WebInterface implements CoreListener {
* @param sone
* The Sone to set as currently logged in
*/
- public void setCurrentSone(ToadletContext toadletContext, Sone sone) {
- Session session = getCurrentSession(toadletContext);
+ @Override
+ public void setCurrentSone(@Nonnull ToadletContext toadletContext, @Nullable Sone sone) {
+ Session session = getOrCreateCurrentSession(toadletContext);
if (sone == null) {
session.removeAttribute("Sone.CurrentSone");
} else {
@@ -428,13 +302,18 @@ public class WebInterface implements CoreListener {
return notificationManager;
}
- /**
- * Returns the l10n helper of the node.
- *
- * @return The nodeâs l10n helper
- */
- public BaseL10n getL10n() {
- return sonePlugin.l10n().getBase();
+ @Nonnull
+ public Optional getNotification(@Nonnull String notificationId) {
+ return Optional.fromNullable(notificationManager.getNotification(notificationId));
+ }
+
+ @Nonnull
+ public Collection getNotifications(@Nullable Sone currentSone) {
+ return listNotificationFilter.filterNotifications(notificationManager.getNotifications(), currentSone);
+ }
+
+ public Translation getTranslation() {
+ return translation;
}
/**
@@ -455,14 +334,13 @@ public class WebInterface implements CoreListener {
return formPassword;
}
- /**
- * Returns the posts that have been announced as new in the
- * {@link #newPostNotification}.
- *
- * @return The new posts
- */
- public Set getNewPosts() {
- return ImmutableSet. builder().addAll(newPostNotification.getElements()).addAll(localPostNotification.getElements()).build();
+ @Nonnull
+ public Collection getNewPosts(@Nullable Sone currentSone) {
+ Set allNewPosts = ImmutableSet. builder()
+ .addAll(newPostNotification.getElements())
+ .addAll(localPostNotification.getElements())
+ .build();
+ return from(allNewPosts).filter(postVisibilityFilter.isVisible(currentSone)).toSet();
}
/**
@@ -475,35 +353,13 @@ public class WebInterface implements CoreListener {
return ImmutableSet. builder().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).build();
}
- /**
- * 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 = TemplateParser.parse(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 = TemplateParser.parse(createReader("/templates/notify/configNotReadNotification.html"));
- Notification configNotReadNotification = new TemplateNotification("config-not-read-notification", configNotReadNotificationTemplate);
- notificationManager.addNotification(configNotReadNotification);
- }
+ @Nonnull
+ public Collection getNewReplies(@Nullable Sone currentSone) {
+ Set allNewReplies = ImmutableSet.builder()
+ .addAll(newReplyNotification.getElements())
+ .addAll(localReplyNotification.getElements())
+ .build();
+ return from(allNewReplies).filter(replyVisibilityFilter.isVisible(currentSone)).toSet();
}
//
@@ -529,45 +385,13 @@ public class WebInterface implements CoreListener {
*/
public void start() {
registerToadlets();
-
- /* notification templates. */
- Template startupNotificationTemplate = TemplateParser.parse(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 = TemplateParser.parse(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");
}
/**
* Stops the web interface and unregisters all toadlets.
*/
public void stop() {
- unregisterToadlets();
- Ticker.getInstance().stop();
+ pageToadletRegistry.unregisterToadlets();
}
//
@@ -578,178 +402,89 @@ public class WebInterface implements CoreListener {
* Register all toadlets.
*/
private void registerToadlets() {
- Template emptyTemplate = TemplateParser.parse(new StringReader(""));
- Template loginTemplate = TemplateParser.parse(createReader("/templates/login.html"));
- Template indexTemplate = TemplateParser.parse(createReader("/templates/index.html"));
- Template newTemplate = TemplateParser.parse(createReader("/templates/new.html"));
- Template knownSonesTemplate = TemplateParser.parse(createReader("/templates/knownSones.html"));
- Template createSoneTemplate = TemplateParser.parse(createReader("/templates/createSone.html"));
- Template createPostTemplate = TemplateParser.parse(createReader("/templates/createPost.html"));
- Template createReplyTemplate = TemplateParser.parse(createReader("/templates/createReply.html"));
- Template bookmarksTemplate = TemplateParser.parse(createReader("/templates/bookmarks.html"));
- Template searchTemplate = TemplateParser.parse(createReader("/templates/search.html"));
- Template editProfileTemplate = TemplateParser.parse(createReader("/templates/editProfile.html"));
- Template editProfileFieldTemplate = TemplateParser.parse(createReader("/templates/editProfileField.html"));
- Template deleteProfileFieldTemplate = TemplateParser.parse(createReader("/templates/deleteProfileField.html"));
- Template viewSoneTemplate = TemplateParser.parse(createReader("/templates/viewSone.html"));
- Template viewPostTemplate = TemplateParser.parse(createReader("/templates/viewPost.html"));
- Template deletePostTemplate = TemplateParser.parse(createReader("/templates/deletePost.html"));
- Template deleteReplyTemplate = TemplateParser.parse(createReader("/templates/deleteReply.html"));
- Template deleteSoneTemplate = TemplateParser.parse(createReader("/templates/deleteSone.html"));
- Template imageBrowserTemplate = TemplateParser.parse(createReader("/templates/imageBrowser.html"));
- Template createAlbumTemplate = TemplateParser.parse(createReader("/templates/createAlbum.html"));
- Template deleteAlbumTemplate = TemplateParser.parse(createReader("/templates/deleteAlbum.html"));
- Template deleteImageTemplate = TemplateParser.parse(createReader("/templates/deleteImage.html"));
- Template noPermissionTemplate = TemplateParser.parse(createReader("/templates/noPermission.html"));
- Template optionsTemplate = TemplateParser.parse(createReader("/templates/options.html"));
- Template rescueTemplate = TemplateParser.parse(createReader("/templates/rescue.html"));
- Template aboutTemplate = TemplateParser.parse(createReader("/templates/about.html"));
- Template invalidTemplate = TemplateParser.parse(createReader("/templates/invalid.html"));
- Template postTemplate = TemplateParser.parse(createReader("/templates/include/viewPost.html"));
- Template replyTemplate = TemplateParser.parse(createReader("/templates/include/viewReply.html"));
- Template openSearchTemplate = TemplateParser.parse(createReader("/templates/xml/OpenSearch.xml"));
-
- PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
- pageToadlets.add(pageToadletFactory.createPageToadlet(new RedirectPage("", "index.html")));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new NewPage(newTemplate, this), "New"));
- 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 EditProfileFieldPage(editProfileFieldTemplate, this)));
- 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)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new LikePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyPage(deleteReplyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new LockSonePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlockSonePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSonePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new ImageBrowserPage(imageBrowserTemplate, this), "ImageBrowser"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateAlbumPage(createAlbumTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new EditAlbumPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteAlbumPage(deleteAlbumTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UploadImagePage(invalidTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new EditImagePage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteImagePage(deleteImageTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new TrustPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DistrustPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UntrustPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new MarkAsKnownPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BookmarkPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnbookmarkPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BookmarksPage(bookmarksTemplate, this), "Bookmarks"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new SearchPage(searchTemplate, 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(emptyTemplate, this), "Logout"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new RescuePage(rescueTemplate, this), "Rescue"));
- 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 DismissNotificationPage(emptyTemplate, this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("invalid.html", invalidTemplate, "Page.Invalid.Title", 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 TemplatePage("OpenSearch.xml", "application/opensearchdescription+xml", templateContextFactory, openSearchTemplate)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new GetImagePage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new GetStatusAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new GetNotificationsAjaxPage(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 GetTimesAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new MarkAsKnownAjaxPage(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 EditAlbumAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new EditImageAjaxPage(this, parserFilter)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new TrustAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DistrustAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UntrustAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new LikeAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikeAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new GetLikesAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new BookmarkAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new UnbookmarkAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfileFieldAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteProfileFieldAjaxPage(this)));
- pageToadlets.add(pageToadletFactory.createPageToadlet(new MoveProfileFieldAjaxPage(this)));
-
- ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer();
- toadletContainer.getPageMaker().addNavigationCategory("/Sone/index.html", "Navigation.Menu.Sone.Name", "Navigation.Menu.Sone.Tooltip", sonePlugin);
- for (PageToadlet toadlet : pageToadlets) {
- String menuName = toadlet.getMenuName();
- if (menuName != null) {
- toadletContainer.register(toadlet, "Navigation.Menu.Sone.Name", toadlet.path(), true, "Navigation.Menu.Sone.Item." + menuName + ".Name", "Navigation.Menu.Sone.Item." + menuName + ".Tooltip", false, toadlet);
- } else {
- toadletContainer.register(toadlet, null, toadlet.path(), true, false);
- }
- }
- }
-
- /**
- * Unregisters all toadlets.
- */
- private void unregisterToadlets() {
- ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer();
- for (PageToadlet pageToadlet : pageToadlets) {
- toadletContainer.unregister(pageToadlet);
- }
- toadletContainer.getPageMaker().removeNavigationCategory("Navigation.Menu.Sone.Name");
- }
-
- /**
- * Creates a {@link Reader} from the {@link InputStream} for the resource
- * with the given name.
- *
- * @param resourceName
- * The name of the resource
- * @return A {@link Reader} for the resource
- */
- private Reader createReader(String resourceName) {
- try {
- return new InputStreamReader(getClass().getResourceAsStream(resourceName), "UTF-8");
- } catch (UnsupportedEncodingException uee1) {
- return null;
- }
- }
-
- /**
- * Returns all {@link Sone#isLocal() local Sone}s that are referenced by
- * {@link SonePart}s in the given text (after parsing it using
- * {@link SoneTextParser}).
- *
- * @param text
- * The text to parse
- * @return All mentioned local Sones
- */
- private Collection getMentionedSones(String text) {
- /* we need no context to find mentioned Sones. */
- Set mentionedSones = new HashSet();
- try {
- for (Part part : soneTextParser.parse(null, new StringReader(text))) {
- if (part instanceof SonePart) {
- mentionedSones.add(((SonePart) part).getSone());
- }
- }
- } catch (IOException ioe1) {
- logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1);
- }
- return Collections2.filter(mentionedSones, Sone.LOCAL_SONE_FILTER);
+ Template postTemplate = loaders.loadTemplate("/templates/include/viewPost.html");
+ Template replyTemplate = loaders.loadTemplate("/templates/include/viewReply.html");
+ Template openSearchTemplate = loaders.loadTemplate("/templates/xml/OpenSearch.xml");
+
+ pageToadletRegistry.addPage(new RedirectPage("", "index.html"));
+ pageToadletRegistry.addPage(new IndexPage(this, loaders, templateRenderer, postVisibilityFilter));
+ pageToadletRegistry.addPage(new NewPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreateSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new KnownSonesPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditProfilePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditProfileFieldPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteProfileFieldPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreatePostPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreateReplyPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new ViewSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new ViewPostPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LikePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnlikePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeletePostPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteReplyPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LockSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnlockSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new FollowSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnfollowSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new ImageBrowserPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreateAlbumPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditAlbumPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteAlbumPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UploadImagePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditImagePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteImagePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new MarkAsKnownPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new BookmarkPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnbookmarkPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new BookmarksPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new SearchPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteSonePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LoginPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LogoutPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new OptionsPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new RescuePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new AboutPage(this, loaders, templateRenderer, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
+ pageToadletRegistry.addPage(new InvalidPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new NoPermissionPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EmptyImageTitlePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EmptyAlbumTitlePage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DismissNotificationPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DebugPage(this, loaders, templateRenderer));
+ pageToadletRegistry.addDebugPage(new MetricsPage(this, loaders, templateRenderer, metricRegistry));
+ pageToadletRegistry.addPage(loaders.loadStaticPage("css/", "/static/css/", "text/css"));
+ pageToadletRegistry.addPage(loaders.loadStaticPage("javascript/", "/static/javascript/", "text/javascript"));
+ pageToadletRegistry.addPage(loaders.loadStaticPage("images/", "/static/images/", "image/png"));
+ pageToadletRegistry.addPage(new TemplatePage("OpenSearch.xml", "application/opensearchdescription+xml", templateContextFactory, openSearchTemplate));
+ pageToadletRegistry.addPage(new GetImagePage(this));
+ pageToadletRegistry.addPage(new GetTranslationAjaxPage(this));
+ pageToadletRegistry.addPage(new GetStatusAjaxPage(this, elementLoader, timeTextConverter, l10nFilter, TimeZone.getDefault()));
+ pageToadletRegistry.addPage(new GetNotificationsAjaxPage(this));
+ pageToadletRegistry.addPage(new DismissNotificationAjaxPage(this));
+ pageToadletRegistry.addPage(new CreatePostAjaxPage(this));
+ pageToadletRegistry.addPage(new CreateReplyAjaxPage(this));
+ pageToadletRegistry.addPage(new GetReplyAjaxPage(this, replyTemplate));
+ pageToadletRegistry.addPage(new GetPostAjaxPage(this, postTemplate));
+ pageToadletRegistry.addPage(new GetLinkedElementAjaxPage(this, elementLoader, linkedElementRenderFilter));
+ pageToadletRegistry.addPage(new GetTimesAjaxPage(this, timeTextConverter, l10nFilter, TimeZone.getDefault()));
+ pageToadletRegistry.addPage(new MarkAsKnownAjaxPage(this));
+ pageToadletRegistry.addPage(new DeletePostAjaxPage(this));
+ pageToadletRegistry.addPage(new DeleteReplyAjaxPage(this));
+ pageToadletRegistry.addPage(new LockSoneAjaxPage(this));
+ pageToadletRegistry.addPage(new UnlockSoneAjaxPage(this));
+ pageToadletRegistry.addPage(new FollowSoneAjaxPage(this));
+ pageToadletRegistry.addPage(new UnfollowSoneAjaxPage(this));
+ pageToadletRegistry.addPage(new EditAlbumAjaxPage(this));
+ pageToadletRegistry.addPage(new EditImageAjaxPage(this, parserFilter, shortenFilter, renderFilter));
+ pageToadletRegistry.addPage(new LikeAjaxPage(this));
+ pageToadletRegistry.addPage(new UnlikeAjaxPage(this));
+ pageToadletRegistry.addPage(new GetLikesAjaxPage(this));
+ pageToadletRegistry.addPage(new BookmarkAjaxPage(this));
+ pageToadletRegistry.addPage(new UnbookmarkAjaxPage(this));
+ pageToadletRegistry.addPage(new EditProfileFieldAjaxPage(this));
+ pageToadletRegistry.addPage(new DeleteProfileFieldAjaxPage(this));
+ pageToadletRegistry.addPage(new MoveProfileFieldAjaxPage(this));
+
+ pageToadletRegistry.registerToadlets();
}
/**
@@ -765,7 +500,7 @@ public class WebInterface implements CoreListener {
synchronized (soneInsertNotifications) {
TemplateNotification templateNotification = soneInsertNotifications.get(sone);
if (templateNotification == null) {
- templateNotification = new TemplateNotification(TemplateParser.parse(createReader("/templates/notify/soneInsertNotification.html")));
+ templateNotification = new TemplateNotification(loaders.loadTemplate("/templates/notify/soneInsertNotification.html"));
templateNotification.set("insertSone", sone);
soneInsertNotifications.put(sone, templateNotification);
}
@@ -773,240 +508,56 @@ public class WebInterface implements CoreListener {
}
}
- //
- // CORELISTENER METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void newSoneFound(Sone sone) {
- newSoneNotification.add(sone);
- if (!hasFirstStartNotification()) {
- notificationManager.addNotification(newSoneNotification);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void newPostFound(Post post) {
- boolean isLocal = post.getSone().isLocal();
- if (isLocal) {
- localPostNotification.add(post);
- } else {
- newPostNotification.add(post);
- }
- if (!hasFirstStartNotification()) {
- notificationManager.addNotification(isLocal ? localPostNotification : newPostNotification);
- if (!getMentionedSones(post.getText()).isEmpty() && !isLocal) {
- mentionNotification.add(post);
- notificationManager.addNotification(mentionNotification);
- }
- } else {
- getCore().markPostKnown(post);
- }
- }
-
/**
- * {@inheritDoc}
- */
- @Override
- public void newReplyFound(PostReply reply) {
- boolean isLocal = reply.getSone().isLocal();
- if (isLocal) {
- localReplyNotification.add(reply);
- } else {
- newReplyNotification.add(reply);
- }
- if (!hasFirstStartNotification()) {
- notificationManager.addNotification(isLocal ? localReplyNotification : newReplyNotification);
- if (!getMentionedSones(reply.getText()).isEmpty() && !isLocal && (reply.getPost().getSone() != null) && (reply.getTime() <= System.currentTimeMillis())) {
- mentionNotification.add(reply.getPost());
- notificationManager.addNotification(mentionNotification);
- }
- } else {
- getCore().markReplyKnown(reply);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void markSoneKnown(Sone sone) {
- newSoneNotification.remove(sone);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void markPostKnown(Post post) {
- newPostNotification.remove(post);
- localPostNotification.remove(post);
- mentionNotification.remove(post);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void markReplyKnown(PostReply reply) {
- newReplyNotification.remove(reply);
- localReplyNotification.remove(reply);
- mentionNotification.remove(reply.getPost());
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void soneRemoved(Sone sone) {
- newSoneNotification.remove(sone);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void postRemoved(Post post) {
- newPostNotification.remove(post);
- localPostNotification.remove(post);
- mentionNotification.remove(post);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void replyRemoved(PostReply reply) {
- newReplyNotification.remove(reply);
- localReplyNotification.remove(reply);
- if (!getMentionedSones(reply.getText()).isEmpty()) {
- boolean isMentioned = false;
- for (PostReply existingReply : getCore().getReplies(reply.getPost())) {
- isMentioned |= !reply.isKnown() && !getMentionedSones(existingReply.getText()).isEmpty();
- }
- if (!isMentioned) {
- mentionNotification.remove(reply.getPost());
- }
- }
- }
-
- /**
- * {@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);
- lockedSonesTickerObjects.remove(sone);
- notificationManager.addNotification(lockedSonesNotification);
- }
- }, "Sone Locked Notification");
- lockedSonesTickerObjects.put(sone, tickerObject);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void soneUnlocked(Sone sone) {
- lockedSonesNotification.remove(sone);
- Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(sone));
- }
-
- /**
- * {@inheritDoc}
+ * Notifies the web interface that a {@link Sone} is being inserted.
+ *
+ * @param soneInsertingEvent
+ * The event
*/
- @Override
- public void soneInserting(Sone sone) {
- TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+ @Subscribe
+ public void soneInserting(SoneInsertingEvent soneInsertingEvent) {
+ TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.getSone());
soneInsertNotification.set("soneStatus", "inserting");
- if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+ if (soneInsertingEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
notificationManager.addNotification(soneInsertNotification);
}
}
/**
- * {@inheritDoc}
+ * Notifies the web interface that a {@link Sone} was inserted.
+ *
+ * @param soneInsertedEvent
+ * The event
*/
- @Override
- public void soneInserted(Sone sone, long insertDuration) {
- TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+ @Subscribe
+ public void soneInserted(SoneInsertedEvent soneInsertedEvent) {
+ TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.getSone());
soneInsertNotification.set("soneStatus", "inserted");
- soneInsertNotification.set("insertDuration", insertDuration / 1000);
- if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+ soneInsertNotification.set("insertDuration", soneInsertedEvent.getInsertDuration() / 1000);
+ if (soneInsertedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
notificationManager.addNotification(soneInsertNotification);
}
}
/**
- * {@inheritDoc}
+ * Notifies the web interface that a {@link Sone} insert was aborted.
+ *
+ * @param soneInsertAbortedEvent
+ * The event
*/
- @Override
- public void soneInsertAborted(Sone sone, Throwable cause) {
- TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+ @Subscribe
+ public void soneInsertAborted(SoneInsertAbortedEvent soneInsertAbortedEvent) {
+ TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.getSone());
soneInsertNotification.set("soneStatus", "insert-aborted");
- soneInsertNotification.set("insert-error", cause);
- if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+ soneInsertNotification.set("insert-error", soneInsertAbortedEvent.getCause());
+ if (soneInsertAbortedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
notificationManager.addNotification(soneInsertNotification);
}
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void updateFound(Version version, long releaseTime, long latestEdition) {
- newVersionNotification.getTemplateContext().set("latestVersion", version);
- newVersionNotification.getTemplateContext().set("latestEdition", latestEdition);
- newVersionNotification.getTemplateContext().set("releaseTime", releaseTime);
- notificationManager.addNotification(newVersionNotification);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertStarted(Image image) {
- insertingImagesNotification.add(image);
- notificationManager.addNotification(insertingImagesNotification);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertAborted(Image image) {
- insertingImagesNotification.remove(image);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertFinished(Image image) {
- insertingImagesNotification.remove(image);
- insertedImagesNotification.add(image);
- notificationManager.addNotification(insertedImagesNotification);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertFailed(Image image, Throwable cause) {
- insertingImagesNotification.remove(image);
- imageInsertFailedNotification.add(image);
- notificationManager.addNotification(imageInsertFailedNotification);
+ @Subscribe
+ public void debugActivated(@Nonnull DebugActivatedEvent debugActivatedEvent) {
+ pageToadletRegistry.activateDebugMode();
}
}