X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FSoneImpl.java;h=a197c465f9b33014458c1861a2f62387931041a2;hb=f049280a40ddf05f02400e7f0d93a24dea4545c2;hp=093b038f9a776d7eab018dddd35eebfa7e282787;hpb=7be5373f355b3184e02a61b39238a89be177c040;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
index 093b038..a197c46 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
@@ -21,6 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.logging.Logger.getLogger;
+import static net.pterodactylus.sone.data.PostKt.newestPostFirst;
+import static net.pterodactylus.sone.data.ReplyKt.newestReplyFirst;
 import static net.pterodactylus.sone.data.SoneKt.*;
 
 import java.net.MalformedURLException;
@@ -37,6 +39,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.AlbumKt;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
@@ -364,7 +367,7 @@ public class SoneImpl implements Sone {
 		synchronized (this) {
 			sortedPosts = new ArrayList<>(posts);
 		}
-		Collections.sort(sortedPosts, Post.NEWEST_FIRST);
+		sortedPosts.sort(newestPostFirst());
 		return sortedPosts;
 	}
 
@@ -624,7 +627,7 @@ public class SoneImpl implements Sone {
 		hash.putString(")", UTF_8);
 
 		List<PostReply> replies = new ArrayList<>(getReplies());
-		Collections.sort(replies, Reply.TIME_COMPARATOR);
+		replies.sort(newestReplyFirst().reversed());
 		hash.putString("Replies(", UTF_8);
 		for (PostReply reply : replies) {
 			hash.putString("Reply(", UTF_8).putString(reply.getId(), UTF_8).putString(")", UTF_8);
@@ -649,7 +652,7 @@ public class SoneImpl implements Sone {
 
 		hash.putString("Albums(", UTF_8);
 		for (Album album : rootAlbum.getAlbums()) {
-			if (!Album.NOT_EMPTY.apply(album)) {
+			if (!AlbumKt.notEmpty().invoke(album)) {
 				continue;
 			}
 			hash.putString(album.getFingerprint(), UTF_8);