From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 23 Jun 2015 04:45:57 +0000 (+0200)
Subject: Merge branch 'feature/update-about-sone' into next
X-Git-Tag: 0.9^2~6
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=b267d6210c703eace4a4f220158572e676240198;hp=48333ba0f07fe742c7b1544231eaec3e1f4e9851

Merge branch 'feature/update-about-sone' into next
---

diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index 85c5841..8114118 100644
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -50,12 +50,6 @@ public class UpdateChecker {
 	/** The logger. */
 	private static final Logger logger = getLogger("Sone.UpdateChecker");
 
-	/** The key of the Sone homepage. */
-	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
-
-	/** The current latest known edition. */
-	private static final int LATEST_EDITION = 65;
-
 	/** The event bus. */
 	private final EventBus eventBus;
 
@@ -141,7 +135,7 @@ public class UpdateChecker {
 	 */
 	public void start() {
 		try {
-			currentUri = new FreenetURI(SONE_HOMEPAGE + LATEST_EDITION);
+			currentUri = new FreenetURI(SonePlugin.getHomepage());
 		} catch (MalformedURLException mue1) {
 			/* this can not really happen unless I screw up. */
 			logger.log(Level.SEVERE, "Sone Homepage URI invalid!", mue1);
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 392cc40..a4fcd76 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -118,6 +118,11 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	/** The version. */
 	public static final Version VERSION = new Version("rc1", 0, 9);
 
+	/** The current year at time of release. */
+	private static final int YEAR = 2015;
+	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
+	private static final int LATEST_EDITION = 65;
+
 	/** The logger. */
 	private static final Logger logger = getLogger("Sone.Plugin");
 
@@ -170,6 +175,14 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		return l10n;
 	}
 
+	public static int getYear() {
+		return YEAR;
+	}
+
+	public static String getHomepage() {
+		return SONE_HOMEPAGE + LATEST_EDITION;
+	}
+
 	//
 	// FREDPLUGIN METHODS
 	//
diff --git a/src/main/java/net/pterodactylus/sone/web/AboutPage.java b/src/main/java/net/pterodactylus/sone/web/AboutPage.java
index 6a6bc63..4b54a4b 100644
--- a/src/main/java/net/pterodactylus/sone/web/AboutPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/AboutPage.java
@@ -29,35 +29,23 @@ import net.pterodactylus.util.version.Version;
  */
 public class AboutPage extends SoneTemplatePage {
 
-	/** The version to display. */
 	private final Version version;
+	private final int year;
+	private final String homepage;
 
-	/**
-	 * Creates a new “about” page.
-	 *
-	 * @param template
-	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 * @param version
-	 *            The version to display
-	 */
-	public AboutPage(Template template, WebInterface webInterface, Version version) {
+	public AboutPage(Template template, WebInterface webInterface, Version version, int year, String homepage) {
 		super("about.html", template, "Page.About.Title", webInterface, false);
 		this.version = version;
+		this.year = year;
+		this.homepage = homepage;
 	}
 
-	//
-	// TEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		templateContext.set("version", version);
+		templateContext.set("year", year);
+		templateContext.set("homepage", homepage);
 	}
 
 }
diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 9fe5bba..1ce8f8e 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -692,7 +692,7 @@ public class WebInterface {
 		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 AboutPage(aboutTemplate, this, SonePlugin.VERSION, SonePlugin.getYear(), SonePlugin.getHomepage()), "About"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyImageTitle.html", emptyImageTitleTemplate, "Page.EmptyImageTitle.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyAlbumTitle.html", emptyAlbumTitleTemplate, "Page.EmptyAlbumTitle.Title", this)));
diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html
index 74ea9f0..f38db21 100644
--- a/src/main/resources/templates/about.html
+++ b/src/main/resources/templates/about.html
@@ -2,7 +2,7 @@
 
 	<h1><%= Page.About.Page.Title|l10n|html></h1>
 
-	<p>Sone – The Freenet Social Network Plugin, Version <% version|html>, © 2010–2012 by David ‘Bombe’ Roden.</p>
+	<p>Sone – The Freenet Social Network Plugin, Version <% version|html>, © 2010–<% year|html> by David ‘Bombe’ Roden.</p>
 
 	<p>
 		<%= Page.About.Flattr.Description|l10n|html|replace needle=="{link}" replacement=='<a href="/?_CHECKED_HTTP_=https://www.flattr.com/" title="Flattr Homepage" target="_blank">'|replace needle=="{/link}" replacement=='</a>'>
@@ -11,7 +11,7 @@
 	<h2><%= Page.About.Homepage.Title|l10n|html></h2>
 
 	<p>
-		<%= Page.About.Homepage.Description|l10n|html|replace needle=="{link}" replacement=='<a href="/USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/49/">'|replace needle=="{/link}" replacement=='</a>'>
+		<%= Page.About.Homepage.Description|l10n|html|replace needle=="{link}" replacement=='<a href="/<% homepage|html>/">'|replace needle=="{/link}" replacement=='</a>'>
 	</p>
 
 	<h2><%= Page.About.License.Title|l10n|html></h2>