X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=26135eab701f49ddb385ca43f9393ba06c3754ed;hp=86bf049d62a9084e111d1c77bc7579da80e34d51;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3 diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java index 86bf049..26135ea 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -1,5 +1,5 @@ /* - * Sone - SoneInserter.java - Copyright © 2010–2013 David Roden + * Sone - SoneInserter.java - Copyright © 2010–2016 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 @@ -79,7 +79,7 @@ import freenet.support.io.ArrayBucket; public class SoneInserter extends AbstractService { /** The logger. */ - private static final Logger logger = getLogger("Sone.Inserter"); + private static final Logger logger = getLogger(SoneInserter.class.getName()); /** The insertion delay (in seconds). */ private static final AtomicInteger insertionDelay = new AtomicInteger(60); @@ -180,7 +180,7 @@ public class SoneInserter extends AbstractService { * @return The fingerprint of the last insert */ public String getLastInsertFingerprint() { - return soneModificationDetector.getOriginalFingerprint(); + return soneModificationDetector.getLastInsertFingerprint(); } /** @@ -307,7 +307,7 @@ public class SoneInserter extends AbstractService { soneProperties.put("time", currentTimeMillis()); soneProperties.put("requestUri", sone.getRequestUri()); soneProperties.put("profile", sone.getProfile()); - soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts())); + soneProperties.put("posts", Ordering.from(Post.NEWEST_FIRST).sortedCopy(sone.getPosts())); soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies())); soneProperties.put("likedPostIds", new HashSet(sone.getLikedPostIds())); soneProperties.put("likedReplyIds", new HashSet(sone.getLikedReplyIds())); @@ -393,7 +393,7 @@ public class SoneInserter extends AbstractService { templateContext.set("core", core); templateContext.set("currentSone", soneProperties); templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition()); - templateContext.set("version", SonePlugin.VERSION); + templateContext.set("version", SonePlugin.getPluginVersion()); StringWriter writer = new StringWriter(); try { template.render(templateContext, writer);