From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 12 Sep 2011 13:04:50 +0000 (+0200)
Subject: Merge branch 'release-0.6.7'
X-Git-Tag: 0.6.7^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=f399a0d5d29599c318a0f14f109a26a6667c1230;hp=1bc78b582ac59f2438002997f5780db4dcee0a2a

Merge branch 'release-0.6.7'
---

diff --git a/pom.xml b/pom.xml
index a087474..037d3be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.6.6</version>
+	<version>0.6.7</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 738c0d1..d642dd8 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -83,7 +83,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 6, 6);
+	public static final Version VERSION = new Version(0, 6, 7);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
index 31ec399..f03e6e4 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
@@ -52,7 +52,6 @@ public class GetTimesAjaxPage extends JsonPage {
 	 */
 	@Override
 	protected JsonObject createJsonObject(Request request) {
-		long now = System.currentTimeMillis();
 		String allIds = request.getHttpRequest().getParam("posts");
 		JsonObject postTimes = new JsonObject();
 		if (allIds.length() > 0) {
@@ -79,9 +78,8 @@ public class GetTimesAjaxPage extends JsonPage {
 				if (reply == null) {
 					continue;
 				}
-				long age = now - reply.getTime();
 				JsonObject replyTime = new JsonObject();
-				Time time = getTime(age);
+				Time time = getTime(reply.getTime());
 				replyTime.put("timeText", time.getText());
 				replyTime.put("refreshTime", time.getRefresh() / Time.SECOND);
 				replyTime.put("tooltip", dateFormat.format(new Date(reply.getTime())));