}
/** The version. */
- public static final Version VERSION = new Version(0, 3, 2);
+ public static final Version VERSION = new Version(0, 3, 3);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
/* create a configuration. */
Configuration oldConfiguration;
Configuration newConfiguration = null;
+ boolean firstStart = !new File("sone.properties").exists();
+ boolean newConfig = false;
try {
oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
newConfiguration = oldConfiguration;
} catch (ConfigurationException ce1) {
+ newConfig = true;
logger.log(Level.INFO, "Could not load configuration file, trying plugin store…", ce1);
try {
newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
core.setConfiguration(newConfiguration);
}
webInterface.start();
+ webInterface.setFirstStart(firstStart);
+ webInterface.setNewConfig(newConfig);
identityManager.start();
startupFailed = false;
} finally {
import java.util.Arrays;
import java.util.Collection;
-import java.util.UUID;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.page.Page;
* session
*/
protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return getCurrentSession(toadletContenxt, true);
+ return webInterface.getCurrentSession(toadletContenxt);
}
/**
* session
*/
protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- Session session = webInterface.getSessionManager().useSession(toadletContenxt);
- if (create && (session == null)) {
- session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
- }
- return session;
+ return webInterface.getCurrentSession(toadletContenxt, create);
}
/**
* currently logged in
*/
protected Sone getCurrentSone(ToadletContext toadletContext) {
- Session session = getCurrentSession(toadletContext);
- if (session == null) {
- return null;
- }
- String soneId = (String) session.getAttribute("Sone.CurrentSone");
- if (soneId == null) {
- return null;
- }
- return webInterface.getCore().getLocalSone(soneId, false);
+ return webInterface.getCurrentSone(toadletContext);
}
/**
* The Sone to set as currently logged in
*/
protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
- Session session = getCurrentSession(toadletContext);
- if (sone == null) {
- session.removeAttribute("Sone.CurrentSone");
- } else {
- session.setAttribute("Sone.CurrentSone", sone.getId());
- }
+ webInterface.setCurrentSone(toadletContext, sone);
}
//
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.web.page.PageToadletFactory;
import net.pterodactylus.sone.web.page.StaticPage;
import net.pterodactylus.util.logging.Logging;
+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.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;
/**
}
/**
+ * 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(getCurrentSession(toadletContext));
+ }
+
+ /**
+ * 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
return new HashSet<Reply>(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);
+ }
+ }
+
+ //
+ // PRIVATE ACCESSORS
+ //
+
+ /**
+ * Returns whether the first start notification is currently displayed.
+ *
+ * @return {@code true} if the first-start notification is currently
+ * displayed, {@code false} otherwise
+ */
+ private boolean hasFirstStartNotification() {
+ return notificationManager.getNotification("first-start-notification") != null;
+ }
+
//
// ACTIONS
//
@Override
public void newSoneFound(Sone sone) {
newSoneNotification.add(sone);
- notificationManager.addNotification(newSoneNotification);
+ if (!hasFirstStartNotification()) {
+ notificationManager.addNotification(newSoneNotification);
+ }
}
/**
@Override
public void newPostFound(Post post) {
newPostNotification.add(post);
- notificationManager.addNotification(newPostNotification);
+ if (!hasFirstStartNotification()) {
+ notificationManager.addNotification(newPostNotification);
+ }
}
/**
return;
}
newReplyNotification.add(reply);
- notificationManager.addNotification(newReplyNotification);
+ if (!hasFirstStartNotification()) {
+ notificationManager.addNotification(newReplyNotification);
+ }
}
/**
projects / Sone.git / commitdiff